hypr: add hyprspace overview and waybar config

nixos/hyprland.nix

@@ -8,114 +8,37 @@ makeEnable config "myModules.hyprland" true {
 
   home-manager.sharedModules = [
     {
-      # Wire the Hyprland config from dotfiles into ~/.config/hypr
-      xdg.configFile."hypr" = {
-        source = ../dotfiles/config/hypr;
+      xdg.configFile."waybar" = {
+        source = ../dotfiles/config/waybar;
         recursive = true;
         force = true;
       };
 
-      programs.waybar = {
-        enable = true;
-        systemd.enable = true;
-        settings = [
-          {
-            layer = "top";
-            position = "top";
-            height = 30;
-            "modules-left" = [ "hyprland/workspaces" ];
-            "modules-center" = [ "hyprland/window" ];
-            "modules-right" = [ "tray" "clock" ];
+      programs.waybar.enable = true;
 
-            "hyprland/workspaces" = {
-              format = "{id}:{windows}";
-              "format-window-separator" = " ";
-              "window-rewrite-default" = "";
-              "window-rewrite" = {
-                "class<firefox>" = "";
-                "class<google-chrome|chromium>" = "";
-                "class<code|codium>" = "";
-                "class<Alacritty|kitty|foot>" = "";
-                "class<Slack>" = "";
-                "class<Spotify>" = "";
-                "class<Element|discord>" = "";
-                "class<pavucontrol>" = "";
-                "class<transmission-gtk>" = "";
-              };
-              "persistent-workspaces" = { "*" = 10; };
-              "all-outputs" = true;
-              "on-click" = "activate";
-            };
-
-            "hyprland/window" = {
-              format = "{class}: {title}";
-              "separate-outputs" = true;
-            };
-
-            tray = {
-              spacing = 8;
-            };
-
-            clock = {
-              format = "{:%a %b %d %I:%M:%S %p}";
-            };
-          }
-        ];
-        style = ''
-        * {
-          border: none;
-          border-radius: 0;
-          font-family: "Roboto", "JetBrainsMono Nerd Font";
-          font-size: 11pt;
-          min-height: 0;
-        }
-
-        window#waybar {
-          background: rgba(24, 24, 24, 0.92);
-          color: #e6e6e6;
-        }
-
-        #workspaces {
-          margin-left: 6px;
-        }
-
-        #workspaces button {
-          padding: 0 8px;
-          margin: 4px 4px;
-          border-radius: 6px;
-          background: transparent;
-          color: #bfbfbf;
-        }
-
-        #workspaces button.active {
-          background: #e0b45a;
-          color: #1c1c1c;
-        }
-
-        #workspaces button.visible {
-          background: #3a3a3a;
-          color: #e6e6e6;
-        }
-
-        #workspaces button.urgent {
-          background: #e06060;
-          color: #1c1c1c;
-        }
-
-        #workspaces button.empty {
-          color: #777777;
-        }
-
-        #window {
-          padding: 0 10px;
-        }
-
-        #tray,
-        #clock {
-          padding: 0 10px;
-        }
-        '';
+      systemd.user.targets.hyprland-session = {
+        Unit = {
+          Description = "Hyprland session";
+        };
       };
+
+      systemd.user.services.waybar = {
+        Unit = {
+          Description = "Waybar";
+          PartOf = [ "hyprland-session.target" ];
+          After = [ "hyprland-session.target" ];
+        };
+        Service = {
+          ExecStart = "${pkgs.waybar}/bin/waybar";
+          Restart = "on-failure";
+          RestartSec = 1;
+        };
+        Install = {
+          WantedBy = [ "hyprland-session.target" ];
+        };
+      };
+
+      programs.hyprpanel.enable = false;
     }
   ];
 
@@ -136,6 +59,9 @@ makeEnable config "myModules.hyprland" true {
     # hy3 plugin from flake (properly built against matching Hyprland)
     inputs.hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3
 
+    # Hyprspace plugin from flake (workspace overview)
+    inputs.hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace
+
     # For scripts
     jq
   ];