xinitrc, i3blocks, rofi, etc

8 files changed, 56 insertions, 41 deletions

diff --git a/.aliases b/.aliases
index 6318bee..ed800f2 100644
--- a/.aliases
+++ b/.aliases
@@ -29,3 +29,5 @@ alias watch="cmdwatch"
 alias youpick="shuf .restaurants | head"
 alias lightgtk=GTK2_RC_FILES= GTK_DATA_PREFIX= GTK_THEME=Adwaita
 alias i3config=vim ~/.config/wpg/templates/i3.base
+alias noprompt=PROMPT= RPROMPT= 
+alias dd=dd status=progress 
diff --git a/.config/i3blocks/config b/.config/i3blocks/config
index 1ff958c..7846d6f 100644
--- a/.config/i3blocks/config
+++ b/.config/i3blocks/config
@@ -25,9 +25,9 @@ interval=3600
 signal=13
 command=i3blocks-news.sh
 
-[weather]
-interval=3600
-command=i3blocks-weather.sh
+#[weather]
+#interval=3600
+#command=i3blocks-weather.sh
 
 [up]
 interval=3600
diff --git a/.config/rofi/config b/.config/rofi/config
index 60de733..63f3c75 100644
--- a/.config/rofi/config
+++ b/.config/rofi/config
@@ -3,10 +3,10 @@ rofi.width:                          25
 rofi.lines:                          25
 rofi.columns:                        1
 rofi.font:                           Iosevka Etoile 14
-rofi.color-normal:                   #0c0c0d, #ffffee, #0c0c0d, #938373, #ffffee
-rofi.color-urgent:                   #0c0c0d, #d6b48d, #22231D, #d6b48d, #ffffee
-rofi.color-active:                   #0c0c0d, #cf7f5f, #0c0c0d, #cf7f5f, #0c0c0d
-rofi.color-window:                   #0c0c0d, #938373, #655a4f
+rofi.color-normal:                   #121213, #e6ffff, #121213, #48719b, #e6ffff
+rofi.color-urgent:                   #121213, #d6b48d, #22231D, #d6b48d, #e6ffff
+rofi.color-active:                   #121213, #76bae8, #121213, #76bae8, #121213
+rofi.color-window:                   #121213, #48719b, #324e6a
 rofi.bw:                             5
 rofi.location:                       0
 rofi.padding:                        5
diff --git a/.config/wpg/sequences b/.config/wpg/sequences
index 8f773ed..72af133 100644
--- a/.config/wpg/sequences
+++ b/.config/wpg/sequences
@@ -1 +1 @@
-]4;0;#0c0c0d\]4;1;#935944\]4;2;#6E5449\]4;3;#B78F71\]4;4;#827F7C\]4;5;#AB9F92\]4;6;#946755\]4;7;#ddd0c2\]4;8;#232327\]4;9;#cd6d4a\]4;10;#9a6853\]4;11;#ffb77f\]4;12;#b9a590\]4;13;#f2cfa9\]4;14;#cf7f5f\]4;15;#ffffee\]10;#ffffee\]11;[90]#0c0c0d\]12;#ffffee\]13;#ffffee\]17;#ffffee\]19;#0c0c0d\]4;232;#0c0c0d\]4;256;#ffffee\]708;[90]#0c0c0d\
\ No newline at end of file
+]4;0;#121213\]4;1;#45596F\]4;2;#52616F\]4;3;#938668\]4;4;#516E8B\]4;5;#637990\]4;6;#698DA5\]4;7;#b0d1d2\]4;8;#2a2a2c\]4;9;#4e739b\]4;10;#5e7e9c\]4;11;#cfb476\]4;12;#5b8ec2\]4;13;#709cca\]4;14;#76bae8\]4;15;#e6ffff\]10;#e6ffff\]11;[90]#121213\]12;#e6ffff\]13;#e6ffff\]17;#e6ffff\]19;#121213\]4;232;#121213\]4;256;#e6ffff\]708;[90]#121213\
\ No newline at end of file
diff --git a/.config/wpg/templates/i3.base b/.config/wpg/templates/i3.base
index f3e4cb4..6fa542f 100644
--- a/.config/wpg/templates/i3.base
+++ b/.config/wpg/templates/i3.base
@@ -31,6 +31,7 @@ bindsym $mod+7 workspace $ws7
 bindsym $mod+8 workspace $ws8
 bindsym $mod+9 workspace $ws9
 bindsym $mod+0 workspace $ws10
