From 966b9f99426d362c2e67e791eb23cd1bacd71a7c Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Sun, 22 Sep 2024 19:21:53 +0200
Subject: [PATCH] hyprland: add audio workspace, fix keybinds

---
 modules/wms/wayland/hyprland/binds.nix      | 1 +
 modules/wms/wayland/hyprland/exec.nix       | 3 +++
 modules/wms/wayland/hyprland/module.nix     | 4 ++--
 modules/wms/wayland/hyprland/settings.nix   | 3 +--
 modules/wms/wayland/hyprland/workspaces.nix | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/wms/wayland/hyprland/binds.nix b/modules/wms/wayland/hyprland/binds.nix
index d944f3d..e6c72dd 100644
--- a/modules/wms/wayland/hyprland/binds.nix
+++ b/modules/wms/wayland/hyprland/binds.nix
@@ -49,6 +49,7 @@ in {
         # Toggle the three different special workspaces.
         "$mainMod, N, togglespecialworkspace, nixos"
         "$mainMod, X, togglespecialworkspace, keepassxc"
+        "$mainMod, V, togglespecialworkspace, audio"
 
         # Reload hyprland
         "$mainMod, R, exec, ${cfg.package}/bin/hyprctl reload"
diff --git a/modules/wms/wayland/hyprland/exec.nix b/modules/wms/wayland/hyprland/exec.nix
index 1cb92b9..2dce067 100644
--- a/modules/wms/wayland/hyprland/exec.nix
+++ b/modules/wms/wayland/hyprland/exec.nix
@@ -20,7 +20,10 @@ in {
         "[workspace special:nixos; silent;tile] ${pkgs.foot}/bin/foot -D ~/projects/nichts"
 
         "[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc"
+        "[workspace special:audio; silent;tile] ${pkgs.pavucontrol}/bin/pavucontrol"
+        "[workspace special:audio; silent;tile] ${pkgs.pwvucontrol}/bin/pwvucontrol"
 
+ 
         "${pkgs.swww}/bin/swww-daemon"
 
         "${pkgs.wlsunset}/bin/wlsunset -S 06:00 -s 20:00"
diff --git a/modules/wms/wayland/hyprland/module.nix b/modules/wms/wayland/hyprland/module.nix
index be06f8b..2f1b287 100644
--- a/modules/wms/wayland/hyprland/module.nix
+++ b/modules/wms/wayland/hyprland/module.nix
@@ -6,7 +6,7 @@
   ...
 }: let
   cfg = config.modules.usrEnv.desktops.hyprland;
-  inherit (config.modules.other.system) username;
+  inherit (config.meta.mainUser) username;
   inherit
     (inputs'.split-monitor-workspaces.packages)
     split-monitor-workspaces
@@ -39,7 +39,7 @@ in {
         cfg.portalPackage
       ];
       config = {
-        common.default = ["hyprland"];
+        common.default = ["gtk" "hyprland"];
       };
     };
 
diff --git a/modules/wms/wayland/hyprland/settings.nix b/modules/wms/wayland/hyprland/settings.nix
index 82a4f2a..37d3ab1 100644
--- a/modules/wms/wayland/hyprland/settings.nix
+++ b/modules/wms/wayland/hyprland/settings.nix
@@ -51,8 +51,7 @@ in {
         gaps_out = 0;
         border_size = 2;
 
-
-      "col.active_border" = "0xff${colors.base07}";
+        "col.active_border" = "0xff${colors.base07}";
         no_border_on_floating = true;
       };
 
diff --git a/modules/wms/wayland/hyprland/workspaces.nix b/modules/wms/wayland/hyprland/workspaces.nix
index a209a17..dd61627 100644
--- a/modules/wms/wayland/hyprland/workspaces.nix
+++ b/modules/wms/wayland/hyprland/workspaces.nix
@@ -3,7 +3,7 @@
   lib,
   ...
 }: let
-  inherit (config.modules.other.system) username;
+  inherit (config.meta.mainUser) username;
   inherit (config.modules.system.hardware) monitors;
   inherit (lib) imap0 flatten optionalString;
   inherit (builtins) map genList attrNames toString;
@@ -50,6 +50,7 @@ in {
         ++ [
           "special:nixos, decorate:false"
           "special:keepassxc, decorate:false"
+          "special:audio, decorate:false"
         ];
     };
   };