aliases, functions, mutt config, i3 template

14 files changed, 120 insertions, 82 deletions

diff --git a/.aliases b/.aliases
index d08daf2..a68442a 100644
--- a/.aliases
+++ b/.aliases
@@ -12,7 +12,7 @@ alias g="git status -s"
 alias gg="git add -A && git commit ; git push"
 alias grep="grep --color -i"
 alias l="ls"
-alias less="less --mouse --quit-if-one-screen --ignore-case --LINE-NUMBERS"
+alias less="less --long-prompt --mouse --quit-if-one-screen --ignore-case --LINE-NUMBERS"
 alias lightgtk="GTK2_RC_FILES= GTK_DATA_PREFIX= GTK_THEME=Adwaita"
 alias ll="ls -lahGF"
 alias ln="ln -v"
@@ -22,34 +22,50 @@ alias noprompt="PROMPT= RPROMPT= "
 alias q="ls|grep"
 alias qq="find .|grep"
 alias sigil="crispy-doom -iwad ~/games/doom/DOOM.WAD -file ~/games/doom/SIGIL_v1_21/SIGIL_COMPAT_v1_21.wad"
-alias sudo="doas"
+alias doas="doas "
+alias sudo="doas "
 alias synonym="dict -d moby-thesaurus"
 alias tar="tar -v"
 
 # Useful functions
 
+function i3-swallow() {
+	i3-msg -q "mark swallowed$$"
+	i3-msg -q "[con_mark=\"swallowed$$\"] split toggle"
+	i3-msg -q "[con_mark=\"swallowed$$\"] layout tabbed"
+}
+
+function i3-unswallow() {
+	i3-msg -q "[con_mark=\"swallowed$$\"] layout default"
+	i3-msg -q "[con_mark=\"swallowed$$\"] split toggle"
+	i3-msg -q "unmark swallowed$$"
+}
+
 function o() {
-	case "$1" in 
+	case "$@" in 
+		*.d64|*.prg)
+			i3-swallow && x64 "$1" && i3-unswallow
+			;;
 		*.wad|*.WAD)
-			crispy-doom -iwad "$1" &
+			i3-swallow && crispy-doom -iwad "$1" && i3-unswallow
 			;;
-		*.pdf|*.epub|*.xhtml|*.xps)
-			mupdf "$1"
+		*.PDF|*.pdf|*.epub|*.xhtml|*.xps)
+			i3-swallow && mupdf "$@" && i3-unswallow
 			;;
 		*.jpg|*.png|*.bmp|*.gif|*.jpeg|*.JPG|*.JPEG|*.webp|*.tiff)
-			find "$(dirname $1)" -type f -depth 1 -exec sxiv -a "$1" "{}" + 2>/dev/null &
+			i3-swallow && sxiv -a "$(dirname $1)" "$@" && i3-unswallow
 			;;
 		*.xcf)
-			gimp "$1" 2>/dev/null &
+			gimp "$@" 2>/dev/null &
 			;;
 		*.wav|*.mp3|*.flac|*.m4a|*.wma|*.ape|*.ac3|*.og|*.ogagx|*.spx|*.opus)
-			mpv --no-video "$1" 2>/dev/null
+			mpv --no-video "$@" 2>/dev/null
 			;;
 		*.avi|*.mp4|*.wmv|*.dat|*.3gp|*.ogv|*.mkv|*.mpg|*.mpeg|*.vob|*.m2v|*.mov|*.webm|*.ts|*.mts|*.m4v|*.qt|*.divx)
-			mpv "$1" 2>/dev/null & 
+			i3-swallow && mpv "$@" && i3-unswallow
 			;;
 		*.html|*.htm)
-			$BROWSER "$1" 2>/dev/null &
+			$BROWSER "$@" 2>/dev/null &
 			;;
 		*.zip|*.jar|*.war|*.7z|*.7zip|*.tar|*.tar.gz|*.tgz|*.tar.xz|*.xz|*.txz|*.iso)
 			tar -xvf "$1"
@@ -58,7 +74,7 @@ function o() {
 			sc-im "$1"
 			;;
 		*.lcd|*.ldr|*.mpd)