+bindsym $mod+Tab exec i3-msg workspace back_and_forth
 
 # move focused container to workspace
 bindsym $mod+shift+1 move container to workspace $ws1
@@ -90,10 +91,10 @@ bindsym $mod+shift+$right move right
 bindsym $mod+shift+$up move up
 
 # resize
-bindsym $mod+i 				resize grow height 50 or 10
-bindsym $mod+o 				resize grow width 50 or 10
-bindsym $mod+u 				resize shrink height 50 or 10
-bindsym $mod+y				resize shrink width 50 or 10
+bindsym $mod+i 				resize grow height 100 or 10
+bindsym $mod+o 				resize grow width 100 or 10
+bindsym $mod+u 				resize shrink height 100 or 10
+bindsym $mod+y				resize shrink width 100 or 10
 
 ## LAYOUT
 # split direction
@@ -115,36 +116,34 @@ bindsym $mod+shift+s floating toggle; sticky toggle
 bindsym $mod+space focus mode_toggle
 
 ## SHORTCUTS
-bindsym $mod+shift+F1			exec --no-startup-id firefox /usr/local/share/doc/freebsd/handbook/book.html
-bindsym $mod+F2					exec --no-startup-id firefox
-bindsym $mod+shift+F2			exec --no-startup-id firefox --private-window
-bindsym $mod+F3					exec i3-filescmd.sh
-bindsym $mod+F4 				exec i3-mailcmd.sh
-bindsym $mod+F5 				exec i3-newsboatcmd.sh
-bindsym $mod+F6 				exec url_handler.sh `xclip -selection clipboard -o`
-bindsym $mod+F7 				exec dict.sh
+bindsym $mod+shift+F1			exec firefox /usr/local/share/doc/freebsd/handbook/book.html
+bindsym $mod+F2					exec firefox
+bindsym $mod+shift+F2			exec firefox --private-window
+bindsym $mod+F3					exec --no-startup-id i3-filescmd.sh
+bindsym $mod+F4 				exec --no-startup-id i3-mailcmd.sh
+bindsym $mod+F5 				exec --no-startup-id i3-newsboatcmd.sh
+bindsym $mod+F6 				exec --no-startup-id url_handler.sh `xclip -selection clipboard -o`
+bindsym $mod+F7 				exec --no-startup-id dict.sh
 bindsym $mod+F8 				exec toggle-webcam.sh
-bindsym $mod+Shift+F8			exec toggle-screencast.sh
-bindsym $mod+F9					exec abraham-porter.sh
-bindsym $mod+shift+F9			exec toggle-compositing.sh
-bindsym $mod+F10				exec mixer vol 0 && $sigaudio
-bindsym $mod+F11				exec mixer vol -5 && $sigaudio
-bindsym $mod+Shift+F11			exec xautolock -toggle
-bindsym $mod+F12				exec mixer vol +5 && $sigaudio
-bindsym $mod+Shift+F12			exec i3-mixercmd.sh
-bindsym $mod+Return 			split horizontal; exec alacritty
-bindsym $mod+Shift+Return		split vertical; exec alacritty
+bindsym $mod+Shift+F8			exec --no-startup-id toggle-screencast.sh
+bindsym $mod+F9					exec --no-startup-id abraham-porter.sh
+bindsym $mod+shift+F9			exec --no-startup-id toggle-compositing.sh
+#bindsym $mod+F10				exec 
+#bindsym $mod+F11				exec 
+bindsym $mod+Shift+F11			exec --no-startup-id xautolock -toggle
+bindsym $mod+Shift+F12			exec --no-startup-id i3-mixercmd.sh
+bindsym $mod+Return 			split horizontal; exec --no-startup-id alacritty
+bindsym $mod+Shift+Return		split vertical; exec --no-startup-id alacritty
 bindsym $mod+Shift+Insert		exec --no-startup-id $locker
-bindsym $mod+Tab				exec i3-msg workspace back_and_forth
-bindsym $mod+a					exec rofi -show run
+bindsym $mod+a					exec --no-startup-id rofi -show run
 bindsym $mod+shift+q			kill
