modularize waybar config, TODO: styles

modules/hyprland.nix

@@ -27,10 +27,9 @@ in
       waybar = {
 	enable = lib.mkDefault true;
 	modules = {
-          # left = [ "hyprland/workspaces" "tray" "hyprland/window" ];
+          left = [ "hyprland/workspaces" "tray" "hyprland/window" ];
-          # center = [ "clock" ];
-          # right = [ "custom/vpn" "wireplumber" "network" "cpu" "memory" "temperature" "custom/poweroff" ];
 	  center = [ "clock" ];
+          right = [ "custom/vpn" "wireplumber" "network" "cpu" "memory" "temperature" "custom/poweroff" ];
 	};
       };
       wofi.enable = lib.mkDefault true;

modules/waybar/cpu.nix

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

modules/waybar/default.nix

@@ -28,8 +28,17 @@ in
   };
 
   imports = [
+    ./cpu.nix
+    ./vpn.nix
+    ./tray.nix
     ./clock.nix
+    ./power.nix
+    ./memory.nix
+    ./window.nix
+    ./network.nix
     ./workspaces.nix
+    ./temperature.nix
+    ./wireplumber.nix
   ];
 
   config = lib.mkIf cfg.enable {
@@ -58,77 +67,6 @@ in
           modules-left = cfg.modules.left;
           modules-center = cfg.modules.center;
           modules-right = cfg.modules.right;
-          "tray".spacing = 10;
-          "cpu" = {
-            format = "cpu: {usage}%";
-            tooltip = false;
-          };
-          "memory" = {
-            format = "mem: {}%";
-            tooltip = false;
-          };
-          "wireplumber" = {
-            format = "{volume}% {icon}";
-            format-muted = "";
-            on-click = "helvum";
-            format-icons = ["" "" ""];
-          };
-          "custom/vpn" = {
-            format = "VPN";
-            exec = "echo '{\"class\": \"connected\"}'";
-            exec-if = "test -d /proc/sys/net/ipv4/conf/tun0";
-            return-type = "json";
-            interval = 5;
-          };
-          "temperature" = {
-            thermal-zone = 2;
-            hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";
-            critical-threshold = 80;
-            format = "{temperatureC}°C {icon}";
-            format-icons = ["" "" ""];
-          };
-          "custom/poweroff" = {
-            format = "";
-            on-click = "wofi-power";
-            on-click-right = "swaylock";
-          };
-          "battery" = {
-            bat = "hidpp_battery_2";
-            states = {
-              full = 100;
-              good = 50;
-              warning = 30;
-              critical = 30;
-            };
-            format = "mouse: {capacity}% {icon}";
-            format-charging = "mouse: {capacity}% {icon}";
-            format-plugged = "mouse: {capacity}% {icon}";
-            format-alt = "mouse: {time} {icon}";
-            interval = 1;
-            format-icons = [
-              "󰂎"
-              "󰁻"
-              "󰁾"
-              "󰂀"
-              "󰁹"
-            ];
-          };
-          "hyprland/window" = {
-            max-length = 36;
-          };
-          "network" = {
-            format-wifi = "{essid} ({signalStrength}%) 󰖩";
-            format-ethernet = "{ipaddr}/{cidr} 󰛳";
-            tooltip-format = "{ifname} via {gwaddr} 󰛳";
-            format-linked = "{ifname} (No IP) 󰛳";
-            format-disconnected = "Disconnected ";
-            format-alt = "{ifname}: {ipaddr}/{cidr}";
-          };
-          "custom/pronouns" = {
-            format = "{}";
-            # exec = "${config.xdg.configHome}/waybar/pronouns"; # TODO: install pronouns
-            interval = 5;
-          };
         };
       };
       style = ''
@@ -140,7 +78,6 @@ in
 
         window#waybar {
           background-color: transparent;
-          
           border-radius: 999px;
           color: #${config.colorScheme.palette.text};
           transition-property: background-color;

modules/waybar/memory.nix

@@ -0,0 +1,16 @@
+{ lib, config, ... }:
+let 
+  name = "memory";
+in
+{
+  options.modules.waybar.modules = import ./addname.nix lib name;
+  options.modules.waybar.${name} = {
+    enable = lib.mkEnableOption "enable ${name} waybar module";
+  };
+  config = lib.mkIf config.modules.waybar.${name}.enable {
+    programs.waybar.settings.mainbar."${name}" = {
+      format = "mem: {}%";
+      tooltip = false;
+    };
+  };
+}

modules/waybar/network.nix

