From bd8b79332fe19d88cfdfe1cff1255e4c9c8be65d Mon Sep 17 00:00:00 2001
From: Josh Rahm <joshuarahm@gmail.com>
Date: Tue, 22 Nov 2022 21:41:59 -0700
Subject: Bunch of changes to XMobar

---
 extras/HOME/.xmobarrc                | 141 ++++++++++++++++++++---------------
 extras/HOME/.xmonad/xmobar-bluetooth |   2 +-
 extras/HOME/.xmonad/xmobar-media     |   2 +-
 extras/HOME/.xmonad/xmobar-weather   |  46 ++++++------
 4 files changed, 105 insertions(+), 86 deletions(-)

(limited to 'extras/HOME')

diff --git a/extras/HOME/.xmobarrc b/extras/HOME/.xmobarrc
index ade16c5..cec3879 100644
--- a/extras/HOME/.xmobarrc
+++ b/extras/HOME/.xmobarrc
@@ -1,67 +1,86 @@
 Config
-   { font = "xft:Monofur Nerd Font:size=12"
-   , additionalFonts = [
-       "xft:Monofur bold Nerd Font:style=bold:size=10",
-       "xft:Monofur bold Nerd Font:size=7",
-       "xft:Monofur bold Nerd Font:style=bold:size=8",
-       "xft:Monofur Nerd Font:size=6",
-       "xft:Monofur bold Nerd Font:size=18",
-       "xft:Monofur Nerd Font:style=bold:size=8",
-       "xft:Noto Sans Mono CJK JP:style=bold:size=8"
-       ]
-   , borderColor = "black"
-   , border = FullBM -1
-   , borderWidth = 2
-   , bgColor = "#000000"
-   , fgColor = "white"
-   , alpha = 255                 -- default: 255
-   , position = TopSize C 99 50
-  , textOffset = -1             -- default: -1
-   , iconOffset = -1             -- default: -1
-   , lowerOnStart = True
-   , pickBroadest = False        -- default: False
-   , persistent = True
-   , hideOnStart = False
-   , iconRoot = "/usr/local/google/home/rahm/.xmonad/resources"  -- default: "."
-   , allDesktops = True          -- default: True
-   , overrideRedirect = False    -- default: True
-   , sepChar = "%"
-   , alignSep = "}{"
-   , template =
+  { font = "xft:Monofur Nerd Font:size=12",
+    additionalFonts =
+      [ "xft:Monofur Bold Nerd Font Mono:style=bold:size=10",
+        "xft:Monofur Bold Nerd Font Mono:size=7",
+        "xft:Monofur Bold Nerd Font Mono:style=bold:size=8",
+        "xft:Monofur Bold Nerd Font Mono:size=6",
+        "xft:Monofur Bold Nerd Font Mono:size=18",
+        "xft:Monofur Bold Nerd Font Mono:style=bold:size=8",
+        "xft:Noto Sans Mono CJK JP:style=bold:size=8",
+        "xft:Monofur Nerd Font Mono:size=12"
+      ],
+    borderColor = "black",
+    border = FullBM -1,
+    borderWidth = 2,
+    bgColor = "#000000",
+    fgColor = "white",
+    alpha = 255, -- default: 255
+    position = TopSize C 99 40,
+    textOffset = -1, -- default: -1
+    iconOffset = -1, -- default: -1
+    lowerOnStart = True,
+    pickBroadest = False, -- default: False
+    persistent = True,
+    hideOnStart = False,
+    iconRoot = "/usr/local/google/home/rahm/.xmonad/resources", -- default: "."
+    allDesktops = True, -- default: True
+    overrideRedirect = False, -- default: True
+    sepChar = "%",
+    alignSep = "}{",
+    template =
       " %logo% \
       \%UnsafeStdinReader%}{\
       \ %cpu% %memory%   <fc=#404040>\
       \<action=alacritty -t 'Floating Term' -e sh -c 'curl wttr.in ; read i'>\
-      \%weather% \
+      \%weather%  \
       \</action>\
-      \</fc><fc=#a0a0a0>%media% </fc>\
-      \%bluetooth%  %bat%<fn=3><fc=#8888ff>   %time%</fc></fn> "
-   , commands = [
-       Run UnsafeStdinReader,
-       Run Date "%m/%d %H:%M:%S" "time" 10,
-       Run Cpu [
-           "-t", "<fn=3><fc=#202020><bar></fc></fn>",
-           "-L", "3",
-         "-H", "50",
-         "-b", "▄",
-         "-f", "▄",
-         "--normal", "#88ff88",
-         "--high", "#ff8888"
-       ] 10,
-       Run Memory [
-         "-t", "<fn=3><fc=#202020><usedbar></fc></fn>",
-         "-L", "3",
-         "-H", "50",
-         "-b", "▄",
-         "-f", "▄",
-         "--normal", "#88ff88",
-         "--high", "#ff8888"
-       ] 10,
-       Run Com ".xmonad/xmobar-media" [] "media" 20,
-       Run Com ".xmonad/xmobar-weather" [] "weather" 9000,
-       Run Com ".xmonad/xmobar-logo" [] "logo" 0,
-       Run Com "uname" ["-r"] "uname" 0,
-       Run Com ".xmonad/xmobar-bluetooth" [] "bluetooth" 50,
-       Run Com ".xmonad/xmobar-battery" [] "bat" 20
-     ]
-   }
+      \</fc><fc=#a0a0a0>%media%</fc>\
+      \%bluetooth% %bat%<fn=3><fc=#8888ff> %time%</fc></fn> ",
+    commands =
+      [ Run UnsafeStdinReader,
+        Run Date "%m/%d %H:%M:%S" "time" 10,
+        Run
+          Cpu
+          [ "-t",
+            "<fn=3><fc=#202020><bar></fc></fn>",
+            "-L",
+            "3",
+            "-H",
+            "50",
+            "-b",
+            "▄",
+            "-f",
+            "▄",
+            "--normal",
+            "#88ff88",
+            "--high",
+            "#ff8888"
+          ]
+          10,
+        Run
+          Memory
+          [ "-t",
+            "<fn=3><fc=#202020><usedbar></fc></fn>",
+            "-L",
+            "3",
+            "-H",
+            "50",
+            "-b",
+            "▄",
+            "-f",
+            "▄",
+            "--normal",
+            "#88ff88",
+            "--high",
+            "#ff8888"
+          ]
+          10,
+        Run Com ".xmonad/xmobar-media" [] "media" 20,
+        Run Com ".xmonad/xmobar-weather" [] "weather" 9000,
+        Run Com ".xmonad/xmobar-logo" [] "logo" 0,
+        Run Com "uname" ["-r"] "uname" 0,
+        Run Com ".xmonad/xmobar-bluetooth" [] "bluetooth" 50,
+        Run Com ".xmonad/xmobar-battery" [] "bat" 20
+      ]
+  }
diff --git a/extras/HOME/.xmonad/xmobar-bluetooth b/extras/HOME/.xmonad/xmobar-bluetooth
index 56a7521..a3a3ac7 100755
--- a/extras/HOME/.xmonad/xmobar-bluetooth
+++ b/extras/HOME/.xmonad/xmobar-bluetooth
@@ -13,7 +13,7 @@ if [ -d /sys/class/bluetooth ] ; then
     fi
 
     if [ "$key" == "Connected" -a "$value" == "yes" ] ; then
