From cd92e989a37970365532f32de8de202d802e0e1f Mon Sep 17 00:00:00 2001
From: Simon <h45h74x@gmail.com>
Date: Fri, 19 Feb 2021 23:00:17 +0100
Subject: [PATCH 1/2] rearranged modules for yoga3

---
 .config/polybar/config                           | 16 ++++++++++++----
 .../config-merge/c02-config-bars-base##h.yoga3   |  2 +-
 .../config-merge/c03-config-bars##h.yoga3        |  4 ++--
 .../polybar/config-merge/c05-config-modules-misc | 10 +++++++++-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.config/polybar/config b/.config/polybar/config
index 5b95047..4819f0f 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -58,7 +58,7 @@ offset-y = 8px
 override-redirect = true
 tray-detached = true
 tray-maxsize = 15
-tray-offset-x= 86
+tray-offset-x= 260
 tray-offset-y =4px
 tray-padding = 3
 tray-position = left
@@ -87,8 +87,8 @@ wm-restack = i3
 inherit="bar/base_floating"
 monitor = ${env:MONITOR:eDP1}
 modules-center = clock playerctl_long
-modules-left = floating_popup_button pavucontrol_button
-modules-right = usbmodem5 wlan_short sensors_cpu_yoga3 memory
+modules-left = floating_popup_button pavucontrol_button sensors_cpu_yoga3 memory_sep
+modules-right = usbmodem5 wlan_short battery
 
 [bar/floating_cava]
 inherit = "bar/floating"
@@ -318,6 +318,10 @@ type = internal/memory
 interval = 2
 label = 󰆼 %percentage_used%%
 
+[module/memory_sep]
+inherit = module/memory
+format = <label> |
+
 [module/nvgpu]
 type = custom/script
 interval = 2
@@ -446,11 +450,15 @@ menu-0-2-exec = "playerctl next"
 
 [module/pavucontrol_button]
 type = custom/text
-content = 󰕾 |
+content = 󰕾
 click-left = "setsid pavucontrol"
 click-right = "setsid pulseaudio-equalizer-gtk"
 click-middle = "bash ~/Userdata/Scripts/Launchers/restart_pulseaudio_1s.sh"
 
+[module/pavucontrol_button_sep]
+inherit="module/pavucontrol_button"
+content = 󰕾 |
+
 [module/cava]
 type = custom/script
 tail = true
diff --git a/.config/polybar/config-merge/c02-config-bars-base##h.yoga3 b/.config/polybar/config-merge/c02-config-bars-base##h.yoga3
index 3888ebd..91cc5a1 100644
--- a/.config/polybar/config-merge/c02-config-bars-base##h.yoga3
+++ b/.config/polybar/config-merge/c02-config-bars-base##h.yoga3
@@ -31,7 +31,7 @@ offset-y = 8px
 override-redirect = true
 tray-detached = true
 tray-maxsize = 15
-tray-offset-x= 86
+tray-offset-x= 260
 tray-offset-y =4px
 tray-padding = 3
 tray-position = left
diff --git a/.config/polybar/config-merge/c03-config-bars##h.yoga3 b/.config/polybar/config-merge/c03-config-bars##h.yoga3
index b12d224..63e1f09 100644
--- a/.config/polybar/config-merge/c03-config-bars##h.yoga3
+++ b/.config/polybar/config-merge/c03-config-bars##h.yoga3
@@ -2,8 +2,8 @@
 inherit="bar/base_floating"
 monitor = ${env:MONITOR:eDP1}
 modules-center = clock playerctl_long
-modules-left = floating_popup_button pavucontrol_button
-modules-right = usbmodem5 wlan_short sensors_cpu_yoga3 memory
+modules-left = floating_popup_button pavucontrol_button sensors_cpu_yoga3 memory_sep
+modules-right = usbmodem5 wlan_short battery
 
 [bar/floating_cava]
 inherit = "bar/floating"
