From 967218a48efa68bfe4b0506ae5a3be7650976584 Mon Sep 17 00:00:00 2001
From: fau <fau@faukah.com>
Date: Sun, 27 Jul 2025 17:40:36 +0200
Subject: [PATCH 1/2] btop: move to modules/home, clean up

Signed-off-by: fau <fau@faukah.com>
Change-Id: I6a6a696439b1369f17f636024507155d43005dec
---
 hosts/temperance/configuration.nix  |  1 -
 modules/home/programs/btop.hjem.nix | 40 +++++++++++++++++++++++
 modules/programs/tui/btop.mod.nix   | 49 -----------------------------
 3 files changed, 40 insertions(+), 50 deletions(-)
 create mode 100644 modules/home/programs/btop.hjem.nix
 delete mode 100644 modules/programs/tui/btop.mod.nix

diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix
index 6039b58..d668190 100644
--- a/hosts/temperance/configuration.nix
+++ b/hosts/temperance/configuration.nix
@@ -75,7 +75,6 @@
     };
     programs = {
       ssh.enable = true;
-      btop.enable = true;
       nh.enable = true;
       thunar.enable = true;
     };
diff --git a/modules/home/programs/btop.hjem.nix b/modules/home/programs/btop.hjem.nix
new file mode 100644
index 0000000..a956a09
--- /dev/null
+++ b/modules/home/programs/btop.hjem.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (builtins) attrValues;
+  inherit (lib.attrsets) mapAttrsToList;
+  inherit (lib.strings) concatStringsSep;
+
+  btop-settings = {
+    truecolor = "True";
+    vim_keys = "True";
+    rounded_corners = "True";
+    update_ms = "100";
+    graph_symbol = "braille";
+    cpu_single_graph = "True";
+    clock_format = "%X";
+    use_fstab = "True";
+    io_mode = "True";
+    net_sync = "True";
+    net_iface = "enp4s0";
+    log_level = "ERROR";
+    color_theme = "gruvbox_dark";
+  };
+
+  btop-no-desktop-entry = pkgs.btop.overrideAttrs (prev: {
+    postInstall = ''
+      ${prev.postInstall or ""}
+      rm -rf $out/share/applications/*.desktop
+    '';
+  });
+
+in
+{
+  packages = attrValues { inherit btop-no-desktop-entry; };
+  files.".config/btop/btop.conf".text =
+    concatStringsSep "\n" <| mapAttrsToList (name: value: "${name} = ${toString value}") btop-settings;
+
+}
diff --git a/modules/programs/tui/btop.mod.nix b/modules/programs/tui/btop.mod.nix
deleted file mode 100644
index 3bdbc4c..0000000
--- a/modules/programs/tui/btop.mod.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  inherit (lib.options) mkEnableOption;
-  inherit (lib.modules) mkIf;
-
-  cfg = config.modules.programs.btop;
-
-  btop-settings = pkgs.writeTextDir "btop/btop.conf" ''
-    truecolor = True
-    vim_keys = True
-    rounded_corners = True
-    update_ms = 100
-    graph_symbol = "braille"
-    cpu_single_graph = True
-    clock_format = "%X"
-    use_fstab = True
-    io_mode = True
-    net_sync = True
-    net_iface = "enp4s0"
-    log_level = "ERROR"
-  '';
-
-  btop-no-desktop-entry = pkgs.btop.overrideAttrs (prev: {
-    postInstall = ''
-      ${prev.postInstall or ""}
-      rm -rf $out/share/applications/*.desktop
-    '';
-  });
-
-  btop-wrapped = pkgs.symlinkJoin {
-    name = "btop-wrapped";
-    paths = [ btop-no-desktop-entry ];
-    nativeBuildInputs = [ pkgs.makeWrapper ];
-    postBuild = ''
-      wrapProgram $out/bin/btop --set XDG_CONFIG_HOME "${btop-settings}"
-    '';
-  };
-in
-{
-  options.modules.programs.btop.enable = mkEnableOption "btop";
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ btop-wrapped ];
-  };
-}

From 0c995da8afb6dbb13dacc6ab5effaabb2cbd12e0 Mon Sep 17 00:00:00 2001
From: fau <fau@faukah.com>
Date: Sun, 27 Jul 2025 17:54:00 +0200
Subject: [PATCH 2/2] niri: add keybind for ghostty spawning + window expelling

Signed-off-by: fau <fau@faukah.com>
Change-Id: I6a6a69649fa8323e8fcae94b4ffdc2123e4a75cd
---
 modules/wms/niri/config.kdl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/wms/niri/config.kdl b/modules/wms/niri/config.kdl
index 679818b..bec4a4a 100644
--- a/modules/wms/niri/config.kdl
+++ b/modules/wms/niri/config.kdl
@@ -127,6 +127,9 @@ binds {
     Mod+Return {
         spawn "ghostty"
     }
+    Mod+Shift+Return {
+        spawn "sh" "-c" "niri msg action spawn -- ghostty; sleep 0.3; niri msg action consume-or-expel-window-left"
+    }
     Mod+B {
         spawn "brave"
     }