From 487e116baca31122e4d7ebe90ad8f3b4f13d5222 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 27 Jul 2025 22:13:55 +0100
Subject: [PATCH] Move sxhkd configuration

---
 home-manager/opdavies/t480.nix                |  1 -
 modules/home-manager/default.nix              |  1 -
 modules2/sxhkd/enable.nix                     |  3 ++
 .../sxhkd/keybindings.nix                     | 37 +++++--------------
 modules2/xsession.nix                         |  3 ++
 5 files changed, 15 insertions(+), 30 deletions(-)
 create mode 100644 modules2/sxhkd/enable.nix
 rename modules/home-manager/sxhkd.nix => modules2/sxhkd/keybindings.nix (50%)
 create mode 100644 modules2/xsession.nix

diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index f6fa1aa5..8ba49972 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -10,7 +10,6 @@
     cli = {
       bookmarkthis.enable = true;
       node.enable = true;
-      sxhkd.enable = true;
       starship.enable = true;
       zsh.enable = true;
     };
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index e2a2981a..a1f719a2 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -11,7 +11,6 @@
     ./redshift.nix
     ./screenkey.nix
     ./starship.nix
-    ./sxhkd.nix
     ./zsh
   ];
 }
diff --git a/modules2/sxhkd/enable.nix b/modules2/sxhkd/enable.nix
new file mode 100644
index 00000000..1712708b
--- /dev/null
+++ b/modules2/sxhkd/enable.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.gui.services.sxhkd.enable = true;
+}
diff --git a/modules/home-manager/sxhkd.nix b/modules2/sxhkd/keybindings.nix
similarity index 50%
rename from modules/home-manager/sxhkd.nix
rename to modules2/sxhkd/keybindings.nix
index 5a242e3e..811c998c 100644
--- a/modules/home-manager/sxhkd.nix
+++ b/modules2/sxhkd/keybindings.nix
@@ -1,40 +1,21 @@
+{ lib, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.features.cli.${service};
-  service = "sxhkd";
-
-  inherit (lib) getExe mkIf mkEnableOption;
-in
-{
-  options.features.cli.${service} = {
-    enable = mkEnableOption "Enable ${service}";
-  };
-
-  config = mkIf cfg.enable {
-    xsession.enable = true;
-
-    services.${service} = {
-      enable = true;
-
-      keybindings = {
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      services.sxhkd.keybindings = {
         "{_, shift +, super +}XF86MonBrightness{Down,Up}" =
-          "${getExe pkgs.brightnessctl} set {5%-,10%-,10%,+5%,+10%,100%} --quiet";
+          "${lib.getExe pkgs.brightnessctl} set {5%-,10%-,10%,+5%,+10%,100%} --quiet";
         "super + BackSpace" = "/home/opdavies/sysact";
         "super + shift + b" = "/etc/profiles/per-user/opdavies/bin/bookmarkthis";
         "super + shift + i" =
           "${pkgs.xdotool}/bin/xdotool type $(cat ~/.local/share/snippets.txt | grep -v '^#' | grep -v '^$' | sort | dmenu -i -l 50 | cut -d' ' -f1)";
-        "super + shift + p" = "${getExe pkgs.passmenu-otp} -i";
+        "super + shift + p" = "${lib.getExe pkgs.passmenu-otp} -i";
         "super + x; {1, 2, 3, 4}" = "st {notes, newsboat, nmtui, bluetuith}";
-        "@F3" = "${getExe pkgs.displayselect}";
+        "@F3" = "${lib.getExe pkgs.displayselect}";
         "@F9" = "/home/opdavies/.local/bin/mounter";
         "@F10" = "/home/opdavies/.local/bin/unmounter";
       };
     };
-  };
 }
diff --git a/modules2/xsession.nix b/modules2/xsession.nix
new file mode 100644
index 00000000..5fdf17bf
--- /dev/null
+++ b/modules2/xsession.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.gui.xsession.enable = true;
+}