fix waybar configs

modules/hyprland.nix

@@ -40,7 +40,7 @@ in
       waybar = {
         modules = {
           left = [ "hyprland/workspaces" "tray" "hyprland/window" ];
-          center = [ "clock" ];
+          center = [ "clock" "custom/spotify" ];
           right = [ "custom/vpn" "wireplumber" "network" "cpu" "memory" "custom/poweroff" ];
         };
         enable = lib.mkDefault true;

modules/waybar/allmodules.nix

@@ -1,4 +0,0 @@
-config:
-[ "hyprland/workspaces" "tray" "hyprland/window" ] ++
-[ "clock" ] ++
-[ "custom/vpn" "wireplumber" "network" "cpu" "memory" "custom/poweroff" ]

modules/waybar/clock.nix

@@ -4,10 +4,10 @@ let
 in
 {
   options.modules.waybar.modules = import ./addname.nix lib name;
-  options.modules.waybar.${name} = {
+  options.modules.waybar.enabled.${name} = {
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
-  config = lib.mkIf config.modules.waybar.${name}.enable {
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
     programs.waybar.settings.mainBar.${name} = {
       tooltip-format = "<big>{:%Y %B}</big>\n\n{calendar}";
       interval = 1;

modules/waybar/cpu.nix

@@ -4,10 +4,10 @@ let
 in
 {
   options.modules.waybar.modules = import ./addname.nix lib name;
-  options.modules.waybar.${name} = {
+  options.modules.waybar.enabled.${name} = {
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
-  config = lib.mkIf config.modules.waybar.${name}.enable {
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
     programs.waybar.settings.mainBar."${name}" = {
       format = "cpu: {usage}%";
       tooltip = false;

modules/waybar/createmodules.nix

@@ -1 +0,0 @@
-config: builtins.listToAttrs (import ./namedmodules.nix config)

modules/waybar/default.nix

@@ -37,12 +37,26 @@ in
     ./workspaces.nix
     ./temperature.nix
     ./wireplumber.nix
+    ./spotify.nix
     ../../common/colors.nix
   ];
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf cfg.enable
-    modules.waybar = import ./createmodules.nix cfg.modules;
+    rec {
-    home.packages = with pkgs; [
+      modules.waybar.enabled = (
+        let
+          mods = config.modules.waybar.modules;
+          allmodules = mods.left ++ mods.center ++ mods.right;
+          namedmodules = builtins.map
+            (n: { name = n; value = { enable = true; }; })
+            allmodules;
+          createmodules = builtins.listToAttrs namedmodules;
+        in
+        createmodules
+      );
+
+      home.packages = with pkgs;
+        [
           font-awesome
         ];
       programs.waybar = {
@@ -275,5 +289,6 @@ in
           }
         '';
       };
-  };
+    }
+  ;
 }

modules/waybar/memory.nix

@@ -4,10 +4,10 @@ let
 in
 {
   options.modules.waybar.modules = import ./addname.nix lib name;
-  options.modules.waybar.${name} = {
+  options.modules.waybar.enabled.${name} = {
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
-  config = lib.mkIf config.modules.waybar.${name}.enable {
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
     programs.waybar.settings.mainBar."${name}" = {
       format = "mem: {}%";
       tooltip = false;

modules/waybar/namedmodules.nix

@@ -1,4 +0,0 @@
-config:
-builtins.map
-  (n: { name = n; value = { enable = true; }; })
-  (import ./allmodules.nix config)

modules/waybar/network.nix

@@ -4,10 +4,10 @@ let
 in
 {
   options.modules.waybar.modules = import ./addname.nix lib name;
-  options.modules.waybar.${name} = {
+  options.modules.waybar.enabled.${name} = {
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
-  config = lib.mkIf config.modules.waybar.${name}.enable {
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
     programs.waybar.settings.mainBar."${name}" = {
       format-wifi = "{essid} ({signalStrength}%) 󰖩";
       format-ethernet = "{ipaddr}/{cidr} 󰛳";

modules/waybar/power.nix

@@ -3,14 +3,16 @@ let
   name = "custom/poweroff";
 in
 {
-  options.modules.waybar.modules = import ./addname.nix lib name;
+  options.modules.waybar = {
-  options.modules.waybar.${name} = {
+    modules = import ./addname.nix lib name;
+    enabled.${name} = {
       enable = lib.mkEnableOption "enable ${name} waybar module";
     };
+  };
   imports = [
     ../wofi.nix
   ];
-  config = lib.mkIf config.modules.waybar.${name}.enable {
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
     modules.wofi.enable = true;
     programs.waybar.settings.mainBar."${name}" = {
       format = "";

modules/waybar/spotify.nix

@@ -0,0 +1,31 @@
+{ lib, config, pkgs, ... }:
+let
+  name = "custom/spotify";
+in
+{
+  options.modules.waybar = {
+    modules = import ./addname.nix lib name;
+    enabled.${name} = {
+      enable = lib.mkEnableOption "enable ${name} waybar module";
+    };
+  };
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
+    programs.waybar.settings.mainBar.${name} = {
+      tooltip-format = "<big>{:%Y %B}</big>\n\n{calendar}";
+      interval = 1;
+      format = "{:%H:%M:%S}";
+      format-alt = "{:%Y-%m-%d %H:%M:%S}";
+      on-click-middle = "gnome-clocks";
+      calendar = {
+        weeks-pos = "left";
+        format = {
+          today = "<span color='#FF6666'><u>{}</u></span>"; # TODO: use nix-colors
+          weeks = "<span color='#707A8C'>{}</span>"; # TODO: use nix-colors
+        };
+      };
+      home.packages = [
+        pkgs.gnome.gnome-clocks
+      ];
+    };
+  };
+}

modules/waybar/temperature.nix

@@ -3,11 +3,13 @@ let
   name = "temperature";
 in
 {
-  options.modules.waybar.modules = import ./addname.nix lib name;
+  options.modules.waybar = {
-  options.modules.waybar.${name} = {
+    modules = import ./addname.nix lib name;
+    enabled.${name} = {
       enable = lib.mkEnableOption "enable ${name} waybar module";
     };
-  config = lib.mkIf config.modules.waybar.${name}.enable {
+  };
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
     programs.waybar.settings.mainBar."${name}" = {
       thermal-zone = 2;
       hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";

modules/waybar/tray.nix

@@ -4,10 +4,10 @@ let
 in
 {
   options.modules.waybar.modules = import ./addname.nix lib name;
-  options.modules.waybar.${name} = {
+  options.modules.waybar.enabled.${name} = {
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
-  config = lib.mkIf config.modules.waybar.${name}.enable {
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
     programs.waybar.settings.mainBar."${name}" = {
       spacing = 10;
     };

modules/waybar/vpn.nix

@@ -4,10 +4,10 @@ let
 in
 {
   options.modules.waybar.modules = import ./addname.nix lib name;
-  options.modules.waybar.${name} = {
+  options.modules.waybar.enabled.${name} = {
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
-  config = lib.mkIf config.modules.waybar.${name}.enable {
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
     programs.waybar.settings.mainBar."${name}" = {
       format = "VPN";
       exec = "echo '{\"class\": \"connected\"}'";

modules/waybar/window.nix

@@ -4,10 +4,10 @@ let
 in
 {
   options.modules.waybar.modules = import ./addname.nix lib name;
-  options.modules.waybar.${name} = {
+  options.modules.waybar.enabled.${name} = {
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
-  config = lib.mkIf config.modules.waybar.${name}.enable {
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
     programs.waybar.settings.mainBar."${name}" = {
       max-length = 36;
     };

modules/waybar/wireplumber.nix

@@ -3,11 +3,13 @@ let
   name = "wireplumber";
 in
 {
-  options.modules.waybar.modules = import ./addname.nix lib name;
+  options.modules.waybar = {
-  options.modules.waybar.${name} = {
+    modules = import ./addname.nix lib name;
+    enabled.${name} = {
       enable = lib.mkEnableOption "enable ${name} waybar module";
     };
-  config = lib.mkIf config.modules.waybar.${name}.enable {
+  };
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
     programs.waybar.settings.mainBar."${name}" = {
       format = "{volume}% {icon}";
       format-muted = "";

modules/waybar/workspaces.nix

@@ -4,10 +4,10 @@ let
 in
 {
   options.modules.waybar.modules = import ./addname.nix lib name;
-  options.modules.waybar.${name} = {
+  options.modules.waybar.enabled.${name} = {
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
-  config = lib.mkIf config.modules.waybar.${name}.enable {
+  config = lib.mkIf config.modules.waybar.enabled.${name}.enable {
     programs.waybar.settings.mainBar."${name}" = {
       format = "{name}";
       on-click = "activate";