Refactoring code.

Stopped using picom.
Disabled unused packages and configurations.

4 files changed, 29 insertions, 20 deletions

diff --git a/modules/desktop/status-bar/polybar/bar/default.nix b/modules/desktop/status-bar/polybar/bar/default.nix
new file mode 100644
index 0000000..23a43c4
--- /dev/null
+++ b/modules/desktop/status-bar/polybar/bar/default.nix
@@ -0,0 +1,5 @@
+{ config, lib }:
+
+{
+	"bar/main" = import ./main.nix { inherit config lib; };
+}
diff --git a/modules/desktop/status-bar/polybar/bar/main.nix b/modules/desktop/status-bar/polybar/bar/main.nix
index 660c444..25cce91 100644
--- a/modules/desktop/status-bar/polybar/bar/main.nix
+++ b/modules/desktop/status-bar/polybar/bar/main.nix
@@ -1,4 +1,4 @@
-{ config }:
+{ config, lib }:
 
 with config.scheme.withHashtag;
 let
@@ -36,9 +36,9 @@ in {
 	font-2 = "${config.fonts.normal}:style=Light:pixelsize=${largerFontSize};2";
 
 	modules-left =
-		if config.desktop.window-manager.bspwm.enable then
-			"bspwm separator"
-		else null;
+		lib.mkIf
+			config.desktop.window-manager.bspwm.enable
+			"bspwm separator";
 	modules-center = "xwindow";
 	modules-right = "separator 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 05fb79a..0ea66c7 100644
--- a/modules/desktop/status-bar/polybar/default.nix
+++ b/modules/desktop/status-bar/polybar/default.nix
@@ -20,21 +20,9 @@ POLYBAR_WIDTH=$((MONITOR_WIDTH - 2 * OFFSET)) POLYBAR_OFFSET=$OFFSET polybar mai
 	config = lib.mkIf config.desktop.status-bar.polybar.enable {
 		services.polybar.enable = true;
 		services.polybar.script = config.desktop.status-bar.polybar.command;
-
-		services.polybar.config = {
-			"bar/main" = import ./bar/main.nix { inherit config; };
-			"module/separator" = import ./module/separator.nix { inherit config; };
-			"module/xwindow" = import ./module/xwindow.nix { inherit config; };
-			"module/bspwm" =
-				if config.desktop.window-manager.bspwm.enable then
-					import ./module/bspwm.nix { inherit config; }
-				else null;
-			"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; };
-		};
+		services.polybar.config = lib.mkMerge [
+			(import ./bar { inherit config lib; })
+			(import ./module { inherit config lib; })
+		];
 	};
 }
diff --git a/modules/desktop/status-bar/polybar/module/default.nix b/modules/desktop/status-bar/polybar/module/default.nix
new file mode 100644
index 0000000..3444086
--- /dev/null
+++ b/modules/desktop/status-bar/polybar/module/default.nix
@@ -0,0 +1,16 @@
+{ config, lib }:
+
+{
+	"module/separator" = import ./separator.nix { inherit config; };
+	"module/xwindow" = import ./xwindow.nix { inherit config; };
+	"module/bspwm" =
+		lib.mkIf
+			config.desktop.window-manager.bspwm.enable
+			(import ./bspwm.nix { inherit config; });
+	"module/cpu" = import ./cpu.nix { inherit config; };
+	"module/memory" = import ./memory.nix { inherit config; };
+	"module/date" = import ./date.nix { inherit config; };
+	"module/time" = import ./time.nix { inherit config; };
+	"module/battery" = import ./battery.nix { inherit config; };
+	"module/kernel-version" = import ./kernel-version.nix { inherit config; };
+}