diff --git a/.config/polybar/config-merge/c05-config-modules-misc b/.config/polybar/config-merge/c05-config-modules-misc
index 00c5e25..bf21f4b 100644
--- a/.config/polybar/config-merge/c05-config-modules-misc
+++ b/.config/polybar/config-merge/c05-config-modules-misc
@@ -45,6 +45,10 @@ type = internal/memory
 interval = 2
 label = 󰆼 %percentage_used%%
 
+[module/memory_sep]
+inherit = module/memory
+format = <label> |
+
 [module/nvgpu]
 type = custom/script
 interval = 2
@@ -173,11 +177,15 @@ menu-0-2-exec = "playerctl next"
 
 [module/pavucontrol_button]
 type = custom/text
-content = 󰕾 |
+content = 󰕾
 click-left = "setsid pavucontrol"
 click-right = "setsid pulseaudio-equalizer-gtk"
 click-middle = "bash ~/Userdata/Scripts/Launchers/restart_pulseaudio_1s.sh"
 
+[module/pavucontrol_button_sep]
+inherit="module/pavucontrol_button"
+content = 󰕾 |
+
 [module/cava]
 type = custom/script
 tail = true

From 9409cf977eb1aab35c70e1fbb17578b64a487575 Mon Sep 17 00:00:00 2001
From: Simon <h45h74x@gmail.com>
Date: Fri, 19 Feb 2021 23:03:06 +0100
Subject: [PATCH 2/2] added more icons

---
 .config/polybar/config                             | 14 ++++++++------
 .../polybar/config-merge/c05-config-modules-misc   | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.config/polybar/config b/.config/polybar/config
index 4819f0f..8e9917d 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -472,15 +472,17 @@ battery = BAT0
 poll-interval = 3
 adapter = ADP1
 full-at = 95
-label-full = bat: %percentage%%
-label-charging = bat: %percentage%% (+%consumption%W, %time%)
-label-discharging = bat: %percentage%% (-%consumption%W, %time%)
+label-full = 󱐋 %percentage%%
+;label-charging = 󱐋 %percentage%% (+%consumption%W, %time%)
+label-charging = 󱐋 %percentage%% (+%consumption%W)
+;label-discharging = 󱐋 %percentage%% (-%consumption%W, %time%)
+label-discharging = 󱐋 %percentage%% (-%consumption%W)
 
 [module/battery_short]
 inherit = "module/battery"
-label-full = bat: %percentage%%
-label-charging = bat: %percentage%%
-label-discharging = bat: %percentage%%
+label-full = 󱐋 %percentage%%
+label-charging = 󱐋 %percentage%%
+label-discharging = 󱐋 %percentage%%
 
 ; Module Disk
 
diff --git a/.config/polybar/config-merge/c05-config-modules-misc b/.config/polybar/config-merge/c05-config-modules-misc
index bf21f4b..af526fd 100644
--- a/.config/polybar/config-merge/c05-config-modules-misc
+++ b/.config/polybar/config-merge/c05-config-modules-misc
@@ -199,15 +199,17 @@ battery = BAT0
 poll-interval = 3
 adapter = ADP1
 full-at = 95
-label-full = bat: %percentage%%
-label-charging = bat: %percentage%% (+%consumption%W, %time%)
-label-discharging = bat: %percentage%% (-%consumption%W, %time%)
+label-full = 󱐋 %percentage%%
+;label-charging = 󱐋 %percentage%% (+%consumption%W, %time%)
+label-charging = 󱐋 %percentage%% (+%consumption%W)
+;label-discharging = 󱐋 %percentage%% (-%consumption%W, %time%)
+label-discharging = 󱐋 %percentage%% (-%consumption%W)
 
 [module/battery_short]
 inherit = "module/battery"
-label-full = bat: %percentage%%
-label-charging = bat: %percentage%%
-label-discharging = bat: %percentage%%
+label-full = 󱐋 %percentage%%
+label-charging = 󱐋 %percentage%%
+label-discharging = 󱐋 %percentage%%
 
 ; Module Disk