General housekeeping

6 files changed, 10 insertions, 41 deletions

diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index 51b03cb..14125d6 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -146,8 +146,11 @@ super + e
 XF86WLAN
     killall nmtui || dropdowntoggle network nmtui
 ## TUI Audio Mixer (pulsemixer)
+super + shift + p
+    killall pulsemixer || dropdowntoggle audio pulsemixer
+## Display selector (connect to projector/secondary monitor)
 super + p
-    killall pulsemixer || dropdowntoggle bluetooth pulsemixer
+    displayselect
 ## TODOs (orgmode-nvim)
 super + space
     dropdowntoggle orgmode nvim +"Neorg index"
@@ -165,9 +168,6 @@ super + r
 ## Application Launcher
 super + d
     j4-dmenu-desktop
-## Display Layout Selector
-super + shift + d
-    displayselect
 ## Emoji & Font-Awesome Selector
 alt + grave
     emoji-copy
diff --git a/.config/xresources/workstation b/.config/xresources/workstation
deleted file mode 100644
index 2d6d9c9..0000000
--- a/.config/xresources/workstation
+++ /dev/null
@@ -1,7 +0,0 @@
-Xft.dpi: 96
-Xft.autohing: 0
-Xft.lcdfilter:  lcddefault
-Xft.hintstyle:  hintfull
-Xft.hinting: 1
-Xft.antialias: 1
-Xft.rgba: rgb
diff --git a/.local/bin/lfub b/.local/bin/lfub
deleted file mode 100755
index 43a7ef9..0000000
--- a/.local/bin/lfub
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# This is a wrapper script for lb that allows it to create image previews with
-# ueberzug. This works in concert with the lf configuration file and the
-# lf-cleaner script.
-
-set -e
-
-cleanup() {
-	exec 3>&-
-	rm "$FIFO_UEBERZUG"
-}
-
-if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
-	lf "$@"
-else
-	[ ! -d "$HOME/.cache/lf" ] && mkdir -p "$HOME/.cache/lf"
-	export FIFO_UEBERZUG="$HOME/.cache/lf/ueberzug-$$"
-	mkfifo "$FIFO_UEBERZUG"
-	ueberzug layer -s -p json <"$FIFO_UEBERZUG" &
-	exec 3>"$FIFO_UEBERZUG"
-	trap cleanup HUP INT QUIT TERM PWR EXIT
-	lf "$@" 3>&-
-	killall ueberzug >/dev/null 2>&1
-fi
diff --git a/.local/bin/updatestatus b/.local/bin/updatestatus
index aedbb84..7000608 100755
--- a/.local/bin/updatestatus
+++ b/.local/bin/updatestatus
@@ -4,7 +4,7 @@ time="$($1)"
 [ -z "$1" ] && time="5"
 
 # Prevent "no such file or directory" on 1st run
-genlop -c >/tmp/genlop
+clear && genlop -c >/tmp/genlop
 
 while true; do
 	cat /tmp/genlop
diff --git a/.profile b/.profile
index 0055553..b86c829 100644
--- a/.profile
+++ b/.profile
@@ -19,13 +19,14 @@ export DISTRIB_ID=arch
 export DISTRIB_RELEASE=$(uname -r)
 export XDG_CONFIG_HOME=$HOME/.config
 export XDG_DATA_HOME=$HOME/.local/share
+export XDG_CACHE_HOME=$HOME/.cache
 export R_PROFILE_USER=$HOME/.config/R/Rprofile
 export ZDOTDIR=$XDG_CONFIG_HOME/zsh
 export TEXMFHOME=$XDG_DATA_HOME/texmf
 export TEXSRC=$HOME/.local/src/sherbrooke-tex
 
 # Applications
-export EDITOR=$(which nvim)
+export EDITOR=/usr/bin/nvim
 export READER=/usr/bin/zathura
 export TERMINAL=/usr/local/bin/st
 export TERM=/usr/local/bin/st
@@ -46,7 +47,7 @@ shortcutgen
 aliasgen
 
 # Import shortcut ENV variables
-source "$HOME/.cache/env-shortcuts"
+source "$XDG_CACHE_HOME/env-shortcuts"
 
 # Ensure XDG_RUNTIME_DIR is set
 if test -z "$XDG_RUNTIME_DIR"; then
diff --git a/.xinitrc b/.xinitrc
index c98de06..5e0df62 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -3,8 +3,8 @@ sxhkd &
 dunst &
 unclutter &
 picom -b &
-echo us >$HOME/.cache/layout
-xrdb -load $HOME/.Xresources
+echo us >"$HOME/.cache/layout"
+xrdb -load "$HOME/.Xresources"
 flashfocus -n 30 -t 150 -l never -o 0.75 -v ERROR &
 dwmblocks &
 remaps &