From 4773b354a32bcf1ff1582b74b34b1a922847d679 Mon Sep 17 00:00:00 2001
From: Adam Cooper <adam@theadamcooper.com>
Date: Sun, 4 Sep 2022 15:50:18 -0400
Subject: [PATCH] Changes (mostly) for new Dell laptop [X11] Smaller font sizes
 [xmobar] Attempt to get weather emoji working [xmobar] Temporarily remove
 volume from xmobar [xmonad] Tweaks to startup script [zsh] Comment out zsh
 items before they're re-enabled

---
 arch/X11/.Xresources              | 12 ++++++------
 arch/xmobar/.xmobarrc             | 18 ++++++------------
 arch/xmonad/autostart.sh          |  8 +++++---
 arch/zsh/.zshrc                   |  6 +++---
 arch/zsh/theme-and-appearance.zsh |  4 ++--
 5 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/arch/X11/.Xresources b/arch/X11/.Xresources
index 038a3d0..191ba87 100644
--- a/arch/X11/.Xresources
+++ b/arch/X11/.Xresources
@@ -1,5 +1,5 @@
 *.termName: xterm-256color
-*faceName: Fantasque Sans Mono:size=10
+*faceName: Fantasque Sans Mono:size=8
 ! XTerm*eightBitInput: false
 ! XTerm*eightBitOutput: true
 *metaSendsEscape: true
@@ -29,15 +29,15 @@ Xcursor.size: 48
 ! }}}
 
 ! VT Font Menu: Unreadable
-*faceSize1: 8
+*faceSize1: 6
 ! VT font menu: Tiny
-*faceSize2: 10
+*faceSize2: 8
 ! VT font menu: Medium
-*faceSize3: 12
+*faceSize3: 10
 ! VT font menu: Large
-*faceSize4: 16
+*faceSize4: 14
 ! VT font menu: Huge
-*faceSize5: 22
+*faceSize5: 20
 
 ! Theme
 *background: #f6f5f4