-      exec echo "<fc=#4287f5></fc> <fc=#a0a0a0><fn=3>$cur</fn></fc>  "
+      exec echo "<fc=#4287f5></fc> <fc=#a0a0a0><fn=3>$cur</fn></fc> "
     fi
   done
 
diff --git a/extras/HOME/.xmonad/xmobar-media b/extras/HOME/.xmonad/xmobar-media
index 56c4d03..d88c69a 100755
--- a/extras/HOME/.xmonad/xmobar-media
+++ b/extras/HOME/.xmonad/xmobar-media
@@ -3,7 +3,7 @@
 title="$(spotify-control getTitle)"
 
 if [[ "$?" -eq 0 ]] ; then
-  echo "<fc=#1aa54b></fc> <fn=3>$title</fn>  "
+  echo "<fc=#1aa54b> </fc> <fn=3>$title</fn>  "
 else
   echo "<fc=#404040> </fc>"
 fi
diff --git a/extras/HOME/.xmonad/xmobar-weather b/extras/HOME/.xmonad/xmobar-weather
index fdcd40f..b95fadb 100755
--- a/extras/HOME/.xmonad/xmobar-weather
+++ b/extras/HOME/.xmonad/xmobar-weather
@@ -69,30 +69,30 @@ if ($current_str gt $sunrise_str and $current_str lt $sunset_str) {
 $dir=%directions{$wind_direction};
 
 %conditions_day = (
-  clear => "<fc=#ddcf04></fc>",
-  sunny => "<fc=#ddcf04></fc>",
-  mostly_clear => "<fc=#00a3c4></fc>",
-  mostly_sunny => "<fc=#ddcf04></fc>",
-  partly_sunny => "<fc=#ddcf04></fc>",
-  fair => "<fc=#a0a0a0>🌑</fc>",
-  cloudy =>"<fc=#a0a0a0>摒</fc>",
-  overcast =>"<fc=#808080></fc>",
-  partly_cloudy => "<fc=#a0a0a0>杖</fc>",
-  mostly_cloudy => "<fc=#808080></fc>",
-  considerable_cloudiness => "<fc=#a0a0a0>ﭽ</fc>" );
+  clear => "<fc=#ddcf04></fc> ",
+  sunny => "<fc=#ddcf04></fc> ",
+  mostly_clear => "<fc=#00a3c4></fc> ",
+  mostly_sunny => "<fc=#ddcf04></fc> ",
+  partly_sunny => "<fc=#ddcf04></fc> ",
+  fair => "<fc=#a0a0a0>🌑</fc> ",
+  cloudy =>"<fc=#a0a0a0>摒</fc> ",
+  overcast =>"<fc=#808080></fc> ",
+  partly_cloudy => "<fc=#a0a0a0>杖</fc> ",
+  mostly_cloudy => "<fc=#808080></fc> ",
+  considerable_cloudiness => "<fc=#a0a0a0>ﭽ</fc> " );
 
 %conditions_night = (
-  clear => "<fc=#00a3c4></fc>",
-  sunny => "<fc=#00a3c4></fc>",
-  mostly_clear => "<fc=#00a3c4></fc>",
-  mostly_sunny => "<fc=#00a3c4></fc>",
-  partly_sunny => "<fc=#00a3c4></fc>",
-  fair => "<fc=#808080>🌑</fc>",
-  cloudy =>"<fc=#808080>摒</fc>",
-  overcast =>"<fc=#404040></fc>",
-  partly_cloudy => "<fc=#a0a0a0></fc>",
-  mostly_cloudy => "<fc=#808080></fc>",
-  considerable_cloudiness => "<fc=#a0a0a0>ﭽ</fc>" );
+  clear => "<fc=#00a3c4></fc> ",
+  sunny => "<fc=#00a3c4></fc> ",
+  mostly_clear => "<fc=#00a3c4></fc> ",
+  mostly_sunny => "<fc=#00a3c4></fc> ",
+  partly_sunny => "<fc=#00a3c4></fc> ",
+  fair => "<fc=#808080>🌑</fc> ",
+  cloudy =>"<fc=#808080>摒</fc> ",
+  overcast =>"<fc=#404040></fc> ",
+  partly_cloudy => "<fc=#a0a0a0></fc> ",
+  mostly_cloudy => "<fc=#808080></fc> ",
+  considerable_cloudiness => "<fc=#a0a0a0>ﭽ</fc> " );
 
 if ($is_day) {
   $conditions = %conditions_day{$sky_conditions};
@@ -100,4 +100,4 @@ if ($is_day) {
   $conditions = %conditions_night{$sky_conditions};  
 }
 
-printf("<fc=#a0a0a0><fn=3>$city</fn> <fn=3>$dir</fn> <fn=3>${wind_speed}</fn></fc> $conditions<fn=3> <fc=#a0a0a0>%.0f°F</fc></fn>  \n", $temp);
+printf("<fc=#a0a0a0><fn=3>$city</fn> <fn=3>$dir</fn> <fn=3>${wind_speed}</fn></fc> <fn=8>$conditions</fn><fn=3><fc=#a0a0a0>%.0f°F</fc></fn>\n", $temp);
-- 
cgit