-bindsym --release Print			exec i3-screeniecmd.sh
-bindsym --release shift+Print	exec i3-screenie_regioncmd.sh
-bindsym --release $mod+Print	exec i3-screenie_regioncmd.sh
+bindsym --release Print			exec --no-startup-id i3-screeniecmd.sh
+bindsym --release shift+Print	exec --no-startup-id i3-screenie_regioncmd.sh
+bindsym --release $mod+Print	exec --no-startup-id i3-screenie_regioncmd.sh
 bindsym Mod4+p					exec nvidia-settings
-bindsym XF86AudioLowerVolume	exec mixer vol -5 && $sigaudio
-bindsym XF86AudioMute			exec mixer vol 0 && $sigaudio
-bindsym XF86AudioRaiseVolume 	exec mixer vol +5 && $sigaudio
+bindsym XF86AudioLowerVolume	exec --no-startup-id mixer vol -5 && $sigaudio
+bindsym XF86AudioMute			exec --no-startup-id mixer vol 0 && $sigaudio
+bindsym XF86AudioRaiseVolume 	exec --no-startup-id mixer vol +5 && $sigaudio
 
 # scratchpad terminal
 bindsym $mod+shift+p move scratchpad
@@ -159,7 +158,7 @@ set $mode_system 󰌾l  󰩈e  󰤄s  󰤁r  󰤂shift+s
 mode "$mode_system" {{
 	bindsym e exec --no-startup-id i3-msg exit, mode "default"
 	bindsym l exec --no-startup-id $locker, mode "default"
-	bindsym s exec --no-startup-id $locker && sleep 2 && doas acpiconf -s3, mode "default"
+	bindsym s exec --no-startup-id $locker ; exec --no-startup-id sleep 2 && doas acpiconf -s3, mode "default"
 	bindsym r exec --no-startup-id doas reboot, mode "default"
 	bindsym shift+s exec --no-startup-id doas poweroff, mode "default"
 	bindsym Return mode "default"
@@ -167,6 +166,16 @@ mode "$mode_system" {{
 	bindsym Escape mode "default"
 }}
 
+set $mode_volume 󰝞J 󰝝K 󰸈M
+mode "$mode_volume" {{
+	bindsym j	exec mixer vol -5 && $sigaudio 
+	bindsym m	exec mixer vol 0 && $sigaudio
+	bindsym k 	exec mixer vol +5 && $sigaudio
+	bindsym Return mode "default"
+	bindsym q mode "default"
+	bindsym Escape mode "default"
+}}
+
 set $mode_help 󱊫Help/Handbook 󱊬Browser 󱊭Files 󱊮Email 󱊯News 󱊰YouTube 󱊱Dictionary 󱊲Dock/Compositor 󱊳Ports 󱊴Webcam/Screencast 󱊵AutoLock-Toggle 󱊶Mixer
 mode "$mode_help" {{
 	bindsym Return mode "default"
@@ -176,6 +185,7 @@ mode "$mode_help" {{
 
 bindsym $mod+Insert mode "$mode_system"
 bindsym $mod+F1 mode "$mode_help"
+bindsym $mod+F12 mode "$mode_volume"
 
 ## BARS
 bar {{
@@ -205,4 +215,4 @@ for_window [title = "pwcview"] border pixel 1; floating enable; sticky enable; m
 for_window [title = "sxiv"] floating enable
 
 ## STARTUP
-exec --no-startup-id firefox
+exec firefox
diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add
index 13d56ea..9678593 100644
--- a/.vim/spell/en.utf-8.add
+++ b/.vim/spell/en.utf-8.add
@@ -6,3 +6,6 @@ ZFS
 ransomware
 whitelist
 usr
+Burbage
+Scottsfield
+Amberly
diff --git a/.vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl
index eee3df2..3740a87 100644
--- a/.vim/spell/en.utf-8.add.spl
+++ b/.vim/spell/en.utf-8.add.spl
diff --git a/.xinitrc b/.xinitrc
index 4deb7b6..d91fbc0 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -2,5 +2,5 @@
 xrdb -merge ~/.Xresources &&
 picom &
 dunst &
-~/.local/scripts/dockd.sh &
+~/.local/scripts/dockd.sh >/var/log/xinit/dockd.log &
 exec i3 2>&1 > /var/log/xinit/i3wm.log