From 154da6736dffed6ad3a44bcb453e7a81a0cab1e1 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Tue, 6 May 2025 09:42:32 +0200
Subject: [PATCH 1/3] system: switch to Catppuccin again

---
 modules/style/colors.nix | 2 +-
 packages/helix.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/style/colors.nix b/modules/style/colors.nix
index 07934ae..8b6dcd9 100644
--- a/modules/style/colors.nix
+++ b/modules/style/colors.nix
@@ -35,7 +35,7 @@ in {
       name = mkOption {
         type = nullOr (enum ["Catppuccin Mocha" "Zenburn" "Black Metal Venom" "Gruvbox"]);
         description = "The colorscheme that should be used globally to theme your system.";
-        default = "Gruvbox";
+        default = "Catppuccin Mocha";
       };
 
       slug = mkOption {
diff --git a/packages/helix.nix b/packages/helix.nix
index c084885..f9a9dd5 100644
--- a/packages/helix.nix
+++ b/packages/helix.nix
@@ -39,7 +39,7 @@
 
   toml = formats.toml {};
   helix-config = {
-    theme = "gruvbox";
+    theme = "catppuccin_mocha";
     editor = {
       cursorline = false;
       color-modes = true;

From 08658d4c42b2b3e3ecde93492430e617a25def89 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Tue, 6 May 2025 21:53:37 +0200
Subject: [PATCH 2/3] helix: do not display display hints automatically Display
 hints can be annoying, hence I toggle them using <space>-i instead.

---
 packages/helix.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/helix.nix b/packages/helix.nix
index f9a9dd5..8c80f67 100644
--- a/packages/helix.nix
+++ b/packages/helix.nix
@@ -48,7 +48,7 @@
       lsp = {
         enable = true;
         auto-signature-help = true;
-        display-inlay-hints = true;
+        display-inlay-hints = false;
         display-messages = true;
         snippets = true;
       };
@@ -78,7 +78,10 @@
     };
     keys = {
       normal = {
-        space.g = [":new" ":insert-output XDG_CONFIG_HOME=~/.config ${getExe lazygit}" ":buffer-close!" ":redraw"];
+        space = {
+          g = [":new" ":insert-output XDG_CONFIG_HOME=~/.config ${getExe lazygit}" ":buffer-close!" ":redraw"];
+          i = ":toggle lsp.display-inlay-hints";
+        };
         esc = ["collapse_selection" "keep_primary_selection" "normal_mode"];
         A-H = "goto_previous_buffer";
         A-L = "goto_next_buffer";

From 3d9518e7588211648ffdeb479f34f46a0ac13842 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Tue, 6 May 2025 21:55:50 +0200
Subject: [PATCH 3/3] hyprland/binds.nix: add keybind for grabbing rouge
 windows

---
 modules/wms/wayland/hyprland/binds.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/wms/wayland/hyprland/binds.nix b/modules/wms/wayland/hyprland/binds.nix
index 860ed20..92d4489 100644
--- a/modules/wms/wayland/hyprland/binds.nix
+++ b/modules/wms/wayland/hyprland/binds.nix
@@ -53,6 +53,9 @@ in {
         # Reload hyprland
         "$mainMod, R, exec, ${getExe' pkgs.hyprland "hyprctl"} reload"
 
+        # Grab rouge windows, which may persist after disconnecting a monitor.
+        "$mainMod, G,  split:grabroguewindows"
+
         # Restart waybar
         "$mainMod CONTROL, B, exec, ${pkgs.procps}/bin/pkill waybar || ${getExe pkgs.waybar}"
         "$mainMod CONTROL, Q, exec, ${pkgs.procps}/bin/pkill quickshell || ${getExe' inputs.quickshell.packages.${pkgs.stdenv.system}.default "quickshell"}"