11 files changed, 59 insertions, 40 deletions
diff --git a/modules/desktop/status-bar/polybar/bar/main.nix b/modules/desktop/status-bar/polybar/bar/main.nix
new file mode 100644
index 0000000..34858d8
--- /dev/null
+++ b/modules/desktop/status-bar/polybar/bar/main.nix
@@ -0,0 +1,38 @@
+{ config }:
+
+with config.scheme.withHashtag;
+{
+	width = "\${env:POLYBAR_WIDTH}";
+	fixed-center = false;
+	height = 35;
+
+	border-top-size = 1;
+	border-bottom-size = 1;
+	border-left-size = 1;
+	border-right-size = 1;
+	border-color = base02;
+
+	background = base00;
+	foreground = base05;
+
+	line-size = 3;
+	line-color = base08;
+
+	padding-left = 1;
+	padding-right = 1;
+
+	module-margin-left = 2;
+	module-margin-right = 2;
+
+	offset-x = "\${env:POLYBAR_OFFSET}";
+	offset-y = "\${env:POLYBAR_OFFSET}";
+
+	font-0 = "FiraCode Nerd Font:pixelsize=16;3";
+
+	modules-left =
+		if config.desktop.window-manager.bspwm.enable then
+			"bspwm"
+		else null;
+	modules-center = "xwindow";
+	modules-right = "memory cpu battery time date kernel-version";
+}
diff --git a/modules/desktop/status-bar/polybar/bars/main.nix b/modules/desktop/status-bar/polybar/bars/main.nix
deleted file mode 100644
index a36f97a..0000000
--- a/modules/desktop/status-bar/polybar/bars/main.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config }:
-
-with config.scheme.withHashtag;
-{
-	width = "100%";
-	height = 30;
-	radius = 3;
-	fixed-center = false;
-
-	background = "${base00}";
-	foreground = "${base05}";
-
-	line-size = 3;
-	line-color = "${base08}";
-
-	border-size = 4;
-	padding-left = 2;
-	padding-right = 2;
-
-	module-margin-left = 2;
-	module-margin-right = 2;
-
-	font-0 = "FiraCode Nerd Font:pixelsize=16;3";
-
-	modules-left = "bspwm";
-	modules-center = "xwindow";
-	modules-right = "memory cpu battery time date kernel-version";
-}
diff --git a/modules/desktop/status-bar/polybar/default.nix b/modules/desktop/status-bar/polybar/default.nix
index 4f7ace3..b8e1907 100644
--- a/modules/desktop/status-bar/polybar/default.nix
+++ b/modules/desktop/status-bar/polybar/default.nix
@@ -3,25 +3,35 @@
 {
 	options.desktop.status-bar.polybar = {
 		enable = lib.mkEnableOption "Enables polybar.";
+		command = lib.mkOption {
+			type = lib.types.str;
+			description = "Command to run polybar.";
+			# This command calculates the width of the polybar to create those gaps
+			default = ''
+MONITOR_WIDTH=$(xrandr | grep '*' | awk '{print $1}' | cut -d'x' -f1 | head -n1); \
+OFFSET=${toString config.desktop.window-manager.gap}; \
+POLYBAR_WIDTH=$((MONITOR_WIDTH - 2 * OFFSET)) POLYBAR_OFFSET=$OFFSET polybar main &
+'';
+		};
 	};
 
 	config = lib.mkIf config.desktop.status-bar.polybar.enable {
 		services.polybar.enable = true;
-		services.polybar.script = "polybar main &";
+		services.polybar.script = config.desktop.status-bar.polybar.command;
 
 		services.polybar.config = {
-			"bar/main" = import ./bars/main.nix { inherit config; };
-			"module/xwindow" = import ./modules/xwindow.nix { inherit config; };
+			"bar/main" = import ./bar/main.nix { inherit config; };
+			"module/xwindow" = import ./module/xwindow.nix { inherit config; };
 			"module/bspwm" =
 				if config.desktop.window-manager.bspwm.enable then
-					import ./modules/bspwm.nix { inherit config; }
+					import ./module/bspwm.nix { inherit config; }
 				else null;
-			"module/cpu" = import ./modules/cpu.nix { inherit config; };
-			"module/memory" = import ./modules/memory.nix { inherit config; };
-			"module/date" = import ./modules/date.nix { inherit config; };
-			"module/time" = import ./modules/time.nix { inherit config; };
-			"module/battery" = import ./modules/battery.nix { inherit config; };
-			"module/kernel-version" = import ./modules/kernel-version.nix { inherit config; };
+			"module/cpu" = import ./module/cpu.nix { inherit config; };
+			"module/memory" = import ./module/memory.nix { inherit config; };
+			"module/date" = import ./module/date.nix { inherit config; };
+			"module/time" = import ./module/time.nix { inherit config; };
+			"module/battery" = import ./module/battery.nix { inherit config; };
+			"module/kernel-version" = import ./module/kernel-version.nix { inherit config; };
 		};
 	};
 }
