7 files changed, 6 insertions, 17 deletions
diff --git a/modules/graphical/polybar/module/cpu.nix b/modules/graphical/polybar/module/cpu.nix
index d37b5cc..8134df1 100644
--- a/modules/graphical/polybar/module/cpu.nix
+++ b/modules/graphical/polybar/module/cpu.nix
@@ -4,6 +4,6 @@ with config.scheme.withHashtag;
 {
 	type = "internal/cpu";
 	interval = 2;
-	format-prefix = "%{T2}%{F${base03}}  %{F-}%{T-}";
+	format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}";
 	label = "%percentage%%";
 }
diff --git a/modules/graphical/polybar/module/date.nix b/modules/graphical/polybar/module/date.nix
index 56e2fa6..9c56121 100644
--- a/modules/graphical/polybar/module/date.nix
+++ b/modules/graphical/polybar/module/date.nix
@@ -6,5 +6,5 @@ with config.scheme.withHashtag;
 	interval = 60;
 	date = "%d/%m/%Y";
 	label = "%date%";
-	format-prefix = "%{T2}%{F${base03}}  %{F-}%{T-}";
+	format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}";
 }
diff --git a/modules/graphical/polybar/module/default.nix b/modules/graphical/polybar/module/default.nix
index fc57f52..fe5b8a1 100644
--- a/modules/graphical/polybar/module/default.nix
+++ b/modules/graphical/polybar/module/default.nix
@@ -10,5 +10,4 @@
 	"module/time" = import ./time.nix { inherit config; };
 	"module/volume" = import ./volume.nix { inherit config; };
 	"module/battery" = import ./battery.nix { inherit config; };
-	"module/kernel-version" = import ./kernel-version.nix { inherit config; };
 }
diff --git a/modules/graphical/polybar/module/kernel-version.nix b/modules/graphical/polybar/module/kernel-version.nix
deleted file mode 100644
index 8f94e37..0000000
--- a/modules/graphical/polybar/module/kernel-version.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config }:
-
-with config.scheme.withHashtag;
-{
-	type = "custom/script";
-	exec = "uname -r";
-	interval = 1024;
-	format-prefix = "%{T2}%{F${base03}}  %{F-}%{T-}";
-	label = "%output%";
-}
diff --git a/modules/graphical/polybar/module/memory.nix b/modules/graphical/polybar/module/memory.nix
index cf70874..a4aa410 100644
--- a/modules/graphical/polybar/module/memory.nix
+++ b/modules/graphical/polybar/module/memory.nix
@@ -4,6 +4,6 @@ with config.scheme.withHashtag;
 {
 	type = "internal/memory";
 	interval = 2;
-	format-prefix = "%{T2}%{F${base03}}  %{F-}%{T-}";
+	format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}";
 	label = "%gb_used%";
 }
diff --git a/modules/graphical/polybar/module/time.nix b/modules/graphical/polybar/module/time.nix
index b8ea545..71df1a5 100644
--- a/modules/graphical/polybar/module/time.nix
+++ b/modules/graphical/polybar/module/time.nix
@@ -6,5 +6,5 @@ with config.scheme.withHashtag;
 	interval = 30;
 	time = "%H:%M";
 	label = "%time%";
-	format-prefix = "%{T2}%{F${base03}}  %{F-}%{T-}";
+	format-prefix = "%{T2}%{F${base03}} %{F-}%{T-}";
 }
diff --git a/modules/graphical/polybar/module/volume.nix b/modules/graphical/polybar/module/volume.nix
index e3eb758..ee18dc0 100644
--- a/modules/graphical/polybar/module/volume.nix
+++ b/modules/graphical/polybar/module/volume.nix
@@ -4,9 +4,9 @@ with config.scheme.withHashtag;
 {
 	type = "internal/pulseaudio";
 	interval = 5;
-	format-volume = "<ramp-volume> <label-volume>";
+	format-volume = "%{T2}%{F${base03}}<ramp-volume>%{F-}%{T-} <label-volume>";
 	label-volume = "%percentage%%";
-	label-muted = " ";
+	label-muted = "%{T2}%{F${base03}} ";
 	ramp-volume-0 = " ";
 	ramp-volume-1 = " ";
 	ramp-volume-2 = " ";