Few minor tweaks to polybar.

8 files changed, 36 insertions, 29 deletions

diff --git a/modules/desktop/status-bar/polybar/module/battery.nix b/modules/desktop/status-bar/polybar/module/battery.nix
index 6d4aef9..4c0bec6 100644
--- a/modules/desktop/status-bar/polybar/module/battery.nix
+++ b/modules/desktop/status-bar/polybar/module/battery.nix
@@ -6,31 +6,31 @@ with config.scheme.withHashtag;
 	battery = "BAT0";
 	adapter = "ADP1";
 
-	format-charging = "<animation-charging> <label-charging>";
-	format-discharging = "<ramp-capacity> <label-discharging>";
-	format-full-prefix = "%{F${base0B}}󰁹%{F-}";
+	format-charging = "%{T2}%{F${base07}}<animation-charging>%{F-}%{T-} <label-charging>";
+	format-discharging = "%{T2}%{F${base07}}<ramp-capacity>%{F-}%{T-} <label-discharging>";
+	format-full-prefix = "󰁹";
 
-	ramp-capacity-0 = "%{F${base0C}}󰁺%{F-}";
-	ramp-capacity-1 = "%{F${base0C}}󰁻%{F-}";
-	ramp-capacity-2 = "%{F${base0C}}󰁼%{F-}";
-	ramp-capacity-3 = "%{F${base0C}}󰁽%{F-}";
-	ramp-capacity-4 = "%{F${base0C}}󰁾%{F-}";
-	ramp-capacity-5 = "%{F${base0C}}󰁿%{F-}";
-	ramp-capacity-6 = "%{F${base0C}}󰂀%{F-}";
-	ramp-capacity-7 = "%{F${base0C}}󰂁%{F-}";
-	ramp-capacity-8 = "%{F${base0C}}󰂂%{F-}";
-	ramp-capacity-9 = "%{F${base0C}}󰁹%{F-}";
+	ramp-capacity-0 = "󰁺";
+	ramp-capacity-1 = "󰁻";
+	ramp-capacity-2 = "󰁼";
+	ramp-capacity-3 = "󰁽";
+	ramp-capacity-4 = "󰁾";
+	ramp-capacity-5 = "󰁿";
+	ramp-capacity-6 = "󰂀";
+	ramp-capacity-7 = "󰂁";
+	ramp-capacity-8 = "󰂂";
+	ramp-capacity-9 = "󰁹";
 
-	animation-charging-0 = "%{F${base0C}}󰁺%{F-}";
-	animation-charging-1 = "%{F${base0C}}󰁻%{F-}";
-	animation-charging-2 = "%{F${base0C}}󰁼%{F-}";
-	animation-charging-3 = "%{F${base0C}}󰁽%{F-}";
-	animation-charging-4 = "%{F${base0C}}󰁾%{F-}";
-	animation-charging-5 = "%{F${base0C}}󰁿%{F-}";
-	animation-charging-6 = "%{F${base0C}}󰂀%{F-}";
-	animation-charging-7 = "%{F${base0C}}󰂁%{F-}";
-	animation-charging-8 = "%{F${base0C}}󰂂%{F-}";
-	animation-charging-9 = "%{F${base0C}}󰁹%{F-}";
+	animation-charging-0 = "󰁺";
+	animation-charging-1 = "󰁻";
+	animation-charging-2 = "󰁼";
+	animation-charging-3 = "󰁽";
+	animation-charging-4 = "󰁾";
+	animation-charging-5 = "󰁿";
+	animation-charging-6 = "󰂀";
+	animation-charging-7 = "󰂁";
+	animation-charging-8 = "󰂂";
+	animation-charging-9 = "󰁹";
 
 	animation-charging-framerate = 750;
 }
diff --git a/modules/desktop/status-bar/polybar/module/bspwm.nix b/modules/desktop/status-bar/polybar/module/bspwm.nix
index c6671e7..ed82946 100644
--- a/modules/desktop/status-bar/polybar/module/bspwm.nix
+++ b/modules/desktop/status-bar/polybar/module/bspwm.nix
@@ -11,7 +11,7 @@ with config.scheme.withHashtag;
 	label-occupied = "%index%";
 	label-occupied-padding = 2;
 