-			leocad "$1"
+			leocad "$@"
 			;;
 		*)
 			[ -f "$1" ] && less "$1" || echo Unsure what to do...
@@ -89,3 +105,15 @@ theme_reset() {
 	wpg -s "$(wpg -c)"
 }
 
+bak() {
+	mv -n "$1" "$1".bak
+}
+
+rename() {
+	# Reads filenames from args, uses vim to generate their new filenames, and then mv's them.
+	src="$(mktemp -t rename)"
+	dst="$(mktemp -t rename)"
+	printf '%s\n' "$@" | tee "$src" > "$dst"
+	$EDITOR "$dst"
+	diff -s "$src" "$dst" > /dev/null || paste "$src" "$dst" | sed -e "s/\t/' '/" -e "s/^/mv -i '/" -e "s/$/'/" | sh
+}
diff --git a/.config/i3/config b/.config/i3/config
index 5ff0929..88b7cde 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -53,13 +53,13 @@ bindsym $mod+shift+0 move container to workspace $ws10
 
 ## COLORS
 # base colors -- set by WPG
-set $coloract "#3b659f"
-set $colorin "#28456d"
-set_from_resource $color0 i3wm.color0 "#0a0b0a"
-set_from_resource $color15 i3wm.color15 "#fffefe"
-set_from_resource $color8 i3wm.color8 "#212521"
-set_from_resource $coloru i3wm.color2 "#778655"
-set_from_resource $split i3wm.color10 "#a0bc60"
+set $coloract "#344cc1"
+set $colorin "#243484"
+set_from_resource $color0 i3wm.color0 "#02031E"
+set_from_resource $color15 i3wm.color15 "#eef3ff"
+set_from_resource $color8 i3wm.color8 "#03064e"
+set_from_resource $coloru i3wm.color2 "#565463"
+set_from_resource $split i3wm.color10 "#67618c"
 
 # class                 border    backgr    text    indicator child_border
 client.background       $color0
@@ -118,19 +118,20 @@ bindsym $mod+space focus mode_toggle
 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 alacritty -e zsh -i -c "vifm ~ ~/downloads"
-bindsym $mod+F4 				exec alacritty -t "Reading Email" -e sh -i -c 'OLDPWD="$PWD" && cd ~/downloads/ && mutt && cd "$OLDPWD"' && mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks
-bindsym $mod+F5 				exec alacritty -t "Reading News" -e zsh -i -c newsboat && pkill -78 i3blocks
-bindsym $mod+F6 				exec --no-startup-id url_handler.sh 
-bindsym $mod+F7 				exec --no-startup-id dict.sh
-bindsym $mod+F8 				exec "pkill pwcview || exec pwcview -f 30 -s sif"
-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 "killall picom || exec picom"
-bindsym $mod+F10				exec xautolock -toggle
-bindsym $mod+F11				exec dockd.sh dock
-bindsym $mod+shift+F11			exec dockd.sh undock
-bindsym $mod+shift+F12			exec alacritty -e zsh -i -c mixertui && pkill -75 i3blocks
+bindsym $mod+F3 				exec url_handler.sh 
+bindsym $mod+F4 				exec alacritty -e zsh -i -c 'OLDPWD="$PWD" && cd ~/downloads/ && mutt && cd "$OLDPWD"' && mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks && notify-send 'Email syncd'
+bindsym $mod+shift+F4 			exec mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks && notify-send 'Email syncd'
+bindsym $mod+F5 				exec alacritty -e zsh -i -c 'newsboat && pkill -78 i3blocks'
+bindsym $mod+F6 				exec --no-startup-id dict.sh
+#bindsym $mod+F7 				exec 
+#bindsym $mod+F8 				exec "killall pwcview || exec pwcview -f 30 -s sif"
+#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 "killall picom || exec picom"
+#bindsym $mod+F10				exec xautolock -toggle
+#bindsym $mod+F11				exec dockd.sh dock
+#bindsym $mod+shift+F11			exec dockd.sh undock
+#bindsym $mod+shift+F12			exec alacritty -e zsh -i -c mixertui && pkill -75 i3blocks
 bindsym $mod+Return 			split horizontal; exec alacritty
 bindsym $mod+shift+Return		split vertical; exec alacritty
 bindsym $mod+shift+Insert		exec $locker
