From 8acc393fa0ae4a511e38572759b34eaf5bf6d1ea Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 19 Aug 2025 20:56:05 +0100
Subject: [PATCH] Add dmenu_sys and dmenu_timer

---
 flake.lock                    | 17 +++++++++++++++++
 flake.nix                     |  5 +++++
 modules/dmenu-sys.nix         | 26 ++++++++++++++++++++++++++
 modules/dmenu-timer.nix       | 26 ++++++++++++++++++++++++++
 modules/sxhkd/keybindings.nix | 12 ++++++------
 5 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 modules/dmenu-sys.nix
 create mode 100644 modules/dmenu-timer.nix

diff --git a/flake.lock b/flake.lock
index 99d9f438..e9d07a61 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,6 +23,22 @@
         "type": "github"
       }
     },
+    "bop-scripts": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1749678215,
+        "narHash": "sha256-UlLpsF/O/5WWB+fXjzJHeudxY+6pDlqq/HTqwiRf+Yk=",
+        "owner": "breadonpenguins",
+        "repo": "scripts",
+        "rev": "7c6be69294d2dce7c7f295f1f067c1d00eb57b66",
+        "type": "github"
+      },
+      "original": {
+        "owner": "breadonpenguins",
+        "repo": "scripts",
+        "type": "github"
+      }
+    },
     "conf-vim": {
       "flake": false,
       "locked": {
@@ -442,6 +458,7 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "bop-scripts": "bop-scripts",
         "conf-vim": "conf-vim",
         "disko": "disko",
         "edit-alternate-vim": "edit-alternate-vim",
diff --git a/flake.nix b/flake.nix
index 4657f031..0a81b14e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,11 @@
       url = "github:ryantm/agenix";
     };
 
+    bop-scripts = {
+      flake = false;
+      url = "github:breadonpenguins/scripts";
+    };
+
     conf-vim = {
       flake = false;
       url = "github:tjdevries/conf.vim";
diff --git a/modules/dmenu-sys.nix b/modules/dmenu-sys.nix
new file mode 100644
index 00000000..2ccab6e7
--- /dev/null
+++ b/modules/dmenu-sys.nix
@@ -0,0 +1,26 @@
+{ inputs, ... }:
+
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      home.packages = [
+        (pkgs.stdenv.mkDerivation rec {
+          pname = "dmenu_sys";
+          version = "unstable";
+
+          src = inputs.bop-scripts;
+
+          dontUnpack = true;
+
+          buildInputs = with pkgs; [ dmenu ];
+
+          installPhase = ''
+            mkdir -p $out/bin
+            cp $src/${pname} $out/bin
+            chmod +x $out/bin/${pname}
+          '';
+        })
+      ];
+    };
+}
diff --git a/modules/dmenu-timer.nix b/modules/dmenu-timer.nix
new file mode 100644
index 00000000..7a829d27
--- /dev/null
+++ b/modules/dmenu-timer.nix
@@ -0,0 +1,26 @@
+{ inputs, ... }:
+
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      home.packages = [
+        (pkgs.stdenv.mkDerivation rec {
+          pname = "dmenu_timer";
+          version = "unstable";
+
+          src = inputs.bop-scripts;
+
+          dontUnpack = true;
+
+          buildInputs = with pkgs; [ dmenu ];
+
+          installPhase = ''
+            mkdir -p $out/bin
+            cp $src/${pname} $out/bin
+            chmod +x $out/bin/${pname}
+          '';
+        })
+      ];
+    };
+}
diff --git a/modules/sxhkd/keybindings.nix b/modules/sxhkd/keybindings.nix
index 62dfca4b..67338e12 100644
--- a/modules/sxhkd/keybindings.nix
+++ b/modules/sxhkd/keybindings.nix
@@ -5,17 +5,17 @@
     { pkgs, ... }:
     {
       services.sxhkd.keybindings = {
-        "{_, shift +, super +}XF86MonBrightness{Down,Up}" =
-          "${lib.getExe pkgs.brightnessctl} set {5%-,10%-,10%,+5%,+10%,100%} --quiet";
-        "super + BackSpace" = "/home/opdavies/sysact";
+        "@F10" = "/home/opdavies/.local/bin/unmounter";
+        "@F3" = "displayselect";
+        "@F9" = "/home/opdavies/.local/bin/mounter";
+        "super + BackSpace" = "dmenu_sys";
         "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" = "${lib.getExe pkgs.passmenu-otp} -i";
         "super + x; {1, 2, 3, 4}" = "st {notes, newsboat, nmtui, bluetuith}";
-        "@F3" = "displayselect";
-        "@F9" = "/home/opdavies/.local/bin/mounter";
-        "@F10" = "/home/opdavies/.local/bin/unmounter";
+        "{_, shift +, super +}XF86MonBrightness{Down,Up}" =
+          "${lib.getExe pkgs.brightnessctl} set {5%-,10%-,10%,+5%,+10%,100%} --quiet";
       };
     };
 }