-	label-urgent = "%index%!";
+	label-urgent = "%index%";
 	label-urgent-underline = "${base08}";
 	label-urgent-padding = 2;
 
diff --git a/modules/desktop/status-bar/polybar/module/cpu.nix b/modules/desktop/status-bar/polybar/module/cpu.nix
index 403add3..409ac68 100644
--- a/modules/desktop/status-bar/polybar/module/cpu.nix
+++ b/modules/desktop/status-bar/polybar/module/cpu.nix
@@ -4,6 +4,6 @@ with config.scheme.withHashtag;
 {
 	type = "internal/cpu";
 	interval = 2;
-	format-prefix = "%{F${base09}}  %{F-}";
+	format-prefix = "%{T2}%{F${base07}}  %{F-}%{T-}";
 	label = "%percentage%%";
 }
diff --git a/modules/desktop/status-bar/polybar/module/date.nix b/modules/desktop/status-bar/polybar/module/date.nix
index 9ebfd77..e9e7ef6 100644
--- a/modules/desktop/status-bar/polybar/module/date.nix
+++ b/modules/desktop/status-bar/polybar/module/date.nix
@@ -6,5 +6,5 @@ with config.scheme.withHashtag;
 	interval = 60;
 	date = "%d/%m/%Y";
 	label = "%date%";
-	format-prefix = "%{F${base0B}}  %{F-}";
+	format-prefix = "%{T2}%{F${base07}}  %{F-}%{T-}";
 }
diff --git a/modules/desktop/status-bar/polybar/module/kernel-version.nix b/modules/desktop/status-bar/polybar/module/kernel-version.nix
index e6822fa..697c49c 100644
--- a/modules/desktop/status-bar/polybar/module/kernel-version.nix
+++ b/modules/desktop/status-bar/polybar/module/kernel-version.nix
@@ -5,6 +5,6 @@ with config.scheme.withHashtag;
 	type = "custom/script";
 	exec = "uname -r";
 	interval = 1024;
-	format-prefix = "%{F${base03}}  %{F-}";
+	format-prefix = "%{T2}%{F${base07}}  %{F-}%{T-}";
 	label = "%output%";
 }
diff --git a/modules/desktop/status-bar/polybar/module/memory.nix b/modules/desktop/status-bar/polybar/module/memory.nix
index a09d4a8..82851db 100644
--- a/modules/desktop/status-bar/polybar/module/memory.nix
+++ b/modules/desktop/status-bar/polybar/module/memory.nix
@@ -4,6 +4,6 @@ with config.scheme.withHashtag;
 {
 	type = "internal/memory";
 	interval = 2;
-	format-prefix = "%{F${base0A}}  %{F-}";
+	format-prefix = "%{T2}%{F${base07}}  %{F-}%{T-}";
 	label = "%percentage_used%%";
 }
diff --git a/modules/desktop/status-bar/polybar/module/separator.nix b/modules/desktop/status-bar/polybar/module/separator.nix
new file mode 100644
index 0000000..3cd1430
--- /dev/null
+++ b/modules/desktop/status-bar/polybar/module/separator.nix
@@ -0,0 +1,7 @@
+{ config }:
+
+with config.scheme.withHashtag;
+{
+	type = "custom/text";
+	label = " ";
+}
diff --git a/modules/desktop/status-bar/polybar/module/time.nix b/modules/desktop/status-bar/polybar/module/time.nix
index f3e0054..9095c98 100644
--- a/modules/desktop/status-bar/polybar/module/time.nix
+++ b/modules/desktop/status-bar/polybar/module/time.nix
@@ -6,5 +6,5 @@ with config.scheme.withHashtag;
 	interval = 30;
 	time = "%H:%M";
 	label = "%time%";
-	format-prefix = "%{F${base0C}}  %{F-}";
+	format-prefix = "%{T2}%{F${base07}}  %{F-}%{T-}";
 }