Merge branch 'dennisleexyz-ui'

.config/mpd/mpd.conf

@@ -1,26 +1,19 @@
-db_file            "${XDG_CONFIG_HOME:-$HOME/.config}/mpd/database"
+music_directory		"~/Music"
-log_file           "${XDG_CONFIG_HOME:-$HOME/.config}/mpd/log"
+playlist_directory	"~/.config/mpd/playlists"
-music_directory    "~/Music"
-playlist_directory "${XDG_CONFIG_HOME:-$HOME/.config}/mpd/playlists"
-pid_file           "${XDG_CONFIG_HOME:-$HOME/.config}/mpd/pid"
-state_file         "${XDG_CONFIG_HOME:-$HOME/.config}/mpd/state"
-sticker_file       "${XDG_CONFIG_HOME:-$HOME/.config}/mpd/sticker.sql"
 
 auto_update "yes"
-
 bind_to_address "127.0.0.1"
 restore_paused "yes"
 max_output_buffer_size "16384"
 
 audio_output {
       type  "alsa"
-      name  "alsa for audio soundcard"
+      name  "ALSA"
-      mixer_type "software"
 }
 
 audio_output {
-type               "fifo"
+       type	"fifo"
-name               "toggle_visualizer"
+       name	"Visualizer feed"
-path               "/tmp/mpd.fifo"
+       path	"/tmp/mpd.fifo"
-format             "44100:16:2"
+       format	"44100:16:2"
 }

.config/nvim/init.vim

@@ -103,8 +103,9 @@ set clipboard+=unnamedplus
 	autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x!<CR>
 	autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR>
 
-" Automatically deletes all trailing whitespace on save.
+" Automatically deletes all trailing whitespace and newlines at end of file on save.
 	autocmd BufWritePre * %s/\s\+$//e
+	autocmd BufWritepre * %s/\n\+\%$//e
 
 " When shortcut files are updated, renew bash and ranger configs with new material:
 	autocmd BufWritePost files,directories !shortcuts

.local/bin/statusbar/battery

@@ -22,6 +22,6 @@ do
 	# If it is discharging and 25% or less, we will add a ❗ as a warning.
 	 [ "$capacity" -le 25 ] && [ "$status" = "🔋" ] && warn="❗"
 
-	printf "%s%s%s%%\n" "$status" "$warn" "$capacity"
+	printf "%s%s%s%% " "$status" "$warn" "$capacity"
 	unset warn
-done
+done | sed s/\ $/\\n/

.local/bin/statusbar/cpu

@@ -1,10 +1,11 @@
 #!/bin/sh
 
 case $BLOCK_BUTTON in
-	1) notify-send "🖥 CPU hogs" "$(ps axch -o cmd:15,%cpu --sort=-%cpu | head)" ;;
+	1) notify-send "🖥 CPU hogs" "$(ps axch -o cmd:15,%cpu --sort=-%cpu | head)\\n(100% per core)" ;;
+	2) setsid "$TERMINAL" -e htop & ;;
 	3) notify-send "🖥 CPU module " "\- Shows CPU temperature.
 - Click to show intensive processes.
-- % is of single core." ;;
+- Middle click to open htop." ;;
 esac
 
 sensors | awk '/Core 0/ {print "🌡", $3}'

.local/bin/statusbar/help

@@ -1,8 +1,16 @@
 #!/bin/sh
 
+# The clickable help menu. Middle click to restart wm.
+
+# If dwm is running, use dwm's readme and restart.
+ps ax | grep -q "\sdwm$" &&
+	READMEFILE=/usr/local/share/dwm/larbs.mom
+	restartwm() { pkill -HUP dwm ;} ||
+		restartwm() { i3 restart ;}
+
 case $BLOCK_BUTTON in
-    1) groff -mom ${XDG_DATA_HOME:-$HOME/.local/share}/larbs/readme.mom -Tpdf | zathura - ;;
+    1) groff -mom "${READMEFILE:-${XDG_DATA_HOME:-$HOME/.local/share}/larbs/readme.mom}" -Tpdf | zathura - ;;
-    2) i3 restart ;;
+    2) restartwm ;;
     3) notify-send "❓ Help module" "\- Left click to open LARBS guide.
-- Middle click to refresh i3.";;
+- Middle click to refresh window manager.";;
 esac; echo "❓"

.local/bin/statusbar/memory

@@ -2,8 +2,10 @@
 
 case $BLOCK_BUTTON in
 	1) notify-send "🧠 Memory hogs" "$(ps axch -o cmd:15,%mem --sort=-%mem | head)" ;;
+	2) setsid "$TERMINAL" -e htop & ;;
 	3) notify-send "🧠 Memory module" "\- Shows Memory Used/Total.
-- Click to show memory hogs." ;;
+- Click to show memory hogs.
+- Middle click to open htop." ;;
 esac
 
 free -h | sed -n '2{p;q}' | awk '{print "🧠", $3 "/" $2}'

.local/bin/statusbar/pacpackages

@@ -15,14 +15,14 @@
 # [Action]
 # Description = Updating statusbar...
 # When = PostTransaction
-# Exec = /usr/bin/pkill -RTMIN+8 dwmblocks
+# Exec = /usr/bin/pkill -RTMIN+8 dwmblocks # Or i3blocks if using i3.
 
 case $BLOCK_BUTTON in
-	1) $TERMINAL -e popupgrade ;;
+	1) setsid "$TERMINAL" -e popupgrade & ;;
 	2) notify-send "$(/usr/bin/pacman -Qu)" ;;
-	3) notify-send "Upgrade module" "📦: number of upgradable packages
+	3) notify-send "🎁 Upgrade module" "📦: number of upgradable packages
 - Left click to upgrade packages
 - Middle click to show upgradable packages" ;;
 esac
 
-pacman -Qu | grep -v "\[ignored\]" | wc -l | sed "s/^/📦/;s/^📦0$//g"
+pacman -Qu | grep -cv "\[ignored\]" | sed "s/^/📦/;s/^📦0$//g"

.local/bin/statusbar/weather

@@ -18,7 +18,7 @@ sed '13q;d' "${XDG_DATA_HOME:-$HOME/.local/share}/weatherreport" | grep -o "m\\(
 
 # The BLOCK_BUTTON bloat for clicking in i3.
 case $BLOCK_BUTTON in
-    1) $TERMINAL -e less -Srf "${XDG_DATA_HOME:-$HOME/.local/share}/weatherreport" ;;
+    1) setsid "$TERMINAL" -e less -Srf "${XDG_DATA_HOME:-$HOME/.local/share}/weatherreport" & ;;
     2) getforecast && showweather ;;
     3) notify-send "🌈 Weather module" "\- Left click for full forecast.
 - Middle click to update forecast.

.profile

@@ -41,6 +41,8 @@ export LESS_TERMCAP_se="$(printf '%b' '')"
 export LESS_TERMCAP_us="$(printf '%b' '')"
 export LESS_TERMCAP_ue="$(printf '%b' '')"
 export LESSOPEN="| /usr/bin/highlight -O ansi %s 2>/dev/null"
+export QT_QPA_PLATFORMTHEME="gtk2"	# Have QT use gtk2 theme.
+export MOZ_USE_XINPUT2="1"		# Mozilla smooth scrolling/touchpads.
 
 # This is the list for lf icons:
 export LF_ICONS="di=📁:\