diff --git a/arch/xmobar/.xmobarrc b/arch/xmobar/.xmobarrc
index 281e86d..21478e4 100644
--- a/arch/xmobar/.xmobarrc
+++ b/arch/xmobar/.xmobarrc
@@ -5,18 +5,18 @@ Config { overrideRedirect = False
        , fgColor  = "#191970"
        , position = TopW L 90
        , commands = [ Run WeatherX "KLGA"
-                        [ ("clear", "🌣")
-                        , ("sunny", "🌣")
-                        , ("mostly clear", "🌤")
+                        [ ("clear", "\x2600")
+                        , ("sunny", "\x1f31e")
+                        , ("mostly clear", "🌣")
                         , ("mostly sunny", "🌤")
                         , ("partly sunny", "⛅")
                         , ("fair", "🌑")
                         , ("cloudy","☁")
                         , ("overcast","☁")
                         , ("partly cloudy", "⛅")
-                        , ("mostly cloudy", "🌧")
+                        , ("mostly cloudy", "\x1f325\xfe0f")
                         , ("considerable cloudiness", "⛈")]
-                        [ "--template", "<skyConditionS> <tempF>°F"
+                        [ "--template", "<fn=1><skyConditionS></fn> <tempF>°F"
                         , "-L", "0"
                         , "-H", "25"
                         , "--low"   , "blue"
@@ -29,12 +29,6 @@ Config { overrideRedirect = False
                         , "--high"  , "red"
                         , "--normal", "darkgreen"
                         ] 10
-                    , Run Alsa "default" "Master"
-                        [ "--template", "<volumestatus>"
-                        , "--suffix"  , "True"
-                        , "--"
-                        , "--on", ""
-                        ]
                     , Run Memory ["--template", "Mem: <usedratio>%"] 10
                     , Run Swap [] 10
                     , Run Date "%a %Y-%m-%d <fc=#191970>%H:%M</fc>" "date" 10
@@ -42,5 +36,5 @@ Config { overrideRedirect = False
                     ]
        , sepChar  = "%"
        , alignSep = "}{"
-       , template = "%StdinReader% }{ %alsa:default:Master% | %cpu% | %memory% * %swap% | %KLGA% | %date% "
+       , template = "%StdinReader% }{ %cpu% | %memory% * %swap% | %KLGA% | %date% "
        }
diff --git a/arch/xmonad/autostart.sh b/arch/xmonad/autostart.sh
index 701e15b..f31e5c9 100755
--- a/arch/xmonad/autostart.sh
+++ b/arch/xmonad/autostart.sh
@@ -4,11 +4,13 @@
 sleep 16
 
 # /usr/sbin/qutebrowser --restore home & sleep 5 && sh -c "wmctrl -r qutebrowser -t 2"
-/usr/sbin/qutebrowser & sleep 5 && sh -c "wmctrl -r qutebrowser -t 2"
-/usr/sbin/xterm -fa 'Fantasque Sans Mono:size=8' -e btm --battery --color gruvbox-light & sleep 5 && sh -c "wmctrl -r btm -t 1"
+# /usr/sbin/qutebrowser & sleep 5 && sh -c "wmctrl -r qutebrowser -t 2"
+# /usr/sbin/firefox-developer-edition & sleep 5 && sh -c "wmctrl -r firefox -t 2"
+/usr/sbin/xterm -fa 'Fantasque Sans Mono:size=6' -e btm --battery --color gruvbox-light & sleep 5 && sh -c "wmctrl -r btm -t 1"
 # /usr/sbin/xterm -e newsboat & sleep 5 && sh -c "wmctrl -r newsboat -t 4"
 # /usr/sbin/xterm -e joplin & sleep 5 && sh -c "wmctrl -r joplin -t 5"
 /usr/sbin/cbatticon &
 /usr/sbin/nextcloud &
-/usr/sbin/xterm -e neomutt & sleep 5 && sh -c "wmctrl -r neomutt -t 3"
+/usr/sbin/nm-applet --no-agent &
+# /usr/sbin/xterm -e neomutt & sleep 5 && sh -c "wmctrl -r neomutt -t 3"
 # /usr/sbin/xterm -e aerc & sleep 5 && sh -c "wmctrl -r aerc -t 3"
diff --git a/arch/zsh/.zshrc b/arch/zsh/.zshrc
index 8386b6d..4acb73d 100644
--- a/arch/zsh/.zshrc
+++ b/arch/zsh/.zshrc
@@ -114,16 +114,16 @@ cursor_mode
 eval "$(zoxide init zsh)"
 
 # navi #
-eval "$(navi widget zsh)"
+# eval "$(navi widget zsh)"
 
 # tmuxp completion
 eval "$(_TMUXP_COMPLETE=source_zsh tmuxp)"
 
 source /home/adam/.cargo/env
-source /usr/share/nvm/init-nvm.sh
+# source /usr/share/nvm/init-nvm.sh
 
 # rbenv
-eval "$(rbenv init -)"
+# eval "$(rbenv init -)"
 
 # broot
 source /home/adam/.config/broot/launcher/bash/br
diff --git a/arch/zsh/theme-and-appearance.zsh b/arch/zsh/theme-and-appearance.zsh
index 01250a8..e366ab0 100644
--- a/arch/zsh/theme-and-appearance.zsh
+++ b/arch/zsh/theme-and-appearance.zsh
@@ -47,8 +47,8 @@ fi
 # GTK3 scaling
 # These variables used to be set. Not sure why I unset them. They fix text and
 # icon sizes on the HiDPI monitor.
-export GDK_SCALE=2
-export GDK_DPI_SCALE=0.5
+# export GDK_SCALE=2
+# export GDK_DPI_SCALE=0.5
 
 setopt auto_cd
 setopt multios