From a22d49d481871f67bef5af9fc0729c49b983fcd5 Mon Sep 17 00:00:00 2001
From: Madeleine <maddie@spyhoodle.me>
Date: Thu, 20 Jul 2023 12:02:37 +0100
Subject: [PATCH] dmenu, dwm, new alias and manpages fix

---
 flake.lock                    | 18 +++++++++---------
 maddie/common/shell.nix       |  1 +
 maddie/nixos/dmenu/dmenu-code |  3 +++
 maddie/nixos/dmenu/dmenu-man  |  2 ++
 overlays.nix                  |  8 ++++----
 systems/mdesktop/man.nix      |  8 ++++++++
 6 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100755 maddie/nixos/dmenu/dmenu-code
 create mode 100755 maddie/nixos/dmenu/dmenu-man
 create mode 100644 systems/mdesktop/man.nix

diff --git a/flake.lock b/flake.lock
index e9e7abb..bf6312c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689281837,
-        "narHash": "sha256-msgwgot2/hxXzlpYltIZ7boAqBkN8XejNOhBJ07q3FY=",
+        "lastModified": 1689825754,
+        "narHash": "sha256-u3W3WGO3BA63nb+CeNLBajbJ/sl8tDXBHKxxeTOCxfo=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "c806a73609e77f0c446fdad5d3ea6ca3b7ae6e5f",
+        "rev": "531c3de7eccf95155828e0cd9f18c25e7f937777",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689362769,
-        "narHash": "sha256-5V7Z7T9019pGsFnYH6va5h6Wveq8FKmXa/xLfj0DhNI=",
+        "lastModified": 1689802112,
+        "narHash": "sha256-Se7oHV/L0dHTQ4xp8MvYafaVdkSzF04Hx5NeloUYHtM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c1cdce3d89741d402d8fd2c93e3d2643ff85b053",
+        "rev": "0cb3ac57fca6b52c42e4c0f560185540ae1dfb6c",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1689352711,
-        "narHash": "sha256-xWYFt8vWnstDIVsZ26y9mf6h3714lVmXd6l+hTQz6tw=",
+        "lastModified": 1689752456,
+        "narHash": "sha256-VOChdECcEI8ixz8QY+YC4JaNEFwQd1V8bA0G4B28Ki0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2047c642ce0f75307e8a0f2ec94715218c481184",
+        "rev": "7f256d7da238cb627ef189d56ed590739f42f13b",
         "type": "github"
       },
       "original": {
diff --git a/maddie/common/shell.nix b/maddie/common/shell.nix
index 5543933..d132eaa 100644
--- a/maddie/common/shell.nix
+++ b/maddie/common/shell.nix
@@ -25,6 +25,7 @@
       # System shortcuts
       heif-convert-dir = "for file in *.heic; do heif-convert -q 100 $file \${file/%.heic/.jpg}; done";
       unfuck-wifi = "doas systemctl restart wpa_supplicant.service";
+      search = "f=$(fzf) && cd \"$f\" 2>/dev/null || xdg-open \"$f\" >/dev/null 2>&1";
       cdt = "cd $(mktemp -d)";
       sx = "startx ~/.config/x11/xinitrc";
       sdn = "doas shutdown -h now";
diff --git a/maddie/nixos/dmenu/dmenu-code b/maddie/nixos/dmenu/dmenu-code
new file mode 100755
index 0000000..7636af2
--- /dev/null
+++ b/maddie/nixos/dmenu/dmenu-code
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+st -e 'zsh' -c 'cd ~/Documents/Code/"$(exa -lh --icons ~/Documents/Code | tail -n +2 | dmenu -l 30 | sed "s|.* ||")"; zsh'
diff --git a/maddie/nixos/dmenu/dmenu-man b/maddie/nixos/dmenu/dmenu-man
new file mode 100755
index 0000000..33b3060
--- /dev/null
+++ b/maddie/nixos/dmenu/dmenu-man
@@ -0,0 +1,2 @@
+#!/bin/sh
+man -t $(man -k . | dmenu -l 30 | awk '{print $1}') | ps2pdf - - | zathura -
diff --git a/overlays.nix b/overlays.nix
index 3e580c9..136ecc0 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -6,8 +6,8 @@
         domain = "git.spyhoodle.me";
         owner = "maddie";
         repo = "dwm";
-        rev = "dca69fedae1e29d946ece4c8325907732015f83f";
-        sha256 = "sha256-OezFDY2Gxu+qqT3hdGb+g+YyqV+8R8gSN3ux5+QvL4o=";
+        rev = "a06076bfb9324af6c4122d9cc5b0904778013350";
+        sha256 = "sha256-KGqbff/i9fG0B/gMrdnwevRElL6r8lbYCloWp/NPx+0=";
       };
     });
     st = prev.st.overrideAttrs (oldAttrs: {
@@ -25,8 +25,8 @@
         domain = "git.spyhoodle.me";
         owner = "maddie";
         repo = "dmenu";
-        rev = "82156146b3f3ab720ac752a953b952d638e1f935";
-        sha256 = "sha256-L6aqP7wmegl6Jv4ytMw/j1FwH5lXv8QjWOY5mHotkxI=";
+        rev = "1b12798a3762807697227e9e40be29408df59ee9";
+        sha256 = "sha256-wnVNqNCUpJTqHXfst9DiBaq/gzVwhlq07VM9CixczRc=";
       };
     });
     slstatus = prev.slstatus.overrideAttrs (oldAttrs: {
diff --git a/systems/mdesktop/man.nix b/systems/mdesktop/man.nix
new file mode 100644
index 0000000..7e1051b
--- /dev/null
+++ b/systems/mdesktop/man.nix
@@ -0,0 +1,8 @@
+{ config, ... }:
+
+{
+  documentation.man = {
+    enable = true;
+    generateCaches = true;
+  };
+}