@@ -0,0 +1,20 @@
+{ lib, config, ... }:
+let 
+  name = "network";
+in
+{
+  options.modules.waybar.modules = import ./addname.nix lib name;
+  options.modules.waybar.${name} = {
+    enable = lib.mkEnableOption "enable ${name} waybar module";
+  };
+  config = lib.mkIf config.modules.waybar.${name}.enable {
+    programs.waybar.settings.mainbar."${name}" = {
+      format-wifi = "{essid} ({signalStrength}%) 󰖩";
+      format-ethernet = "{ipaddr}/{cidr} 󰛳";
+      tooltip-format = "{ifname} via {gwaddr} 󰛳";
+      format-linked = "{ifname} (No IP) 󰛳";
+      format-disconnected = "Disconnected ";
+      format-alt = "{ifname}: {ipaddr}/{cidr}";
+    };
+  };
+}

modules/waybar/power.nix

@@ -0,0 +1,21 @@
+{ lib, config, ... }:
+let 
+  name = "custom/poweroff";
+in
+{
+  options.modules.waybar.modules = import ./addname.nix lib name;
+  options.modules.waybar.${name} = {
+    enable = lib.mkEnableOption "enable ${name} waybar module";
+  };
+  imports = [
+    ../wofi.nix
+  ];
+  config = lib.mkIf config.modules.waybar.${name}.enable {
+    modules.wofi.enable = true;
+    programs.waybar.settings.mainbar."${name}" = {
+      format = "";
+      on-click = "wofi-power";
+      # on-click-right = "swaylock"; # TODO: change to whatever lock screen i want
+    };
+  };
+}

modules/waybar/temperature.nix

@@ -0,0 +1,19 @@
+{ lib, config, ... }:
+let 
+  name = "temperature";
+in
+{
+  options.modules.waybar.modules = import ./addname.nix lib name;
+  options.modules.waybar.${name} = {
+    enable = lib.mkEnableOption "enable ${name} waybar module";
+  };
+  config = lib.mkIf config.modules.waybar.${name}.enable {
+    programs.waybar.settings.mainbar."${name}" = {
+      thermal-zone = 2;
+      hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";
+      critical-threshold = 80;
+      format = "{temperatureC}°C {icon}";
+      format-icons = ["" "" ""];
+    };
+  };
+}

modules/waybar/tray.nix

@@ -0,0 +1,15 @@
+{ lib, config, ... }:
+let 
+  name = "tray";
+in
+{
+  options.modules.waybar.modules = import ./addname.nix lib name;
+  options.modules.waybar.${name} = {
+    enable = lib.mkEnableOption "enable ${name} waybar module";
+  };
+  config = lib.mkIf config.modules.waybar.${name}.enable {
+    programs.waybar.settings.mainbar."${name}" = {
+      spacing = 10;
+    };
+  };
+}

modules/waybar/vpn.nix

@@ -0,0 +1,19 @@
+{ lib, config, ... }:
+let 
+  name = "custom/vpn";
+in
+{
+  options.modules.waybar.modules = import ./addname.nix lib name;
+  options.modules.waybar.${name} = {
+    enable = lib.mkEnableOption "enable ${name} waybar module";
+  };
+  config = lib.mkIf config.modules.waybar.${name}.enable {
+    programs.waybar.settings.mainbar."${name}" = {
+      format = "VPN";
+      exec = "echo '{\"class\": \"connected\"}'";
+      exec-if = "test -d /proc/sys/net/ipv4/conf/tun0";
+      return-type = "json";
+      interval = 5;
+    };
+  };
+}

modules/waybar/window.nix

@@ -0,0 +1,15 @@
+{ lib, config, ... }:
+let 
+  name = "hyprland/window";
+in
+{
+  options.modules.waybar.modules = import ./addname.nix lib name;
+  options.modules.waybar.${name} = {
+    enable = lib.mkEnableOption "enable ${name} waybar module";
+  };
+  config = lib.mkIf config.modules.waybar.${name}.enable {
+    programs.waybar.settings.mainbar."${name}" = {
+      max-length = 36;
+    };
+  };
+}

modules/waybar/wireplumber.nix

@@ -0,0 +1,18 @@
+{ lib, config, ... }:
+let 
+  name = "wireplumber";
+in
+{
+  options.modules.waybar.modules = import ./addname.nix lib name;
+  options.modules.waybar.${name} = {
+    enable = lib.mkEnableOption "enable ${name} waybar module";
+  };
+  config = lib.mkIf config.modules.waybar.${name}.enable {
+    programs.waybar.settings.mainbar."${name}" = {
+      format = "{volume}% {icon}";
+      format-muted = "";
+      on-click = "helvum";
+      format-icons = ["" "" ""];
+    };
+  };
+}