From 098e9f48164ee58ce0823fa868048749a5d6b7aa Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sun, 25 May 2025 15:11:33 +0100
Subject: [PATCH] Refactor sxhkd to its own module

---
 home/opdavies/t480.nix               | 10 +---------
 modules/home-manager/cli/default.nix |  1 +
 modules/home-manager/cli/sxhkd.nix   | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 modules/home-manager/cli/sxhkd.nix

diff --git a/home/opdavies/t480.nix b/home/opdavies/t480.nix
index 1ecfe3c5..74ce9123 100644
--- a/home/opdavies/t480.nix
+++ b/home/opdavies/t480.nix
@@ -24,6 +24,7 @@
     };
 
     ranger.enable = true;
+    sxhkd.enable = true;
     starship.enable = true;
     tmux.enable = true;
 
@@ -109,13 +110,4 @@
     098EE055DAD2B9CB68154C6759DD38292D2273B6
     1E21B58D69FFEFAD077F152A50FEA938A3413F50
   '';
-
-  services.sxhkd = {
-    enable = true;
-
-    keybindings = {
-      "{_,shift + ,super + }XF86MonBrightness{Down,Up}" = "${lib.getExe pkgs.brightnessctl} set {5%-,10%-,10%,+5%,+10%,100%}";
-      "super + x; {1,2,3}" = "st {newsboat,nmtui,bluetuith";
-    };
-  };
 }
diff --git a/modules/home-manager/cli/default.nix b/modules/home-manager/cli/default.nix
index 01fc0f5f..710b0faa 100644
--- a/modules/home-manager/cli/default.nix
+++ b/modules/home-manager/cli/default.nix
@@ -11,6 +11,7 @@
     ./ranger.nix
     ./scripts
     ./starship.nix
+    ./sxhkd.nix
     ./todos.nix
     ./tmux.nix
     ./tmux-sessionizer.nix
diff --git a/modules/home-manager/cli/sxhkd.nix b/modules/home-manager/cli/sxhkd.nix
new file mode 100644
index 00000000..de3fd8e6
--- /dev/null
+++ b/modules/home-manager/cli/sxhkd.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.cli.${service};
+  service = "sxhkd";
+
+  inherit (lib) getExe mkIf mkEnableOption;
+in
+{
+  options.cli.${service} = {
+    enable = mkEnableOption "Enable ${service}";
+  };
+
+  config = mkIf cfg.enable {
+    services.${service} = {
+      enable = true;
+
+      keybindings = {
+        "{_,shift + ,super + }XF86MonBrightness{Down,Up}" = "${getExe pkgs.brightnessctl} set {5%-,10%-,10%,+5%,+10%,100%} --quiet";
+        "super + x; {1,2,3}" = "st {newsboat,nmtui,bluetuith}";
+      };
+    };
+  };
+}