From 91166300c01690fa17a7aa1b7be1c9fa627debb9 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Wed, 25 Oct 2023 07:49:13 +0100
Subject: [PATCH] Actually import nnn expression

Update hyprland binds to spawn nnn (and ncspot, using tmux as well)

Add more nnn bookmarks
---
 flake.lock               | 13 +++++++++++++
 flake.nix                |  1 +
 home/hyprland/config.nix |  7 ++-----
 home/nnn.nix             |  3 +++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 60df6eb5..225743c6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -554,6 +554,18 @@
         "type": "github"
       }
     },
+    "nnn": {
+      "flake": false,
+      "locked": {
+        "narHash": "sha256-84UgZESwU/CsnMWsg7yYY6uNx5JClu89v/cz0NiYJRs=",
+        "type": "file",
+        "url": "https://github.com/jarun/nnn.git"
+      },
+      "original": {
+        "type": "file",
+        "url": "https://github.com/jarun/nnn.git"
+      }
+    },
     "nosys": {
       "locked": {
         "lastModified": 1668010795,
@@ -683,6 +695,7 @@
         "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
+        "nnn": "nnn",
         "stylix": "stylix",
         "tokyonight-folke": "tokyonight-folke",
         "watershot": "watershot"
diff --git a/flake.nix b/flake.nix
index ef83e615..f4db2b5c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,6 +60,7 @@
           ./home/firefox.nix
           ./home/kdeconnect.nix
           ./home/media.nix
+          ./home/nnn.nix
           ./home/pass.nix
           ./home/zathura.nix
         ];
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 308d5bfd..a34aca47 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -105,11 +105,8 @@ in ''
   bind = SUPER SHIFT, Return, exec, [float] alacritty
 
   bind = SUPER ALT, W, exec, [workspace 4] firefox
-  bind = SUPER ALT, F, exec, [workspace 5] thunar
-  bind = SUPER ALT, S, exec, [workspace 6] spot
-  bind = SUPER ALT, C, exec, [workspace 7] fractal
-  bind = SUPER ALT, R, exec, [workspace 8] remmina
-  bind = SUPER ALT, G, exec, [workspace 9] steam
+  bind = SUPER ALT, F, exec, [workspace 5] alacritty -e tmux new -A -s Files nnn -d
+  bind = SUPER ALT, S, exec, [workspace 6] alacritty -e tmux new -A -s Spotify ncspot
 
   # Misc useful binds
   bind=,Print,exec,watershot directory ${config.xdg.userDirs.pictures}
diff --git a/home/nnn.nix b/home/nnn.nix
index a7a53184..3eb5c96b 100644
--- a/home/nnn.nix
+++ b/home/nnn.nix
@@ -8,6 +8,9 @@
       D = "~/Downloads";
       p = "~/Pictures";
       v = "~/Videos";
+      m = "~/Music";
+      o = "~/Org";
+      P = "~/Projects";
     };
     plugins = {
       src = "${nnn}/plugins";