commit aa51f7f815eee23b33a01f87be43218513daf9f5
parent 746cccfe9c682792c0db1a50f52a18fd64125517
Author: Hayden Hamilton <hayden@haydenvh.com>
Date: Fri, 24 Jan 2020 18:02:23 +0000
Moving to dwm
Diffstat:
31 files changed, 80 insertions(+), 48 deletions(-)
diff --git a/.Xauthority b/.Xauthority
Binary files differ.
diff --git a/.config/picom/config b/.config/picom/config
@@ -2,7 +2,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 ../../.licenses/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
#
shadow=true
shadow-radius=32.5
@@ -27,6 +27,7 @@ opacity-rule = [
"87:class_g ?= 'st-256color' && !focused",
"84:class_g ?= 'st-256color' && focused",
"85:class_g ?= 'i3bar'",
+ "85:class_g ?= 'dwm'",
"87:class_g ?= 'vimb' && !focused",
"84:class_g ?= 'vimb' && focused",
"87:class_g ?= 'surf' && !focused",
diff --git a/.scripts/bin/display/hlock b/.scripts/bin/display/hlock
@@ -4,7 +4,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
#
image="/tmp/screen.png"
locker="i3lock -i"
diff --git a/.scripts/bin/display/rfeh b/.scripts/bin/display/rfeh
@@ -4,7 +4,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
if [ "$(echo $1 | awk '/help/ {print $0}')" != "" ]
then
diff --git a/.scripts/bin/display/wallblur b/.scripts/bin/display/wallblur
@@ -4,7 +4,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
cachebool="$1"
if [ "$(echo $1 | awk '/help/ {print $0}')" != "" ]
diff --git a/.scripts/bin/dmenu/daskpass b/.scripts/bin/dmenu/daskpass
@@ -1,12 +1,11 @@
#!/bin/bash
-#!/bin/bash
#
# dmenu/daskpass
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
-#
+# Copyright (c) 2019 Hayden Hamilton.
+
dmenu="dmenu"
. $HOME/.dmenurc
$dmenu -P -p "$1" <&- && echo
diff --git a/.scripts/bin/dmenu/dfm b/.scripts/bin/dmenu/dfm
@@ -4,7 +4,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
#
if [ "$(echo $1 | awk '/help/ {print}')" != "" ]
diff --git a/.scripts/bin/dmenu/dmpvurl b/.scripts/bin/dmenu/dmpvurl
@@ -4,7 +4,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
#
dmenu="dmenu"
diff --git a/.scripts/bin/dmenu/dpass b/.scripts/bin/dmenu/dpass
@@ -4,7 +4,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
#
if [ "$(echo $1 | awk '/help/ {print $0}')" != "" ]
diff --git a/.scripts/bin/misc/hmpv b/.scripts/bin/misc/hmpv
@@ -4,7 +4,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
action=$1
socket=$2
diff --git a/.scripts/bin/misc/rmpv b/.scripts/bin/misc/rmpv
@@ -4,7 +4,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
dir=$1
count="$2"
diff --git a/.scripts/bin/misc/trimfiles b/.scripts/bin/misc/trimfiles
@@ -4,9 +4,9 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
-dirs=$(ls -d */ */*/ */*/*/ 2>/dev/null)
+dirs=$(ls -d */ */*/ */*/*/ */*/*/*/ */*/*/*/*/ 2>/dev/null)
for dir in $dirs
do
cd $dir
diff --git a/.scripts/i3blocks/bat b/.scripts/i3blocks/bat
@@ -4,14 +4,14 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
p=$(acpi | awk '/Battery/ {print $4}' | sed 's/,//g')
if [ "$p" == "0%" ]
then
echo "" > /dev/null
else
- echo "< B $p"
+ echo "| B $p"
echo
echo \#C625C8
fi
diff --git a/.scripts/i3blocks/cal b/.scripts/i3blocks/cal
@@ -4,7 +4,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
get_cal() {
calcurse -D $HOME/.config/calcurse $1 | awk "/$2/" | wc -l
@@ -16,6 +16,6 @@ then
else
todo=$(($todo-1))
fi
-echo "< CAL A:$(get_cal -a "*")/T:$todo"
+echo "| CAL A:$(get_cal -a "*")/T:$todo"
echo
echo \#236B1B
diff --git a/.scripts/i3blocks/convtodwm b/.scripts/i3blocks/convtodwm
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+mkdir -p ~/.cache/blocks
+
+./host > ~/.cache/blocks/host &
+
+while true
+do
+ ((swait>20)) &&{
+ ./net > ~/.cache/blocks/net &
+ ./news > ~/.cache/blocks/news &
+ ./weather > ~/.cache/blocks/weather &
+ ./bat > ~/.cache/blocks/bat &
+ ./disk > ~/.cache/blocks/disk &
+ ./disk2 > ~/.cache/blocks/disk2 &
+ ./time2 > ~/.cache/blocks/time2 &
+ swait=0
+ };
+ #./.scripts/i3blocks/cal > .cache/blocks/cal &
+ ./cpu > ~/.cache/blocks/cpu &
+ ./mem > ~/.cache/blocks/mem &
+ ./mpv > ~/.cache/blocks/mpv &
+ ./vol > ~/.cache/blocks/vol &
+ sleep 2
+ for ((i=0;i<1;i++))
+ do
+ ./time > .cache/blocks/time &
+ (
+ cd ~/.cache/blocks
+ xsetroot -name " $(cat bat cpu disk disk2 mem mpv net news vol weather time2 time host | sed '/^#/d;/^$/d' | tr '\n' '\f' | sed 's/\f/ /g')"
+ )
+ done
+ swait=$(($swait+1))
+done
diff --git a/.scripts/i3blocks/cpu b/.scripts/i3blocks/cpu
@@ -4,9 +4,9 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
cpu=$(ps -e -o %cpu | awk '{s+=$1} END {print s}')
-echo "< C $cpu%"
+echo "| C $cpu%"
echo
echo \#7525C8
diff --git a/.scripts/i3blocks/disk b/.scripts/i3blocks/disk
@@ -4,9 +4,9 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
sda1=$(df -h | awk '/sda1/ {print $3 "/" $4}')
-echo "< SDA1 $sda1"
+echo "| SDA1 $sda1"
echo
echo \#0F6BF3
diff --git a/.scripts/i3blocks/disk2 b/.scripts/i3blocks/disk2
@@ -4,9 +4,9 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
sda2=$(df -h | awk '/sda2/ {print $3 "/" $4}')
-echo "< SDA2 $sda2"
+echo "| SDA2 $sda2"
echo
echo \#3157B5
diff --git a/.scripts/i3blocks/host b/.scripts/i3blocks/host
@@ -4,9 +4,9 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
hostget="\u@\h"
-echo "< ${hostget@P}"
+echo "| ${hostget@P}"
echo
echo \#ff003b
diff --git a/.scripts/i3blocks/mem b/.scripts/i3blocks/mem
@@ -4,8 +4,8 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
-echo "< M $(free -h | awk '/^Mem:/ {print $3 "/" $2}')"
+echo "| M $(free -h | awk '/^Mem:/ {print $3 "/" $2}')"
echo
echo \#007dc1
diff --git a/.scripts/i3blocks/mpv b/.scripts/i3blocks/mpv
@@ -4,7 +4,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
file=$(echo '{command:["get_property", "media-title"]}' | socat - /tmp/mpv-socket | tr "." " " | sed 's/opus//g' | sed 's/mp3//g' | sed 's/mkv//g' | sed 's/flac//g' | sed 's/webm//g' | sed 's/part//g' | tr '"\{:,}[' ' ' | sed 's/data//g' | sed 's/request_id 0//g' | sed 's/error success//g' | sed 's/ //g' | tail -c +2 | sed 's/$//g' | tr "()'" " " | sed 's/ / /g' |sed 's/ / /g' | sed 's/ / /g' | sed 's/ / /g')
file2=$(echo "$file" | cut -zc-25)
@@ -48,7 +48,7 @@ else
fi
if [ "$color" == "true" ]
then
- echo "< MPV$out"
+ echo "| MPV$out"
echo
echo \#666b1b
elif [ "$color" == "false" ]
diff --git a/.scripts/i3blocks/net b/.scripts/i3blocks/net
@@ -4,9 +4,9 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
ip=$(curl -s http://icanhazip.com/)
-echo "< $ip"
+echo "| $ip"
echo
echo \#4Da0C6
diff --git a/.scripts/i3blocks/news b/.scripts/i3blocks/news
@@ -4,11 +4,11 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
newsboat -x reload 2>/dev/null
unread=$(newsboat -x print-unread | sed 's/unread articles//g')
-echo "< NEWS $unread"
+echo "| NEWS $unread"
echo
echo \#498364
diff --git a/.scripts/i3blocks/time b/.scripts/i3blocks/time
@@ -4,8 +4,8 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
-echo "< $(date +%d/%m)"
+echo "| $(date +%d/%m)"
echo
echo \#ff7777
diff --git a/.scripts/i3blocks/time2 b/.scripts/i3blocks/time2
@@ -4,8 +4,8 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
-echo "< $(date | awk '{print $4}')"
+echo "| $(date | awk '{print $4}')"
echo
echo \#ff303b
diff --git a/.scripts/i3blocks/title b/.scripts/i3blocks/title
@@ -4,7 +4,7 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
id=$(xprop -root _NET_ACTIVE_WINDOW | awk '// {print $5}')
out1=$(xprop -id $id | awk '/WM_CLASS/ {print $3}' | sed 's/"//g' | sed 's/,//g')
diff --git a/.scripts/i3blocks/vol b/.scripts/i3blocks/vol
@@ -4,11 +4,11 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
toggled=$(amixer sget Master | awk '/Mono/ {print $6}' | sed 's/\[//g' | sed 's/\]//g')
volume=$(amixer sget Master | awk '/Mono/ {print $4}' | sed 's/\[//g' | sed 's/\]//g')
output=$(echo $(echo ${volume}|tr "\n" " ")$(echo ${toggled}|tr "\n" " "|sed 's/ //g'))
-echo "< VOL $output"
+echo "| VOL $output"
echo
echo \#218888
diff --git a/.scripts/i3blocks/weather b/.scripts/i3blocks/weather
@@ -4,9 +4,9 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
curl -Ss 'https://wttr.in?0TQ' | cut -c 16- > ~/.cache/weather
-echo "< $(sed 2q ~/.cache/weather | sed 's/\.\./ /g' | xargs echo)"
+echo "| $(sed 2q ~/.cache/weather | sed 's/\.\./ /g' | xargs echo)"
echo
echo \#249980
diff --git a/.scripts/i3blocks/weather2 b/.scripts/i3blocks/weather2
@@ -4,8 +4,8 @@
# Created by Hayden Hamilton
#
# haydenvh.com
-# Copyright (c) 2019 Hayden Hamilton. LICENSE:GPLv2 haydenh.gitlab.io/p/gplv2.license
+# Copyright (c) 2019 Hayden Hamilton.
-echo "< RAIN $(sed 5q ~/.cache/weather | sed 's/‘//g' | sed 's/‚’//g' | tail -n 1 | sed 's/ //g')"
+echo "| RAIN $(sed 5q ~/.cache/weather | sed 's/‘//g' | sed 's/‚’//g' | tail -n 1 | sed 's/ //g')"
echo
echo \#249980
diff --git a/.urxvt b/.urxvt
@@ -1 +0,0 @@
-.config/urxvt/
-\ No newline at end of file
diff --git a/.xinitrc b/.xinitrc
@@ -1 +1 @@
-exec i3
+exec dwm