@@ -140,6 +141,9 @@ bindsym --release Print			exec import -window root ~/Nextcloud/InstantUpload/Scr
 bindsym --release shift+Print	exec import ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
 bindsym --release $mod+Print	exec import ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
 bindsym Mod4+p					exec nvidia-settings
+bindsym $mod+F10				exec --no-startup-id mixer vol 0 && $sigaudio
+bindsym $mod+F11				exec --no-startup-id mixer vol -5 && $sigaudio
+bindsym $mod+F12				exec --no-startup-id 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
@@ -183,8 +187,8 @@ mode "$mode_help" {
 }
 
 bindsym $mod+Insert mode "$mode_system"
-bindsym $mod+F1 mode "$mode_help"
-bindsym $mod+F12 mode "$mode_volume"
+#bindsym $mod+F1 mode "$mode_help"
+#bindsym $mod+F12 mode "$mode_volume"
 
 ## BARS
 bar {
@@ -207,12 +211,14 @@ bar {
 
 ## DEFAULT PLACEMENT
 for_window [class = "Wpg"] floating enable
-for_window [title = "Reading Email"] floating enable
-for_window [title = "Reading News"] floating enable
+for_window [title = "x64"] floating enable
 for_window [title = "Streaming from YouTube"] floating enable; sticky enable
 for_window [title = "pwcview"] border pixel 1; floating enable; sticky enable; move position 1598px 808px
-for_window [title = "sxiv"] floating enable
+#for_window [title = "sxiv"] floating enable
 
 ## STARTUP
+exec --no-startup-id picom
+exec --no-startup-id dunst
+exec --no-startup-id ~/.local/scripts/dockd.sh 
 exec firefox
 exec nextcloud
diff --git a/.config/i3blocks/config b/.config/i3blocks/config
index e094451..968a4b4 100644
--- a/.config/i3blocks/config
+++ b/.config/i3blocks/config
@@ -4,6 +4,9 @@
 # and its website describes the configuration:
 #
 #     https://vivien.github.io/i3blocks
+#
+# Note: on FreeBSD, the signals listed here are used by running `pkill -[signal
+# + 65]`. So for example, if a block signal is 10, you would use `pkill -75`
 #test=󰣠
 markup=pango
 
@@ -12,25 +15,23 @@ separator=true
 separator_block_width=15
 
 [packages]
-interval=3600
-command=[ "$BLOCK_BUTTON" == 3 ] && alacritty -e zsh -i -c "doas pkg upgrade" || count=$(pkg upgrade -n | sed -n 's/^Number of packages to be upgraded:\(.*\)/\1/p') ; [ -n "$count" ] && [ "$count" -gt 0 ] && printf "󰏖%s" $count && return 33 || return 0
+interval=once
+signal=14
+command=count=$(pkg upgrade -n | sed -n 's/^Number of packages to be upgraded:\(.*\)/\1/p') ; [ -n "$count" ] && [ "$count" -gt 0 ] && printf "󰏖%s" $count && return 33 || return 0
 
 [mail]
-interval=1800
+interval=once
 signal=12
 command=unread=$(ls ~/.mail/gmail/Inbox/new/ | wc -l | cut -w -f2) ; [ $unread -gt 0 ] && printf "󰶋%s\n" $unread && return 33 || return 0
 
 [news]
-interval=1800
+interval=once
 signal=13
 command=unread=$(newsboat -x print-unread|cut -w -f1) && [ "$unread" != 0 ] && [ "$unread" != Authentication ] && printf "󰎕%s\n" $unread || return 0
 
-#[uptime]
-#interval=300
-#command=printf "󰣠%s\n" "$(uptime | grep -o 'up[^,]*' )"
-
 [updates]
-interval=86399
+interval=once
+signal=15
 command=doas freebsd-update updatesready > /dev/null ; [ $? -ne 2 ] && printf "󰣠Updates ready" || return 0
 
 [weather]
@@ -39,7 +40,7 @@ command=weather.sh
 
 [net]
 interval=10
-command=[ "$BLOCK_BUTTON" = 3 ] && doas service netif restart || inet=$(ifconfig lagg0 | grep inet\ | cut -w -f3 | tr '\n' ' ') ; [ "$(ifconfig em0|grep status|cut -d\: -f2)" = " active" ] && printf "󰈁%s\n" "$inet" || [ "$(ifconfig wlan0|grep status|cut -d\: -f2)" = " associated" ] && ssid=$(ifconfig wlan0|sed -n 's/^.*ssid \(.*\) channel.*$/\1/p') && [ -n "$ssid" ] && printf "󰖩%s %s\n" "$ssid" "$inet" || printf "󰈂Offline\n"
+command=[ "$BLOCK_BUTTON" = 3 ] && doas service netif restart || inet=$(ifconfig lagg0 | grep inet\ | cut -w -f3 | tr '\n' ' ') ; [ "$(ifconfig em0|grep status|cut -d\: -f2)" = " active" ] && printf "󰈁%s\n" "$inet" || [ "$(ifconfig wlan0|grep status|cut -d\: -f2)" = " associated" ] && ssid=$(ifconfig wlan0|sed -n 's/^.*ssid \(.*\) channel.*$/\1/p') && [ -n "$ssid" ] && printf "󰖩%s %s\n" "$ssid" "$inet" && return 0 || printf "󰈂Offline\n" && return 33
 
 [screencast]
 interval=once
@@ -52,7 +53,7 @@ signal=10
 command=vol=$(mixer vol|cut -d':' -f2) ; printf "󰕾%.2d\n" $vol ; [ $vol -eq 0 ] && return 33 || return 0
 
 [disk]
-interval=10
+interval=60
 command=printf "󰋊%s\n" $(df -hk /usr/home | cut -w -f5 | sed 1d)
 
 [memory]
@@ -68,7 +69,7 @@ interval=10
 command=celcius=$(sysctl -n dev.cpu.0.temperature|cut -d'.' -f1) ; printf "󰔏%.3d ℉\n" $(echo "$celcius * 9 / 5 + 32" | bc) ; [ $celcius -ge 80 ] && return 33 || return 0
 
 [battery]
-interval=59
+interval=60
 command=status=$(apm -b) ; level=$(apm -l) ; [ $status -eq 3 ] && printf "󰂄%.2d%%" $level || printf "󰂁%.2d%%" $level && [ $status -eq 2 ] && return 33 || return 0
 
 [date]
diff --git a/.config/mbsync/mbsyncrc b/.config/mbsync/mbsyncrc
index 8a03c48..51a2cbe 100644
--- a/.config/mbsync/mbsyncrc
+++ b/.config/mbsync/mbsyncrc
@@ -14,8 +14,8 @@ Path ~/.mail/gmail/
 Inbox ~/.mail/gmail/Inbox
 
 Channel gmail
-Master :gmail-remote:
-Slave :gmail-local:
+Far :gmail-remote:
+Near :gmail-local:
 Patterns * ![Gmail]* "[Gmail]/Sent Mail" "[Gmail]/Starred" "[Gmail]/All Mail" "[Gmail]/Trash"
 Create Both
 CopyArrivalDate yes
diff --git a/.config/mutt/mailcap b/.config/mutt/mailcap
index dd41352..3c1d333 100644
--- a/.config/mutt/mailcap
+++ b/.config/mutt/mailcap
@@ -1,3 +1 @@
-#text/html; w3m -I %{charset} -T text/html; copiousoutput;
-#text/html; firefox --new-tab %s; test=test -n "$DISPLAY"; nametemplate=%s.html; copiousoutput;
-text/html; firefox %s &; copiousoutput
+text/html; firefox %s && sleep 3; nametemplate=%s.html; needsterminal; copiousoutput
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index e750ef9..80bc259 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -4,9 +4,8 @@
 
 source "cat ~/.config/mutt/mutt_smtp_pass |"
 
-#mailboxes = +INBOX
-#auto_view text/html
-alternative_order text/plain text/html
+auto_view text/html
+alternative_order text/plain text/enriched text/html
 
 # Default list of header fields to weed when displaying.
 # Ignore all lines by default...
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
index 2c39f5d..50e0f9c 100644
--- a/.config/picom/picom.conf
+++ b/.config/picom/picom.conf
@@ -122,7 +122,7 @@ inactive-opacity = 0.8;
 
 # Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default)
 # frame-opacity = 1.0
-frame-opacity = 0.7;
+#frame-opacity = 0.7;
 
 # Default opacity for dropdown menus and popup menus. (0.0 - 1.0, defaults to 1.0)
 # menu-opacity = 1.0
@@ -140,7 +140,8 @@ inactive-opacity-override = false;
 # Specify a list of conditions of windows that should always be considered focused.
 # focus-exclude = []
 focus-exclude = [
-	"class_g = 'Firefox'"
+	"class_g = 'Firefox'",
+	"class_g = 'mpv'",
 ];
 
 # Use fixed inactive dim value, instead of adjusting according to window opacity.
diff --git a/.config/wpg/sequences b/.config/wpg/sequences
index 3385133..ad96706 100644
--- a/.config/wpg/sequences
+++ b/.config/wpg/sequences
@@ -1 +1 @@
-]4;0;#0a0b0a\]4;1;#8B755C\]4;2;#778655\]4;3;#B49E5C\]4;4;#44648F\]4;5;#9C9264\]4;6;#728EAE\]4;7;#c5c4c4\]4;8;#212521\]4;9;#c39968\]4;10;#a0bc60\]4;11;#fbd665\]4;12;#4a7fc7\]4;13;#dbc871\]4;14;#81b7f4\]4;15;#fffefe\]10;#fffefe\]11;[90]#0a0b0a\]12;#fffefe\]13;#fffefe\]17;#fffefe\]19;#0a0b0a\]4;232;#0a0b0a\]4;256;#fffefe\]708;[90]#0a0b0a\
\ No newline at end of file
+]4;0;#02031E\]4;1;#443F46\]4;2;#565463\]4;3;#3D4265\]4;4;#3E52AF\]4;5;#4D516E\]4;6;#636891\]4;7;#b7bbd0\]4;8;#03064e\]4;9;#5c4963\]4;10;#67618c\]4;11;#444d8d\]4;12;#4160f2\]4;13;#57609b\]4;14;#707acc\]4;15;#eef3ff\]10;#eef3ff\]11;[90]#02031E\]12;#eef3ff\]13;#eef3ff\]17;#eef3ff\]19;#02031E\]4;232;#02031E\]4;256;#eef3ff\]708;[90]#02031E\
\ No newline at end of file
diff --git a/.config/wpg/templates/i3.base b/.config/wpg/templates/i3.base
index 062a215..50e5383 100644
--- a/.config/wpg/templates/i3.base
+++ b/.config/wpg/templates/i3.base
@@ -118,19 +118,20 @@ bindsym $mod+space focus mode_toggle
 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 alacritty -e zsh -i -c "vifm ~ ~/downloads"
