From 68892671801aa5627d1d9f04f2de83f967db8375 Mon Sep 17 00:00:00 2001
From: Simon Walker <s.r.walker101@googlemail.com>
Date: Tue, 7 May 2024 15:47:23 +0100
Subject: [PATCH] Update hyprland configuration

---
 home/hyprland.nix                      | 15 +++++++--------
 home/hyprland/config                   |  2 +-
 system/nixos/astoria/configuration.nix |  4 ++++
 system/nixos/astoria/wm/bspwm.nix      |  3 ---
 system/nixos/astoria/wm/i3.nix         |  6 ------
 system/nixos/astoria/wm/mate.nix       |  1 -
 6 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/home/hyprland.nix b/home/hyprland.nix
index eb531ad5..a238271b 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -30,8 +30,8 @@ in {
         bind = [
           "$mainMod, space, exec, wofi --show drun"
           "$mainMod, return, exec, ${defaults.terminal}"
-          "$mainMod, C, killactive"
-          "$mainMod, c, ${defaults.browser}"
+          "SUPER_SHIFT, c, killactive"
+          "$mainMod, c, exec, ${defaults.browser}"
           # Move focus with mainMod + arrow keys
           "$mainMod, left, movefocus, l"
           "$mainMod, right, movefocus, r"
@@ -42,13 +42,7 @@ in {
           "$mainMod, k, movefocus, u"
           "$mainMod, j, movefocus, d"
           # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-          "$mainMod, Q, exec, alacritty"
-          "$mainMod, C, killactive"
           "SUPER_SHIFT, M, exit"
-          "$mainMod, V, togglefloating"
-          "$mainMod, R, exec, wofi --show drun"
-          "$mainMod, P, pseudo"
-          "$mainMod, J, togglesplit"
 
           # Switch workspaces with mainMod + [0-9]
           "$mainMod, 1, workspace, 1"
@@ -100,8 +94,13 @@ in {
             "hyprland/window"
           ];
           modules-right = [
+            "wireplumber"
+            "tray"
             "clock"
           ];
+          "wireplumber" = {
+            on-click = "pavucontrol";
+          };
         };
       };
     };
diff --git a/home/hyprland/config b/home/hyprland/config
index faaf546e..8a55d07a 100644
--- a/home/hyprland/config
+++ b/home/hyprland/config
@@ -113,4 +113,4 @@ bindm = $mainMod, mouse:273, resizewindow
 
 exec-once = nm-applet --indicator
 exec-once = hyprpaper
-
+exec-once = blueman-applet
diff --git a/system/nixos/astoria/configuration.nix b/system/nixos/astoria/configuration.nix
index ad76fe81..9f8bb15d 100644
--- a/system/nixos/astoria/configuration.nix
+++ b/system/nixos/astoria/configuration.nix
@@ -222,6 +222,10 @@ in {
       };
     };
 
+    # enable bluetooth manager
+    services.blueman.enable = true;
+    programs.dconf.enable = true;
+
     # Configure virtualisation
     virtualisation.libvirtd.enable = true;
     virtualisation.podman = {
diff --git a/system/nixos/astoria/wm/bspwm.nix b/system/nixos/astoria/wm/bspwm.nix
index 70a1a022..9700df62 100644
--- a/system/nixos/astoria/wm/bspwm.nix
+++ b/system/nixos/astoria/wm/bspwm.nix
@@ -33,8 +33,5 @@ in {
       displayManager.defaultSession = "none+bspwm";
       windowManager.bspwm.enable = true;
     };
-    # enable bluetooth manager
-    services.blueman.enable = true;
-    programs.dconf.enable = true;
   };
 }
diff --git a/system/nixos/astoria/wm/i3.nix b/system/nixos/astoria/wm/i3.nix
index 7ac8c5e4..b8078d64 100644
--- a/system/nixos/astoria/wm/i3.nix
+++ b/system/nixos/astoria/wm/i3.nix
@@ -29,11 +29,5 @@ in {
         ];
       };
     };
-
-    programs.dconf.enable = true;
-    # enable bluetooth manager
-    services.blueman.enable = true;
-
-    environment.systemPackages = with pkgs; [];
   };
 }
diff --git a/system/nixos/astoria/wm/mate.nix b/system/nixos/astoria/wm/mate.nix
index f54933d7..a4eacf5c 100644
--- a/system/nixos/astoria/wm/mate.nix
+++ b/system/nixos/astoria/wm/mate.nix
@@ -17,7 +17,6 @@ in {
       pkgs.gnome.gnome-themes-extra
       pkgs.mate.mate-tweak
     ];
-    services.blueman.enable = true;
     environment.mate.excludePackages = with pkgs; [
       mate.mate-terminal
     ];