diff --git a/modules/desktop/status-bar/polybar/modules/battery.nix b/modules/desktop/status-bar/polybar/module/battery.nix
index 6d4aef9..6d4aef9 100644
--- a/modules/desktop/status-bar/polybar/modules/battery.nix
+++ b/modules/desktop/status-bar/polybar/module/battery.nix
diff --git a/modules/desktop/status-bar/polybar/modules/bspwm.nix b/modules/desktop/status-bar/polybar/module/bspwm.nix
index 0eaac30..c6671e7 100644
--- a/modules/desktop/status-bar/polybar/modules/bspwm.nix
+++ b/modules/desktop/status-bar/polybar/module/bspwm.nix
@@ -5,7 +5,6 @@ with config.scheme.withHashtag;
 	type = "internal/bspwm";
 
 	label-focused = "%index%";
-	label-focused-background = "${base01}";
 	label-focused-underline = "${base0D}";
 	label-focused-padding = 2;
 
@@ -13,7 +12,7 @@ with config.scheme.withHashtag;
 	label-occupied-padding = 2;
 
 	label-urgent = "%index%!";
-	label-urgent-background = "${base08}";
+	label-urgent-underline = "${base08}";
 	label-urgent-padding = 2;
 
 	label-empty = "%index%";
diff --git a/modules/desktop/status-bar/polybar/modules/cpu.nix b/modules/desktop/status-bar/polybar/module/cpu.nix
index 403add3..403add3 100644
--- a/modules/desktop/status-bar/polybar/modules/cpu.nix
+++ b/modules/desktop/status-bar/polybar/module/cpu.nix
diff --git a/modules/desktop/status-bar/polybar/modules/date.nix b/modules/desktop/status-bar/polybar/module/date.nix
index 9ebfd77..9ebfd77 100644
--- a/modules/desktop/status-bar/polybar/modules/date.nix
+++ b/modules/desktop/status-bar/polybar/module/date.nix
diff --git a/modules/desktop/status-bar/polybar/modules/kernel-version.nix b/modules/desktop/status-bar/polybar/module/kernel-version.nix
index e6822fa..e6822fa 100644
--- a/modules/desktop/status-bar/polybar/modules/kernel-version.nix
+++ b/modules/desktop/status-bar/polybar/module/kernel-version.nix
diff --git a/modules/desktop/status-bar/polybar/modules/memory.nix b/modules/desktop/status-bar/polybar/module/memory.nix
index a09d4a8..a09d4a8 100644
--- a/modules/desktop/status-bar/polybar/modules/memory.nix
+++ b/modules/desktop/status-bar/polybar/module/memory.nix
diff --git a/modules/desktop/status-bar/polybar/modules/time.nix b/modules/desktop/status-bar/polybar/module/time.nix
index f3e0054..f3e0054 100644
--- a/modules/desktop/status-bar/polybar/modules/time.nix
+++ b/modules/desktop/status-bar/polybar/module/time.nix
diff --git a/modules/desktop/status-bar/polybar/modules/xwindow.nix b/modules/desktop/status-bar/polybar/module/xwindow.nix
index 833899e..833899e 100644
--- a/modules/desktop/status-bar/polybar/modules/xwindow.nix
+++ b/modules/desktop/status-bar/polybar/module/xwindow.nix