-bindsym $mod+F4 				exec alacritty -t "Reading Email" -e sh -i -c 'OLDPWD="$PWD" && cd ~/downloads/ && mutt && cd "$OLDPWD"' && mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks
-bindsym $mod+F5 				exec alacritty -t "Reading News" -e zsh -i -c newsboat && pkill -78 i3blocks
-bindsym $mod+F6 				exec --no-startup-id url_handler.sh 
-bindsym $mod+F7 				exec --no-startup-id dict.sh
-bindsym $mod+F8 				exec "pkill pwcview || exec pwcview -f 30 -s sif"
-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 "killall picom || exec picom"
-bindsym $mod+F10				exec xautolock -toggle
-bindsym $mod+F11				exec dockd.sh dock
-bindsym $mod+shift+F11			exec dockd.sh undock
-bindsym $mod+shift+F12			exec alacritty -e zsh -i -c mixertui && pkill -75 i3blocks
+bindsym $mod+F3 				exec url_handler.sh 
+bindsym $mod+F4 				exec alacritty -e zsh -i -c 'OLDPWD="$PWD" && cd ~/downloads/ && mutt && cd "$OLDPWD"' && mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks && notify-send 'Email syncd'
+bindsym $mod+shift+F4 			exec mbsync -c ~/.config/mbsync/mbsyncrc -a && pkill -77 i3blocks && notify-send 'Email syncd'
+bindsym $mod+F5 				exec alacritty -e zsh -i -c 'newsboat && pkill -78 i3blocks'
+bindsym $mod+F6 				exec --no-startup-id dict.sh
+#bindsym $mod+F7 				exec 
+#bindsym $mod+F8 				exec "killall pwcview || exec pwcview -f 30 -s sif"
+#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 "killall picom || exec picom"
+#bindsym $mod+F10				exec xautolock -toggle
+#bindsym $mod+F11				exec dockd.sh dock
+#bindsym $mod+shift+F11			exec dockd.sh undock
+#bindsym $mod+shift+F12			exec alacritty -e zsh -i -c mixertui && pkill -75 i3blocks
 bindsym $mod+Return 			split horizontal; exec alacritty
 bindsym $mod+shift+Return		split vertical; exec alacritty
 bindsym $mod+shift+Insert		exec $locker
