From 8f5acb2fdb151ae3652db1955d7c05d50adb26ca Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Thu, 29 May 2025 17:00:38 +0100
Subject: [PATCH] Move keybinds from dwm to sxhkd

---
 modules/home-manager/cli/sxhkd.nix | 10 ++++++++--
 overlays/mods/dwm/default.nix      |  6 ------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/home-manager/cli/sxhkd.nix b/modules/home-manager/cli/sxhkd.nix
index de3fd8e6..b5670e74 100644
--- a/modules/home-manager/cli/sxhkd.nix
+++ b/modules/home-manager/cli/sxhkd.nix
@@ -16,8 +16,14 @@ in
       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}";
+        "{_, shift +, super +}XF86MonBrightness{Down,Up}" = "${getExe pkgs.brightnessctl} set {5%-,10%-,10%,+5%,+10%,100%} --quiet";
+        "super + x; {1, 2, 3, 4}" = "st {notes, newsboat, nmtui, bluetuith}";
+        "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";
+        "@F3" = "${getExe pkgs.displayselect}";
+        "@F9" = "/home/opdavies/.local/bin/mounter";
+        "@F10" = "/home/opdavies/.local/bin/unmounter";
       };
     };
   };
diff --git a/overlays/mods/dwm/default.nix b/overlays/mods/dwm/default.nix
index e82305d8..9310897b 100644
--- a/overlays/mods/dwm/default.nix
+++ b/overlays/mods/dwm/default.nix
@@ -89,17 +89,11 @@ prev.dwm.override {
       TAGKEYS(XK_7, 6)
       TAGKEYS(XK_8, 7)
       TAGKEYS(XK_9, 8)
-      { MODKEY|ShiftMask, XK_b, spawn, {.v = (const char*[]){ "/etc/profiles/per-user/opdavies/bin/bookmarkthis", NULL }}},
       { MODKEY|ShiftMask, XK_f, spawn, SHCMD("${prev.xfce.thunar}/bin/thunar") },
-      { MODKEY|ShiftMask, XK_i, spawn, SHCMD("${prev.xdotool}/bin/xdotool type $(cat ~/.local/share/snippets.txt | grep -v '^#' | grep -v '^$' | sort | dmenu -i -l 50 | cut -d' ' -f1)") },
-      { MODKEY|ShiftMask, XK_p, spawn, {.v = (const char*[]){ "${lib.getExe prev.passmenu-otp}", "-i", NULL} } },
       { MODKEY|ShiftMask, XK_q, quit, {0} },
       { MODKEY|ShiftMask, XK_r, quit, {1} },
       { MODKEY|ShiftMask, XK_s, spawn, SHCMD("${prev.flameshot}/bin/flameshot gui") },
       { MODKEY, XK_w, spawn, SHCMD(BROWSER) },
-      { MODKEY, XK_F3, spawn, {.v = (const char*[]){ "${lib.getExe prev.displayselect}", NULL} } },
-      { MODKEY, XK_F9, spawn, {.v = (const char*[]){ "/home/opdavies/.local/bin/mounter", NULL } } },
-      { MODKEY, XK_F10, spawn, {.v = (const char*[]){ "/home/opdavies/.local/bin/unmounter", NULL } } },
     };
 
     static const Button buttons[] = {