From b2f09a0a36b020e17d158f29e415c82a3a196a70 Mon Sep 17 00:00:00 2001
From: Derek Taylor <derek@distrotube.com>
Date: Sun, 26 Feb 2023 18:33:54 -0600
Subject: [PATCH] Updating polybar.

---
 .config/polybar/config              | 37 ++++++++++++++++-------------
 .config/polybar/launch.sh           |  2 +-
 .config/polybar/scripts/pavolume.sh |  6 ++---
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/.config/polybar/config b/.config/polybar/config
index 45af60c..754092f 100755
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -1,4 +1,4 @@
-#  ____ _____ 
+#  ____ _____
 # |  _ \_   _|  Derek Taylor (DistroTube)
 # | | | || |    http://www.youtube.com/c/DistroTube
 # | |_| || |    http://www.gitlab.com/dwt1/ 
@@ -436,7 +436,7 @@ monitor = ${env:MONITOR}
 monitor-strict = false
 override-redirect = false
 width = 100%
-height = 20
+height = 22
 ;offset-x = 1%
 ;offset-y = 1%
 radius = 0.0
@@ -468,13 +468,13 @@ module-margin-right = 0
 enable-ipc = true
 
 ;https://github.com/jaagr/polybar/wiki/Fonts
-font-0 = "UbuntuMono Nerd Font:size=10;2"
-font-1 = "UbuntuMono Nerd Font:size=16;3"
-font-2 = "Font Awesome 5 Free:style=Regular:pixelsize=8;1"
-font-3 = "Font Awesome 5 Free:style=Solid:pixelsize=8;1"
-font-4 = "Font Awesome 5 Brands:pixelsize=8;1"
+font-0 = "Ubuntu:style=Bold:size=9;2"
+font-1 = "UbuntuMono Nerd Font:style=Bold:size=18;3"
+font-2 = "Font Awesome 6 Free:style=Regular:pixelsize=8;1"
+font-3 = "Font Awesome 6 Free:style=Solid:pixelsize=8;1"
+font-4 = "Font Awesome 6 Brands:pixelsize=8;1"
 
-modules-left = xmonad
+modules-left = xmonad xwindow
 modules-center =
 modules-right = arrow1 networkspeedup networkspeeddown arrow2 memory2 arrow3 cpu2 arrow2 pavolume arrow3 arch-aur-updates arrow2 date
 
@@ -791,7 +791,7 @@ interval = 1000
 label = Updates: %output%
 format-foreground = #fefefe
 format-background = #8d62ad
-format-prefix = "  "
+format-prefix = "🗘 "
 format-prefix-foreground = #fefefe
 
 
@@ -802,7 +802,7 @@ interval = 1000
 label = Aur: %output%
 format-foreground = ${colors.foreground}
 format-background = ${colors.background}
-format-prefix = "  "
+format-prefix = "🗘 "
 format-prefix-foreground = #FFBB00
 format-underline = #FFBB00
 
@@ -972,7 +972,7 @@ type = internal/cpu
 interval = 1
 format-foreground = #fefefe
 format-background = #8d62ad
-format-prefix = " "
+format-prefix = "💻 "
 format-prefix-foreground = #fefefe
 
 label-font = 1
@@ -1004,7 +1004,7 @@ date = " %a %b %d, %Y"
 date-alt = " %a %b %d, %Y"
 time = %l:%M%p
 time-alt = %l:%M%p
-format-prefix = " "
+format-prefix = "📅 "
 format-prefix-foreground = #fefefe
 format-foreground = #fefefe
 format-background = #668bd7
@@ -1172,6 +1172,7 @@ interval = 1
 ;   %mb_free%
 ;   %mb_total%
 label = %percentage_used%%
+label-active-font = 2
 bar-used-indicator =
 bar-used-width = 10
 bar-used-foreground-0 = #3384d0
@@ -1202,9 +1203,10 @@ interval = 1
 ;   %mb_free%
 ;   %mb_total%
 label = %percentage_used%%
+label-active-font = 2
 
 format = Mem <label>
-format-prefix = " "
+format-prefix = "💾 "
 format-prefix-foreground = #fefefe
 format-foreground = #fefefe
 format-background = #668bd7
@@ -1266,10 +1268,10 @@ type = internal/network
 ;interface = wlp3s0
 ;interface = enp14s0
 ;interface = enp0s31f6
-interface = enp6s0
+interface = enp5s0
 label-connected = "%upspeed:7%"
 format-connected = <label-connected>
-format-connected-prefix = " "
+format-connected-prefix = "↑ "
 format-connected-prefix-foreground = #fefefe
 format-connected-foreground = #fefefe
 format-connected-background = #8d62a9
@@ -1282,10 +1284,10 @@ type = internal/network
 ;interface = wlp3s0
 ;interface = enp14s0
 ;interface = enp0s31f6
-interface = enp6s0
+interface = enp5s0
 label-connected = "%downspeed:7%"
 format-connected = <label-connected>
-format-connected-prefix = "  "
+format-connected-prefix = "  ↓ "
 format-connected-prefix-foreground = #fefefe
 format-connected-foreground = #fefefe
 format-connected-background = #8d62ad
@@ -1310,6 +1312,7 @@ format-underline = #FFBB00
 type = custom/script
 tail = true
 label = %output%
+format-prefix = " 🔊 "
 exec = ~/.config/polybar/scripts/pavolume.sh --listen
 click-right = exec pavucontrol
 click-left = ~/.config/polybar/scripts/pavolume.sh --togmute
diff --git a/.config/polybar/launch.sh b/.config/polybar/launch.sh
index 60b6f87..b44a851 100755
--- a/.config/polybar/launch.sh
+++ b/.config/polybar/launch.sh
@@ -7,7 +7,7 @@ killall -q polybar
 while pgrep -u $UID -x polybar >/dev/null; do : ; done
 
 for m in $(polybar --list-monitors | cut -d":" -f1); do
-	WIRELESS=$(ls /sys/class/net/ | grep ^wl | awk 'NR==1{print $1}') MONITOR=$m polybar --reload mainbar-i3 &
+	WIRELESS=$(ls /sys/class/net/ | grep ^wl | awk 'NR==1{print $1}') MONITOR=$m polybar --reload mainbar-xmonad &
 done
 
 echo "Bars launched..."
diff --git a/.config/polybar/scripts/pavolume.sh b/.config/polybar/scripts/pavolume.sh
index b8e34f8..4c99ec4 100755
--- a/.config/polybar/scripts/pavolume.sh
+++ b/.config/polybar/scripts/pavolume.sh
@@ -153,11 +153,11 @@ function output() {
         echo "ﱝ mute"
     else
         if [ $curVol -gt 70 ]; then
-            echo "墳 $curVol%"
+            echo "$curVol%"
         elif [ $curVol -gt 30 ]; then
-          echo "奔 $curVol%"
+          echo "$curVol%"
         else
-          echo "奄 $curVol%"
+          echo "$curVol%"
         fi
     fi
 } #}}}