From 325c74be916bae23ffddbc92e60667bf49593d8b Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Fri, 3 Dec 2021 23:09:28 +0100
Subject: [PATCH] Small xmobar redesign

---
 home/.config/xmobar/xmobarrc.hs | 21 +++++++++++++++------
 home/.config/xmobar/xmobarrc0   | 21 +++++++++++++++------
 home/.config/xmobar/xmobarrc1   | 21 +++++++++++++++------
 3 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/home/.config/xmobar/xmobarrc.hs b/home/.config/xmobar/xmobarrc.hs
index 8fa4d71..85f6d93 100644
--- a/home/.config/xmobar/xmobarrc.hs
+++ b/home/.config/xmobar/xmobarrc.hs
@@ -33,13 +33,13 @@ commands = [
         -- Gather and format CPU usage information
         -- if it's above 50%, we consider it high and make it red
         Run Cpu [
-        "-t", "<fn=1>\xf108</fn>  cpu: <total>%",
+        "-t", "<fn=1>\xf2db</fn>  <total>%",
         "-H","50",
         "--high","red"
         ] 20,
 
         -- Ram used number and percent
-        Run Memory ["-t", "<fn=1>\xf233</fn>  mem: <used>M (<usedratio>%)"] 20,
+        Run Memory ["-t", "<fn=1>\xf538</fn>  <used>M (<usedratio>%)"] 20,
 
         -- Battery information. This is likely to require some customization
         -- based upon your specific hardware. Or, for a desktop you may want
@@ -59,15 +59,21 @@ commands = [
         Run Date "<fn=1>\xf017</fn>  %H:%M %b %d %Y" "date" 50,
 
         -- Network up and down
-        Run Network "wlp2s0" ["-t", "<fn=1>\xf0ab</fn>  <rx>kb  <fn=1>\xf0aa</fn>  <tx>kb"] 20,
+        --Run Network "wlp4s0" ["-t", "<fn=1>\xf0ab</fn>  <rx>kb  <fn=1>\xf0aa</fn>  <tx>kb"] 20,
         --Run Network "enp3s0" ["-t", "<fn=1>\xf0ab</fn>  <rx>kb  <fn=1>\xf0aa</fn>  <tx>kb"] 20,
 
+        -- Uptime
+        Run Uptime ["-t", "<fn=1>\xf011</fn>  <days>d <hours>h"] 360,
+
         -- Show free disk space on /
-        Run DiskU [("/", "<fn=1>\xf0c7</fn>  hdd: <free>")] [] 60,
+        Run DiskU [("/", "<fn=1>\xf0c7</fn>  <free>")] [] 60,
 
         -- Get kernel version from uname -r
         Run Com "uname" ["-r"] "" 3600,
 
+        -- Volume info
+        Run Volume "default" "Master" ["-t", "<fn=1>\xf028</fn>  <volume>%"] 5,
+
         -- Get bitcoin price from a custom script
         Run Com "/home/itsdrike/.local/bin/scripts/bitcoin" [] "bitcoin" 300,
 
@@ -96,17 +102,20 @@ template = "\
     \<icon=haskell_20.xpm/>   \
     \<fc=#666666>|</fc>  %UnsafeStdinReader% }{ \
     \<fc=#666666>|</fc>  <fc=#b3afc2><fn=2></fn>  %uname% </fc> \
-    \<fc=#666666>|</fc>  <fc=#ecbe7b> %cpu% </fc> \
     \<fc=#666666>|</fc>  <fc=#ff6c6b> %memory% </fc> \
     \<fc=#666666>|</fc>  <fc=#51afef> %disku% </fc> \
+    \<fc=#666666>|</fc>  <fc=#78db32> %cpu% </fc> \
+    \<fc=#666666>|</fc>  <fc=#ecbe7b> %default:Master% </fc> \
+    \<fc=#666666>|</fc>  <fc=#98be65> %uptime% </fc> \
     \<fc=#666666>|</fc>  <fc=#efcb10><fn=2></fn>  %bitcoin% </fc> \
-    \<fc=#666666>|</fc>  <fc=#98be65> %wlp2s0% </fc> \
     \<fc=#666666>|</fc>  <fc=#46d9ff> %date% </fc> \
     \<fc=#666666>|</fc>  %trayerpad%\
     \ "
 }
 
 -- Abandoned template strings
+-- Network Wifi:
+-- \<fc=#666666>|</fc>  <fc=#98be65> %wlp4s0% </fc> \
 -- Network Ethernet:
 -- \<fc=#666666>|</fc>  <fc=#98be65> %enp3s0% </fc> \
 -- Battery:
diff --git a/home/.config/xmobar/xmobarrc0 b/home/.config/xmobar/xmobarrc0
index 8fa4d71..85f6d93 100644
--- a/home/.config/xmobar/xmobarrc0
+++ b/home/.config/xmobar/xmobarrc0
@@ -33,13 +33,13 @@ commands = [
         -- Gather and format CPU usage information
         -- if it's above 50%, we consider it high and make it red
         Run Cpu [
-        "-t", "<fn=1>\xf108</fn>  cpu: <total>%",
+        "-t", "<fn=1>\xf2db</fn>  <total>%",
         "-H","50",
         "--high","red"
         ] 20,
 
         -- Ram used number and percent
-        Run Memory ["-t", "<fn=1>\xf233</fn>  mem: <used>M (<usedratio>%)"] 20,
+        Run Memory ["-t", "<fn=1>\xf538</fn>  <used>M (<usedratio>%)"] 20,
 
         -- Battery information. This is likely to require some customization
         -- based upon your specific hardware. Or, for a desktop you may want
@@ -59,15 +59,21 @@ commands = [
         Run Date "<fn=1>\xf017</fn>  %H:%M %b %d %Y" "date" 50,
 
         -- Network up and down
-        Run Network "wlp2s0" ["-t", "<fn=1>\xf0ab</fn>  <rx>kb  <fn=1>\xf0aa</fn>  <tx>kb"] 20,
+        --Run Network "wlp4s0" ["-t", "<fn=1>\xf0ab</fn>  <rx>kb  <fn=1>\xf0aa</fn>  <tx>kb"] 20,
         --Run Network "enp3s0" ["-t", "<fn=1>\xf0ab</fn>  <rx>kb  <fn=1>\xf0aa</fn>  <tx>kb"] 20,
 
+        -- Uptime
+        Run Uptime ["-t", "<fn=1>\xf011</fn>  <days>d <hours>h"] 360,
+
         -- Show free disk space on /
-        Run DiskU [("/", "<fn=1>\xf0c7</fn>  hdd: <free>")] [] 60,
+        Run DiskU [("/", "<fn=1>\xf0c7</fn>  <free>")] [] 60,
 
         -- Get kernel version from uname -r
         Run Com "uname" ["-r"] "" 3600,
 
+        -- Volume info
+        Run Volume "default" "Master" ["-t", "<fn=1>\xf028</fn>  <volume>%"] 5,
+
         -- Get bitcoin price from a custom script
         Run Com "/home/itsdrike/.local/bin/scripts/bitcoin" [] "bitcoin" 300,
 
@@ -96,17 +102,20 @@ template = "\
     \<icon=haskell_20.xpm/>   \
     \<fc=#666666>|</fc>  %UnsafeStdinReader% }{ \
     \<fc=#666666>|</fc>  <fc=#b3afc2><fn=2></fn>  %uname% </fc> \
-    \<fc=#666666>|</fc>  <fc=#ecbe7b> %cpu% </fc> \
     \<fc=#666666>|</fc>  <fc=#ff6c6b> %memory% </fc> \
     \<fc=#666666>|</fc>  <fc=#51afef> %disku% </fc> \
+    \<fc=#666666>|</fc>  <fc=#78db32> %cpu% </fc> \
+    \<fc=#666666>|</fc>  <fc=#ecbe7b> %default:Master% </fc> \
+    \<fc=#666666>|</fc>  <fc=#98be65> %uptime% </fc> \
     \<fc=#666666>|</fc>  <fc=#efcb10><fn=2></fn>  %bitcoin% </fc> \
-    \<fc=#666666>|</fc>  <fc=#98be65> %wlp2s0% </fc> \
     \<fc=#666666>|</fc>  <fc=#46d9ff> %date% </fc> \
     \<fc=#666666>|</fc>  %trayerpad%\
     \ "
 }
 
 -- Abandoned template strings
+-- Network Wifi:
+-- \<fc=#666666>|</fc>  <fc=#98be65> %wlp4s0% </fc> \
 -- Network Ethernet:
 -- \<fc=#666666>|</fc>  <fc=#98be65> %enp3s0% </fc> \
 -- Battery:
diff --git a/home/.config/xmobar/xmobarrc1 b/home/.config/xmobar/xmobarrc1
index d9d7a09..21bb706 100644
--- a/home/.config/xmobar/xmobarrc1
+++ b/home/.config/xmobar/xmobarrc1
@@ -33,13 +33,13 @@ commands = [
         -- Gather and format CPU usage information
         -- if it's above 50%, we consider it high and make it red
         Run Cpu [
-        "-t", "<fn=1>\xf108</fn>  cpu: <total>%",
+        "-t", "<fn=1>\xf2db</fn>  <total>%",
         "-H","50",
         "--high","red"
         ] 20,
 
         -- Ram used number and percent
-        Run Memory ["-t", "<fn=1>\xf233</fn>  mem: <used>M (<usedratio>%)"] 20,
+        Run Memory ["-t", "<fn=1>\xf538</fn>  <used>M (<usedratio>%)"] 20,
 
         -- Battery information. This is likely to require some customization
         -- based upon your specific hardware. Or, for a desktop you may want
@@ -59,15 +59,21 @@ commands = [
         Run Date "<fn=1>\xf017</fn>  %H:%M %b %d %Y" "date" 50,
 
         -- Network up and down
-        Run Network "wlp2s0" ["-t", "<fn=1>\xf0ab</fn>  <rx>kb  <fn=1>\xf0aa</fn>  <tx>kb"] 20,
+        --Run Network "wlp4s0" ["-t", "<fn=1>\xf0ab</fn>  <rx>kb  <fn=1>\xf0aa</fn>  <tx>kb"] 20,
         --Run Network "enp3s0" ["-t", "<fn=1>\xf0ab</fn>  <rx>kb  <fn=1>\xf0aa</fn>  <tx>kb"] 20,
 
+        -- Uptime
+        Run Uptime ["-t", "<fn=1>\xf011</fn>  <days>d <hours>h"] 360,
+
         -- Show free disk space on /
-        Run DiskU [("/", "<fn=1>\xf0c7</fn>  hdd: <free>")] [] 60,
+        Run DiskU [("/", "<fn=1>\xf0c7</fn>  <free>")] [] 60,
 
         -- Get kernel version from uname -r
         Run Com "uname" ["-r"] "" 3600,
 
+        -- Volume info
+        Run Volume "default" "Master" ["-t", "<fn=1>\xf028</fn>  <volume>%"] 5,
+
         -- Get bitcoin price from a custom script
         Run Com "/home/itsdrike/.local/bin/scripts/bitcoin" [] "bitcoin" 300,
 
@@ -95,16 +101,19 @@ template = "\
     \<icon=haskell_20.xpm/>   \
     \<fc=#666666>|</fc>  %UnsafeStdinReader% }{ \
     \<fc=#666666>|</fc>  <fc=#b3afc2><fn=2></fn>  %uname% </fc> \
-    \<fc=#666666>|</fc>  <fc=#ecbe7b> %cpu% </fc> \
     \<fc=#666666>|</fc>  <fc=#ff6c6b> %memory% </fc> \
     \<fc=#666666>|</fc>  <fc=#51afef> %disku% </fc> \
+    \<fc=#666666>|</fc>  <fc=#78db32> %cpu% </fc> \
+    \<fc=#666666>|</fc>  <fc=#ecbe7b> %default:Master% </fc> \
+    \<fc=#666666>|</fc>  <fc=#98be65> %uptime% </fc> \
     \<fc=#666666>|</fc>  <fc=#efcb10><fn=2></fn>  %bitcoin% </fc> \
-    \<fc=#666666>|</fc>  <fc=#98be65> %wlp2s0% </fc> \
     \<fc=#666666>|</fc>  <fc=#46d9ff> %date% </fc> \
     \ "
 }
 
 -- Abandoned template strings
+-- Network Wifi:
+-- \<fc=#666666>|</fc>  <fc=#98be65> %wlp4s0% </fc> \
 -- Network Ethernet:
 -- \<fc=#666666>|</fc>  <fc=#98be65> %enp3s0% </fc> \
 -- Battery: