From ef0a64ffb45e18a19b0a16557d2ef03b45be482b Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Tue, 11 Jul 2023 21:32:26 -0700
Subject: [PATCH] I wrote a derivation! I'm very proud of myself.

---
 home/dot_config/sway/config.tmpl         |  8 ++++----
 home/dot_config/tmuxp/files.yml          |  2 +-
 provision/nixos/modules/desktop/sway.nix |  1 +
 provision/nixos/overlays/default.nix     |  6 ++++++
 provision/nixos/pkgs/sway-scratchpad.nix | 22 ++++++++++++++++++++++
 5 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 provision/nixos/overlays/default.nix
 create mode 100644 provision/nixos/pkgs/sway-scratchpad.nix

diff --git a/home/dot_config/sway/config.tmpl b/home/dot_config/sway/config.tmpl
index 821fdc2e..9645c962 100644
--- a/home/dot_config/sway/config.tmpl
+++ b/home/dot_config/sway/config.tmpl
@@ -206,18 +206,18 @@ mode open {
 # s[c]ratchpads commands
 bindsym $mod+c mode scratch
 mode scratch {
-    bindsym Return exec ~/.cargo/bin/sway-scratchpad \
+    bindsym Return exec sway-scratchpad \
                             --command "alacritty" \
                             --mark term \
                             --width 40 \
                             --height 71, $e
-    bindsym b exec ~/.cargo/bin/sway-scratchpad \
+    bindsym b exec sway-scratchpad \
                             --command "blueman-manager" \
                             --mark blue \
                             --width 40 \
                             --height 71, $e
-    bindsym f exec ~/.cargo/bin/sway-scratchpad \
-                            --command "alacritty -e /home/{{ .user }}/.local/bin/tmuxp load /home/{{ .user }}/.config/tmuxp/files.yml" \
+    bindsym f exec sway-scratchpad \
+                            --command "alacritty -e tmuxp load /home/{{ .user }}/.config/tmuxp/files.yml" \
                             --mark files \
                             --width 71 \
                             --height 71, $e
diff --git a/home/dot_config/tmuxp/files.yml b/home/dot_config/tmuxp/files.yml
index 0a5d16fd..b857392a 100644
--- a/home/dot_config/tmuxp/files.yml
+++ b/home/dot_config/tmuxp/files.yml
@@ -7,4 +7,4 @@ windows:
       - cd ~/
     panes:
       - shell_command:
-          - ~/.local/bin/nnn  
+          - nnn  
diff --git a/provision/nixos/modules/desktop/sway.nix b/provision/nixos/modules/desktop/sway.nix
index 590a87a9..6623a7b2 100644
--- a/provision/nixos/modules/desktop/sway.nix
+++ b/provision/nixos/modules/desktop/sway.nix
@@ -32,6 +32,7 @@ in {
       sway
       swayidle
       swaybg
+      sway-scratchpad
       grim # screenshot functionality
       wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout
       mako # notification system developed by swaywm maintainer
diff --git a/provision/nixos/overlays/default.nix b/provision/nixos/overlays/default.nix
new file mode 100644
index 00000000..05adf473
--- /dev/null
+++ b/provision/nixos/overlays/default.nix
@@ -0,0 +1,6 @@
+/* This contains various packages we want to overlay. Note that the
+ * other ".nix" files in this directory are automatically loaded.
+ */
+final: prev: {
+  sway-scratchpad = final.callPackage ../pkgs/sway-scratchpad.nix {};
+}
diff --git a/provision/nixos/pkgs/sway-scratchpad.nix b/provision/nixos/pkgs/sway-scratchpad.nix
new file mode 100644
index 00000000..ebaf00f8
--- /dev/null
+++ b/provision/nixos/pkgs/sway-scratchpad.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "sway-scratchpad";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "matejc";
+    repo = "sway-scratchpad";
+    rev = "2f4d39927a154108f193771a90ae7f298e7ae65f";
+    hash = "sha256-TgiwU95BbKFvISDe8+wn8VQ+8vQNuGsb+7p9kP//5lw=";
+  };
+
+  cargoHash = "sha256-VLWjpb9OmYkBykP51YURWnvgzI1DW0731DbDcJh/7h8=";
+
+  meta = with lib; {
+    description = "Convert a command to a scratchpad, and toggle visibility with sway/i3.";
+    homepage = "https://github.com/matejc/sway-scratchpad";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.starr-dusT ];
+  };
+}