@@ -140,6 +141,9 @@ bindsym --release Print			exec import -window root ~/Nextcloud/InstantUpload/Scr
 bindsym --release shift+Print	exec import ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
 bindsym --release $mod+Print	exec import ~/Nextcloud/InstantUpload/Screenshots/`date +"%Y-%m-%d-%H-%M-%S"`.png
 bindsym Mod4+p					exec nvidia-settings
+bindsym $mod+F10				exec --no-startup-id mixer vol 0 && $sigaudio
+bindsym $mod+F11				exec --no-startup-id mixer vol -5 && $sigaudio
+bindsym $mod+F12				exec --no-startup-id 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
@@ -183,8 +187,8 @@ mode "$mode_help" {{
 }}
 
 bindsym $mod+Insert mode "$mode_system"
-bindsym $mod+F1 mode "$mode_help"
-bindsym $mod+F12 mode "$mode_volume"
+#bindsym $mod+F1 mode "$mode_help"
+#bindsym $mod+F12 mode "$mode_volume"
 
 ## BARS
 bar {{
@@ -207,12 +211,14 @@ bar {{
 
 ## DEFAULT PLACEMENT
 for_window [class = "Wpg"] floating enable
-for_window [title = "Reading Email"] floating enable
-for_window [title = "Reading News"] floating enable
+for_window [title = "x64"] floating enable
 for_window [title = "Streaming from YouTube"] floating enable; sticky enable
 for_window [title = "pwcview"] border pixel 1; floating enable; sticky enable; move position 1598px 808px
-for_window [title = "sxiv"] floating enable
+#for_window [title = "sxiv"] floating enable
 
 ## STARTUP
+exec --no-startup-id picom
+exec --no-startup-id dunst
+exec --no-startup-id ~/.local/scripts/dockd.sh 
 exec firefox
 exec nextcloud
diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json
index 3886f16..75fceba 100644
--- a/.vim/coc-settings.json
+++ b/.vim/coc-settings.json
@@ -9,6 +9,7 @@
     "markdown",
     "rust",
     "vue",
+    "php",
     "xml"
   ],
   "rust-analyzer.checkOnSave.command": "clippy",
diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add
index df97f5d..b0017ea 100644
--- a/.vim/spell/en.utf-8.add
+++ b/.vim/spell/en.utf-8.add
@@ -11,3 +11,4 @@ Scottsfield
 Amberly
 Vierne
 badass
+LLC
diff --git a/.vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl
index c072478..d39b460 100644
--- a/.vim/spell/en.utf-8.add.spl
+++ b/.vim/spell/en.utf-8.add.spl
diff --git a/.vimrc b/.vimrc
index 00b6631..8d2fbd7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -69,4 +69,4 @@ endfunction
 highlight CocFloating ctermbg=black
 
 " Auto-reloading scripts
-autocmd BufWritePost i3.base !themer.sh -r
+autocmd BufWritePost .aliases !source ~/.aliases
diff --git a/.xinitrc b/.xinitrc
index d91fbc0..ac28748 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,6 +1,3 @@
 ~/.config/wpg/wp_init.sh &&
 xrdb -merge ~/.Xresources &&
-picom &
-dunst &
-~/.local/scripts/dockd.sh >/var/log/xinit/dockd.log &
 exec i3 2>&1 > /var/log/xinit/i3wm.log