From f350f26baf20d11bf1ff9a6c9bf4d2bb1ca53c9f Mon Sep 17 00:00:00 2001
From: Noa Aarts <itepastra@gmail.com>
Date: Fri, 5 Apr 2024 13:58:29 +0200
Subject: [PATCH] If I can find out how to make it work without the double
 definition i'll be happy

---
 modules/hyprland.nix             | 4 ++--
 modules/waybar/allmodules.nix    | 4 ++++
 modules/waybar/createmodules.nix | 1 +
 modules/waybar/default.nix       | 7 +------
 modules/waybar/namedmodules.nix  | 4 ++++
 modules/waybar/power.nix         | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 modules/waybar/allmodules.nix
 create mode 100644 modules/waybar/createmodules.nix
 create mode 100644 modules/waybar/namedmodules.nix

diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index af39b3b..2f4b93d 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -25,12 +25,12 @@ in
   config = lib.mkIf cfg.enable {
     modules = {
       waybar = {
-	enable = lib.mkDefault true;
 	modules = {
           left = [ "hyprland/workspaces" "tray" "hyprland/window" ];
 	  center = [ "clock" ];
-          right = [ "custom/vpn" "wireplumber" "network" "cpu" "memory" "temperature" "custom/poweroff" ];
+          right = [ "custom/vpn" "wireplumber" "network" "cpu" "memory" "custom/poweroff" ];
 	};
+	enable = lib.mkDefault true;
       };
       wofi.enable = lib.mkDefault true;
       dunst.enable = lib.mkDefault true;
diff --git a/modules/waybar/allmodules.nix b/modules/waybar/allmodules.nix
new file mode 100644
index 0000000..ebe8b5a
--- /dev/null
+++ b/modules/waybar/allmodules.nix
@@ -0,0 +1,4 @@
+config: 
+  [ "hyprland/workspaces" "tray" "hyprland/window" ] ++ 
+  [ "clock" ] ++ 
+  [ "custom/vpn" "wireplumber" "network" "cpu" "memory" "custom/poweroff" ]
diff --git a/modules/waybar/createmodules.nix b/modules/waybar/createmodules.nix
new file mode 100644
index 0000000..ed2e6d5
--- /dev/null
+++ b/modules/waybar/createmodules.nix
@@ -0,0 +1 @@
+config: builtins.listToAttrs (import ./namedmodules.nix config)
diff --git a/modules/waybar/default.nix b/modules/waybar/default.nix
index a8fa83f..757f380 100644
--- a/modules/waybar/default.nix
+++ b/modules/waybar/default.nix
@@ -1,8 +1,6 @@
 { config, pkgs, lib, ... }:
 let
   cfg = config.modules.waybar;
-
-  ifIsDef = name: builtins.any (row: builtins.any (x: x == name) row) (with cfg.modules; [left center right]);
 in
 {
   options.modules.waybar = {
@@ -42,10 +40,7 @@ in
   ];
 
   config = lib.mkIf cfg.enable {
-    modules.waybar = {
-      clock.enable = ifIsDef "clock";
-      "hyprland/workspaces".enable = ifIsDef "hyprland/workspaces";
-    };
+    modules.waybar = import ./createmodules.nix cfg.modules;
     home.packages = with pkgs; [
       font-awesome
     ];
diff --git a/modules/waybar/namedmodules.nix b/modules/waybar/namedmodules.nix
new file mode 100644
index 0000000..6d8b7fa
--- /dev/null
+++ b/modules/waybar/namedmodules.nix
@@ -0,0 +1,4 @@
+config:
+  builtins.map 
+    (n: {name = n; value = {enable = true;}; })
+    (import ./allmodules.nix config)
diff --git a/modules/waybar/power.nix b/modules/waybar/power.nix
index 3b3e2c1..67d571e 100644
--- a/modules/waybar/power.nix
+++ b/modules/waybar/power.nix
@@ -15,7 +15,7 @@ in
     programs.waybar.settings.mainBar."${name}" = {
       format = "";
       on-click = "wofi-power";
-      # on-click-right = "swaylock"; # TODO: change to whatever lock screen i want
+      on-click-right = "swaylock"; # TODO: change to whatever lock screen i want
     };
   };
 }