From 95ee537f03239447fb3331401414f0a70002e544 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Wed, 15 Jan 2025 14:19:33 +0100
Subject: [PATCH 1/3] Refactor keybinding

---
 hmModules/niri/config.kdl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl
index 7fbe4bf..b7581b5 100644
--- a/hmModules/niri/config.kdl
+++ b/hmModules/niri/config.kdl
@@ -336,7 +336,7 @@ binds {
     Mod+M { spawn "emacsclient" "-c" "--eval" "(notmuch-search \"tag:new\")"; }
     Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))"; }
     Mod+Shift+C { spawn "emacsclient" "-c" "--eval" "(org-roam-dailies-capture-today)"; }
-    Super+Alt+L { spawn "swaylock"; }
+    Mod+Alt+L { spawn "swaylock"; }
     Mod+Space { spawn "rofi" "-show" "menu" "-modi" "menu:rofi-power-menu"; }
 
 

From 5a7309b5d359a42d8f94e8e36a73919ed23d0226 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Wed, 15 Jan 2025 14:20:02 +0100
Subject: [PATCH 2/3] Keybinding for spawning a floating btop

---
 hmModules/niri/config.kdl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl
index b7581b5..43f7a4f 100644
--- a/hmModules/niri/config.kdl
+++ b/hmModules/niri/config.kdl
@@ -304,8 +304,15 @@ window-rule {
   match title=r#"^Emacs Selector$"#
   opacity 0.95
   open-floating true
+  open-focused true
 }
 
+window-rule {
+  match title=r#"^bTop$"#
+  opacity 0.95
+  open-floating true
+  open-focused true
+}
 
 
 
@@ -338,7 +345,7 @@ binds {
     Mod+Shift+C { spawn "emacsclient" "-c" "--eval" "(org-roam-dailies-capture-today)"; }
     Mod+Alt+L { spawn "swaylock"; }
     Mod+Space { spawn "rofi" "-show" "menu" "-modi" "menu:rofi-power-menu"; }
-
+    Mod+Ctrl+b { spawn "foot" "--title='bTop'" "-W" "210x60" "btop";}
 
     // Example volume keys mappings for PipeWire & WirePlumber.
     // The allow-when-locked=true property makes them work even when the session is locked.

From 82a9c5be658b61532602d3bfea90404c473167a6 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Wed, 15 Jan 2025 14:20:31 +0100
Subject: [PATCH 3/3] Use Catppuccin GTK theme and use a more idiomatic poiner
 configuration

---
 hmModules/hyprland/default.nix | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/hmModules/hyprland/default.nix b/hmModules/hyprland/default.nix
index 2596638..1958349 100644
--- a/hmModules/hyprland/default.nix
+++ b/hmModules/hyprland/default.nix
@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }:
 let
@@ -52,29 +53,34 @@ in
 
   services.udiskie.enable = true;
 
+  home.pointerCursor = {
+    gtk.enable = true;
+    x11.enable = true;
+    package = pkgs.catppuccin-cursors;
+    name = "catppuccin-mocha-sapphire";
+    size = 38;
+  };
+
   gtk = {
     enable = true;
-    # font.name = lib.mkForce "Sans,Symbols Nerd Font";
+    theme = {
+      name = "Catppuccin-GTK-Purple-Dark-Compact";
+      package = pkgs.magnetic-catppuccin-gtk.override {
+        accent = [ "purple" ];
+        shade = "dark";
+        size = "compact";
+      };
+    };
     iconTheme = {
       name = "Adwaita";
       package = pkgs.adwaita-icon-theme;
     };
-    cursorTheme = {
-      name = "catppuccin-mocha-sapphire";
-      package = pkgs.catppuccin-cursors;
-      size = 38;
-    };
   };
 
   qt = {
     enable = true;
   };
 
-  home.file.".icons/catppuccin-mocha-sapphire" = {
-    source = "${pkgs.catppuccin-cursors.mochaSapphire}/share/icons/catppuccin-mocha-sapphire-cursors";
-    recursive = true;
-  };
-
   wayland.windowManager.hyprland = {
     enable = true;
     plugins = with pkgs.hyprlandPlugins; [