From 402755b570de24277b227707b5e369a71790b8c1 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 07:39:26 +0200
Subject: [PATCH 01/32] Updates work configuration

---
 home/modules/aerospace/work.nix | 65 +++++++++++++++++++++++++++++++++
 hosts/dnsc-work/default.nix     |  4 +-
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 home/modules/aerospace/work.nix

diff --git a/home/modules/aerospace/work.nix b/home/modules/aerospace/work.nix
new file mode 100644
index 0000000..561d119
--- /dev/null
+++ b/home/modules/aerospace/work.nix
@@ -0,0 +1,65 @@
+{
+  services.aerospace = {
+    enable = true;
+    settings = {
+      accordion-padding = 25;
+      gaps = {
+        inner.horizontal = 6;
+        inner.vertical = 6;
+        outer.left = 6;
+        outer.bottom = 6;
+        outer.top = 6;
+        outer.right = 6;
+      };
+      workspace-to-monitor-force-assignment = {
+        "1" = "main";
+        "2" = "main";
+        "3" = "main";
+        "4" = "main";
+        "5" = "secondary";
+        "6" = "secondary";
+      };
+      mode.main.binding = {
+        alt-h = "focus left";
+        alt-j = "focus down";
+        alt-k = "focus up";
+        alt-l = "focus right";
+        alt-shift-h = "move left";
+        alt-shift-j = "move down";
+        alt-shift-k = "move up";
+        alt-shift-l = "move right";
+        alt-comma = "layout tiles horizontal vertical";
+        alt-period = "layout accordion horizontal vertical";
+        alt-f = "fullscreen";
+        alt-1 = "workspace 1";
+        alt-2 = "workspace 2";
+        alt-3 = "workspace 3";
+        alt-4 = "workspace 4";
+        alt-5 = "workspace 5";
+        alt-6 = "workspace 6";
+        alt-shift-1 = [ "move-node-to-workspace 1" "workspace 1" ];
+        alt-shift-2 = [ "move-node-to-workspace 2" "workspace 2" ];
+        alt-shift-3 = [ "move-node-to-workspace 3" "workspace 3" ];
+        alt-shift-4 = [ "move-node-to-workspace 4" "workspace 4" ];
+        alt-shift-5 = [ "move-node-to-workspace 5" "workspace 5" ];
+        alt-shift-6 = [ "move-node-to-workspace 6" "workspace 6" ];
+        alt-tab = "workspace-back-and-forth";
+        alt-shift-tab = "move-workspace-to-monitor --wrap-around next";
+      };
+      on-window-detected = [
+        {
+          "if".app-id = "company.thebrowser.Browser";
+          run = "move-node-to-workspace 1";
+        }
+        {
+          "if".app-id = "com.github.wez.wezterm";
+          run = "move-node-to-workspace 2";
+        }
+        {
+          "if".app-id = "com.microsoft.teams2";
+          run = "move-node-to-workspace 5";
+        }
+      ];
+    };
+  };
+}
diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix
index 06b5f7c..f85750c 100644
--- a/hosts/dnsc-work/default.nix
+++ b/hosts/dnsc-work/default.nix
@@ -8,7 +8,7 @@
 }: {
   imports = [
     inputs.home-manager.darwinModules.home-manager
-    ../../home/modules/aerospace
+    ../../home/modules/aerospace/work.nix
   ];
 
   # Setting the user
@@ -102,6 +102,7 @@
       "1password"
       "android-studio"
       "zulu@17"
+      "postman"
     ];
   };
 
@@ -130,6 +131,7 @@
         persistent-apps = [
           "/Applications/Arc.app"
           "/Applications/WezTerm.app"
+          "/Applications/Microsoft Teams.app"
           "/System/Applications/System Settings.app/"
         ];
         persistent-others = [

From b65e2b21bda7c9663fa8203aa9fdc6751e756a54 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 07:58:15 +0200
Subject: [PATCH 02/32] Updates work config again

- Aerospace and Homebrew config
---
 home/modules/aerospace/work.nix | 8 ++++++++
 hosts/dnsc-work/default.nix     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/home/modules/aerospace/work.nix b/home/modules/aerospace/work.nix
index 561d119..5ee67d3 100644
--- a/home/modules/aerospace/work.nix
+++ b/home/modules/aerospace/work.nix
@@ -55,6 +55,14 @@
           "if".app-id = "com.github.wez.wezterm";
           run = "move-node-to-workspace 2";
         }
+        {
+          "if".app-id = "com.postmanlabs.mac";
+          run = "move-node-to-workspace 3";
+        }
+        {
+          "if".app-id = "com.apple.dt.Xcode";
+          run = "move-node-to-workspace 3";
+        }
         {
           "if".app-id = "com.microsoft.teams2";
           run = "move-node-to-workspace 5";
diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix
index f85750c..f88950d 100644
--- a/hosts/dnsc-work/default.nix
+++ b/hosts/dnsc-work/default.nix
@@ -51,7 +51,7 @@
     enable = true;
 
     onActivation = {
-      autoUpdate = false;
+      autoUpdate = true;
       cleanup = "zap";
     };
 

From 97597214b430717a16115b5aa3611f84555b41e9 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 08:25:50 +0200
Subject: [PATCH 03/32] Installs docker through Homebrew

---
 hosts/dnsc-work/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix
index f88950d..22476e6 100644
--- a/hosts/dnsc-work/default.nix
+++ b/hosts/dnsc-work/default.nix
@@ -103,6 +103,7 @@
       "android-studio"
       "zulu@17"
       "postman"
+      "docker"
     ];
   };
 

From b8416321eb4c5006aeb9a96cb0bdcbc236a46209 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 08:32:28 +0200
Subject: [PATCH 04/32] Wraps fzf command

---
 home/modules/fish/work.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index 9637641..5be631b 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -93,6 +93,18 @@
       '';
       localip = "ifconfig | grep \"inet \" | grep -v 127.0.0.1 | awk '{print $2}' | head -n 1";
       publicip = "curl -4 ifconfig.me";
+      fzf = ''
+        function fzf --wraps="fzf"
+          set -Ux FZF_DEFAULT_OPTS "
+	          --color=fg:#908caa,bg:#191724,hl:#ebbcba
+	          --color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba
+	          --color=border:#403d52,header:#31748f,gutter:#191724
+	          --color=spinner:#f6c177,info:#9ccfd8
+	          --color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa"
+
+          command fzf
+        end
+      '';
     };
 
     interactiveShellInit = ''

From 1b8e401adac825c512ccdd1310f273e0a9e817f9 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 08:57:35 +0200
Subject: [PATCH 05/32] Removes obsolete paths from shell commands

---
 home/modules/fish/work.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index 5be631b..58a3726 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -6,8 +6,6 @@
         set folder (begin
             fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
             fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
-            fd . ~/dev/ride/apps/backend/backend-services/tariff-service -t d -d 1;
-            fd . ~/dev/ride/apps/backend/backend-services/wallet-service -t d -d 1;
             fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
             fd . ~/dev/ride/apps/native -t d -d 1;
             fd . ~/dev/ride/packages -t d -d 1;
@@ -23,8 +21,6 @@
         set folder (begin
             fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
             fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
-            fd . ~/dev/ride/apps/backend/backend-services/tariff-service -t d -d 1;
-            fd . ~/dev/ride/apps/backend/backend-services/wallet-service -t d -d 1;
             fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
             fd . ~/dev/ride/apps/native -t d -d 1;
             echo "$HOME/dev/ride/apps/frontend";

From 158700874c0073b8db86f9872617839338db80a6 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 15:26:02 +0200
Subject: [PATCH 06/32] Adds config for smart split navigation

---
 home/modules/aerospace/default.nix            |  6 ----
 home/modules/aerospace/work.nix               |  6 ----
 home/modules/fish/work.nix                    |  3 +-
 .../nvim/config/lua/plugins/smart-splits.lua  | 19 ++++++++++++
 home/modules/wezterm/config/helpers.lua       | 31 +++++++++++++++++--
 home/modules/wezterm/config/keybindings.lua   | 12 ++++---
 6 files changed, 57 insertions(+), 20 deletions(-)
 create mode 100644 home/modules/nvim/config/lua/plugins/smart-splits.lua

diff --git a/home/modules/aerospace/default.nix b/home/modules/aerospace/default.nix
index 8101dd3..bce3c5d 100644
--- a/home/modules/aerospace/default.nix
+++ b/home/modules/aerospace/default.nix
@@ -20,13 +20,7 @@
         "6" = "secondary";
       };
       mode.main.binding = {
-        alt-h = "focus left";
-        alt-j = "focus down";
-        alt-k = "focus up";
-        alt-l = "focus right";
         alt-shift-h = "move left";
-        alt-shift-j = "move down";
-        alt-shift-k = "move up";
         alt-shift-l = "move right";
         alt-comma = "layout tiles horizontal vertical";
         alt-period = "layout accordion horizontal vertical";
diff --git a/home/modules/aerospace/work.nix b/home/modules/aerospace/work.nix
index 5ee67d3..bb243fc 100644
--- a/home/modules/aerospace/work.nix
+++ b/home/modules/aerospace/work.nix
@@ -20,13 +20,7 @@
         "6" = "secondary";
       };
       mode.main.binding = {
-        alt-h = "focus left";
-        alt-j = "focus down";
-        alt-k = "focus up";
-        alt-l = "focus right";
         alt-shift-h = "move left";
-        alt-shift-j = "move down";
-        alt-shift-k = "move up";
         alt-shift-l = "move right";
         alt-comma = "layout tiles horizontal vertical";
         alt-period = "layout accordion horizontal vertical";
diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index 58a3726..218888d 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -8,7 +8,8 @@
             fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
             fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
             fd . ~/dev/ride/apps/native -t d -d 1;
-            fd . ~/dev/ride/packages -t d -d 1;
+            # Enable as soon as we have packages
+            # fd . ~/dev/ride/packages -t d -d 1;
             echo "$HOME/dev/ride/apps/frontend";
             echo "$HOME/dev/ride/apps/lib";
             echo "$HOME/dev/ride";
diff --git a/home/modules/nvim/config/lua/plugins/smart-splits.lua b/home/modules/nvim/config/lua/plugins/smart-splits.lua
new file mode 100644
index 0000000..f968561
--- /dev/null
+++ b/home/modules/nvim/config/lua/plugins/smart-splits.lua
@@ -0,0 +1,19 @@
+return {
+  "mrjones2014/smart-splits.nvim",
+  keys = {
+    { "<C-h>", "require('smart-splits').move_cursor_left", desc = "Move to left split", mode = "n" },
+    { "<C-j>", "require('smart-splits').move_cursor_down", desc = "Move to lower split", mode = "n" },
+    { "<C-k>", "require('smart-splits').move_cursor_up", desc = "Move to upper split", mode = "n" },
+    { "<C-l>", "require('smart-splits').move_cursor_right", desc = "Move to right split", mode = "n" },
+
+    { "<A-h>", "require('smart-splits').resize_left", desc = "Resize to left", mode = "n" },
+    { "<A-j>", "require('smart-splits').resize_down", desc = "Resize lower", mode = "n" },
+    { "<A-k>", "require('smart-splits').resize_up", desc = "Resize upper", mode = "n" },
+    { "<A-l>", "require('smart-splits').resize_right", desc = "Resize to right", mode = "n" },
+
+    { "<leader>mh", "require('smart-splits').swap_buf_left", desc = "Swap to left" },
+    { "<leader>mj", "require('smart-splits').swap_buf_down", desc = "Swap to lower" },
+    { "<leader>mk", "require('smart-splits').swap_buf_up", desc = "Swap to upper" },
+    { "<leader>ml", "require('smart-splits').swap_buf_right", desc = "Swap to right" },
+  },
+}
diff --git a/home/modules/wezterm/config/helpers.lua b/home/modules/wezterm/config/helpers.lua
index 265cc4d..b0ffb22 100644
--- a/home/modules/wezterm/config/helpers.lua
+++ b/home/modules/wezterm/config/helpers.lua
@@ -44,11 +44,36 @@ function M.get_padding(padding, remove_padding_bottom)
 	}
 end
 
-function M.move_pane(key, direction)
+function M.is_vim(pane)
+	-- this is set by the plugin, and unset on ExitPre in Neovim
+	return pane:get_user_vars().IS_NVIM == "true"
+end
+
+local direction_keys = {
+	h = "Left",
+	j = "Down",
+	k = "Up",
+	l = "Right",
+}
+
+function M.split_nav(resize_or_move, key)
 	return {
 		key = key,
-		mods = "LEADER",
-		action = wezterm.action.ActivatePaneDirection(direction),
+		mods = resize_or_move == "resize" and "META" or "CTRL",
+		action = wezterm.action_callback(function(win, pane)
+			if M.is_vim(pane) then
+				-- pass the keys through to vim/nvim
+				win:perform_action({
+					SendKey = { key = key, mods = resize_or_move == "resize" and "META" or "CTRL" },
+				}, pane)
+			else
+				if resize_or_move == "resize" then
+					win:perform_action({ AdjustPaneSize = { direction_keys[key], 3 } }, pane)
+				else
+					win:perform_action({ ActivatePaneDirection = direction_keys[key] }, pane)
+				end
+			end
+		end),
 	}
 end
 
diff --git a/home/modules/wezterm/config/keybindings.lua b/home/modules/wezterm/config/keybindings.lua
index d659f16..014f80c 100644
--- a/home/modules/wezterm/config/keybindings.lua
+++ b/home/modules/wezterm/config/keybindings.lua
@@ -42,10 +42,14 @@ function M.apply_to_config(config)
 			}),
 		},
 		-- Navigation
-		helpers.move_pane("j", "Down"),
-		helpers.move_pane("k", "Up"),
-		helpers.move_pane("h", "Left"),
-		helpers.move_pane("l", "Right"),
+		helpers.split_nav("move", "h"),
+		helpers.split_nav("move", "j"),
+		helpers.split_nav("move", "k"),
+		helpers.split_nav("move", "l"),
+		helpers.split_nav("resize", "h"),
+		helpers.split_nav("resize", "j"),
+		helpers.split_nav("resize", "k"),
+		helpers.split_nav("resize", "l"),
 		-- Workspaces
 		{
 			key = "s",

From a2aad1a4c23a90d8dc0e627e6fe0e5ffce3a6b9a Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 15:28:47 +0200
Subject: [PATCH 07/32] Updates config again

---
 home/modules/nvim/config/lazy-lock.json     | 1 +
 home/modules/wezterm/config/keybindings.lua | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/home/modules/nvim/config/lazy-lock.json b/home/modules/nvim/config/lazy-lock.json
index 360d842..becb17e 100644
--- a/home/modules/nvim/config/lazy-lock.json
+++ b/home/modules/nvim/config/lazy-lock.json
@@ -19,6 +19,7 @@
   "render-markdown.nvim": { "branch": "main", "commit": "ff577b44bd3ab642acec0f134a7bf26b7278d137" },
   "rose-pine": { "branch": "main", "commit": "491a0c77abc7ecb955c27a974091a5968232995f" },
   "schemastore.nvim": { "branch": "main", "commit": "0cd099d94b1d61565ee1d44c4afad42f9a170ad1" },
+  "smart-splits.nvim": { "branch": "master", "commit": "1ff7e171c6a1f08d84f5790a924e39fc3316344b" },
   "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
diff --git a/home/modules/wezterm/config/keybindings.lua b/home/modules/wezterm/config/keybindings.lua
index 014f80c..3351d26 100644
--- a/home/modules/wezterm/config/keybindings.lua
+++ b/home/modules/wezterm/config/keybindings.lua
@@ -41,6 +41,11 @@ function M.apply_to_config(config)
 				mode = "SwapWithActive",
 			}),
 		},
+		{
+			key = "L",
+			mods = "CTRL|SHIFT",
+			action = wezterm.action.ClearScrollback("ScrollbackAndViewport"),
+		},
 		-- Navigation
 		helpers.split_nav("move", "h"),
 		helpers.split_nav("move", "j"),

From 203c084b77346b718c469c34e833b787800669b5 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 15:29:40 +0200
Subject: [PATCH 08/32] Changes keybind for scrollback

---
 home/modules/wezterm/config/keybindings.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/home/modules/wezterm/config/keybindings.lua b/home/modules/wezterm/config/keybindings.lua
index 3351d26..fde8d79 100644
--- a/home/modules/wezterm/config/keybindings.lua
+++ b/home/modules/wezterm/config/keybindings.lua
@@ -42,8 +42,8 @@ function M.apply_to_config(config)
 			}),
 		},
 		{
-			key = "L",
-			mods = "CTRL|SHIFT",
+			key = "X",
+			mods = "CTRL",
 			action = wezterm.action.ClearScrollback("ScrollbackAndViewport"),
 		},
 		-- Navigation

From fad693607640b30b63d5bdb36cd19bb3c0d046a9 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 15:30:23 +0200
Subject: [PATCH 09/32] Adds fallback for scrollback

---
 home/modules/wezterm/config/keybindings.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/home/modules/wezterm/config/keybindings.lua b/home/modules/wezterm/config/keybindings.lua
index fde8d79..519eada 100644
--- a/home/modules/wezterm/config/keybindings.lua
+++ b/home/modules/wezterm/config/keybindings.lua
@@ -46,6 +46,11 @@ function M.apply_to_config(config)
 			mods = "CTRL",
 			action = wezterm.action.ClearScrollback("ScrollbackAndViewport"),
 		},
+		{
+			key = "L",
+			mods = "CTRL|SHIFT",
+			action = wezterm.action.ClearScrollback("ScrollbackAndViewport"),
+		},
 		-- Navigation
 		helpers.split_nav("move", "h"),
 		helpers.split_nav("move", "j"),

From 9b0801d61b6d7783e17df393f3544ad17fba2abf Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 15:36:25 +0200
Subject: [PATCH 10/32] Revert "Adds fallback for scrollback"

This reverts commit fad693607640b30b63d5bdb36cd19bb3c0d046a9.
---
 home/modules/wezterm/config/keybindings.lua | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/home/modules/wezterm/config/keybindings.lua b/home/modules/wezterm/config/keybindings.lua
index 519eada..fde8d79 100644
--- a/home/modules/wezterm/config/keybindings.lua
+++ b/home/modules/wezterm/config/keybindings.lua
@@ -46,11 +46,6 @@ function M.apply_to_config(config)
 			mods = "CTRL",
 			action = wezterm.action.ClearScrollback("ScrollbackAndViewport"),
 		},
-		{
-			key = "L",
-			mods = "CTRL|SHIFT",
-			action = wezterm.action.ClearScrollback("ScrollbackAndViewport"),
-		},
 		-- Navigation
 		helpers.split_nav("move", "h"),
 		helpers.split_nav("move", "j"),

From 7b5f57da03054ecd2cf290f808269ec6a62e98a0 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 15:36:25 +0200
Subject: [PATCH 11/32] Revert "Changes keybind for scrollback"

This reverts commit 203c084b77346b718c469c34e833b787800669b5.
---
 home/modules/wezterm/config/keybindings.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/home/modules/wezterm/config/keybindings.lua b/home/modules/wezterm/config/keybindings.lua
index fde8d79..3351d26 100644
--- a/home/modules/wezterm/config/keybindings.lua
+++ b/home/modules/wezterm/config/keybindings.lua
@@ -42,8 +42,8 @@ function M.apply_to_config(config)
 			}),
 		},
 		{
-			key = "X",
-			mods = "CTRL",
+			key = "L",
+			mods = "CTRL|SHIFT",
 			action = wezterm.action.ClearScrollback("ScrollbackAndViewport"),
 		},
 		-- Navigation

From 6318f37c21f9a836525a37532c7672b65da03d75 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 15:36:25 +0200
Subject: [PATCH 12/32] Revert "Updates config again"

This reverts commit a2aad1a4c23a90d8dc0e627e6fe0e5ffce3a6b9a.
---
 home/modules/nvim/config/lazy-lock.json     | 1 -
 home/modules/wezterm/config/keybindings.lua | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/home/modules/nvim/config/lazy-lock.json b/home/modules/nvim/config/lazy-lock.json
index becb17e..360d842 100644
--- a/home/modules/nvim/config/lazy-lock.json
+++ b/home/modules/nvim/config/lazy-lock.json
@@ -19,7 +19,6 @@
   "render-markdown.nvim": { "branch": "main", "commit": "ff577b44bd3ab642acec0f134a7bf26b7278d137" },
   "rose-pine": { "branch": "main", "commit": "491a0c77abc7ecb955c27a974091a5968232995f" },
   "schemastore.nvim": { "branch": "main", "commit": "0cd099d94b1d61565ee1d44c4afad42f9a170ad1" },
-  "smart-splits.nvim": { "branch": "master", "commit": "1ff7e171c6a1f08d84f5790a924e39fc3316344b" },
   "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
diff --git a/home/modules/wezterm/config/keybindings.lua b/home/modules/wezterm/config/keybindings.lua
index 3351d26..014f80c 100644
--- a/home/modules/wezterm/config/keybindings.lua
+++ b/home/modules/wezterm/config/keybindings.lua
@@ -41,11 +41,6 @@ function M.apply_to_config(config)
 				mode = "SwapWithActive",
 			}),
 		},
-		{
-			key = "L",
-			mods = "CTRL|SHIFT",
-			action = wezterm.action.ClearScrollback("ScrollbackAndViewport"),
-		},
 		-- Navigation
 		helpers.split_nav("move", "h"),
 		helpers.split_nav("move", "j"),

From d75dbe0c622471ce5babf90ff7f070c579301184 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 15:36:25 +0200
Subject: [PATCH 13/32] Revert "Adds config for smart split navigation"

This reverts commit 158700874c0073b8db86f9872617839338db80a6.
---
 home/modules/aerospace/default.nix            |  6 ++++
 home/modules/aerospace/work.nix               |  6 ++++
 home/modules/fish/work.nix                    |  3 +-
 .../nvim/config/lua/plugins/smart-splits.lua  | 19 ------------
 home/modules/wezterm/config/helpers.lua       | 31 ++-----------------
 home/modules/wezterm/config/keybindings.lua   | 12 +++----
 6 files changed, 20 insertions(+), 57 deletions(-)
 delete mode 100644 home/modules/nvim/config/lua/plugins/smart-splits.lua

diff --git a/home/modules/aerospace/default.nix b/home/modules/aerospace/default.nix
index bce3c5d..8101dd3 100644
--- a/home/modules/aerospace/default.nix
+++ b/home/modules/aerospace/default.nix
@@ -20,7 +20,13 @@
         "6" = "secondary";
       };
       mode.main.binding = {
+        alt-h = "focus left";
+        alt-j = "focus down";
+        alt-k = "focus up";
+        alt-l = "focus right";
         alt-shift-h = "move left";
+        alt-shift-j = "move down";
+        alt-shift-k = "move up";
         alt-shift-l = "move right";
         alt-comma = "layout tiles horizontal vertical";
         alt-period = "layout accordion horizontal vertical";
diff --git a/home/modules/aerospace/work.nix b/home/modules/aerospace/work.nix
index bb243fc..5ee67d3 100644
--- a/home/modules/aerospace/work.nix
+++ b/home/modules/aerospace/work.nix
@@ -20,7 +20,13 @@
         "6" = "secondary";
       };
       mode.main.binding = {
+        alt-h = "focus left";
+        alt-j = "focus down";
+        alt-k = "focus up";
+        alt-l = "focus right";
         alt-shift-h = "move left";
+        alt-shift-j = "move down";
+        alt-shift-k = "move up";
         alt-shift-l = "move right";
         alt-comma = "layout tiles horizontal vertical";
         alt-period = "layout accordion horizontal vertical";
diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index 218888d..58a3726 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -8,8 +8,7 @@
             fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
             fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
             fd . ~/dev/ride/apps/native -t d -d 1;
-            # Enable as soon as we have packages
-            # fd . ~/dev/ride/packages -t d -d 1;
+            fd . ~/dev/ride/packages -t d -d 1;
             echo "$HOME/dev/ride/apps/frontend";
             echo "$HOME/dev/ride/apps/lib";
             echo "$HOME/dev/ride";
diff --git a/home/modules/nvim/config/lua/plugins/smart-splits.lua b/home/modules/nvim/config/lua/plugins/smart-splits.lua
deleted file mode 100644
index f968561..0000000
--- a/home/modules/nvim/config/lua/plugins/smart-splits.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-return {
-  "mrjones2014/smart-splits.nvim",
-  keys = {
-    { "<C-h>", "require('smart-splits').move_cursor_left", desc = "Move to left split", mode = "n" },
-    { "<C-j>", "require('smart-splits').move_cursor_down", desc = "Move to lower split", mode = "n" },
-    { "<C-k>", "require('smart-splits').move_cursor_up", desc = "Move to upper split", mode = "n" },
-    { "<C-l>", "require('smart-splits').move_cursor_right", desc = "Move to right split", mode = "n" },
-
-    { "<A-h>", "require('smart-splits').resize_left", desc = "Resize to left", mode = "n" },
-    { "<A-j>", "require('smart-splits').resize_down", desc = "Resize lower", mode = "n" },
-    { "<A-k>", "require('smart-splits').resize_up", desc = "Resize upper", mode = "n" },
-    { "<A-l>", "require('smart-splits').resize_right", desc = "Resize to right", mode = "n" },
-
-    { "<leader>mh", "require('smart-splits').swap_buf_left", desc = "Swap to left" },
-    { "<leader>mj", "require('smart-splits').swap_buf_down", desc = "Swap to lower" },
-    { "<leader>mk", "require('smart-splits').swap_buf_up", desc = "Swap to upper" },
-    { "<leader>ml", "require('smart-splits').swap_buf_right", desc = "Swap to right" },
-  },
-}
diff --git a/home/modules/wezterm/config/helpers.lua b/home/modules/wezterm/config/helpers.lua
index b0ffb22..265cc4d 100644
--- a/home/modules/wezterm/config/helpers.lua
+++ b/home/modules/wezterm/config/helpers.lua
@@ -44,36 +44,11 @@ function M.get_padding(padding, remove_padding_bottom)
 	}
 end
 
-function M.is_vim(pane)
-	-- this is set by the plugin, and unset on ExitPre in Neovim
-	return pane:get_user_vars().IS_NVIM == "true"
-end
-
-local direction_keys = {
-	h = "Left",
-	j = "Down",
-	k = "Up",
-	l = "Right",
-}
-
-function M.split_nav(resize_or_move, key)
+function M.move_pane(key, direction)
 	return {
 		key = key,
-		mods = resize_or_move == "resize" and "META" or "CTRL",
-		action = wezterm.action_callback(function(win, pane)
-			if M.is_vim(pane) then
-				-- pass the keys through to vim/nvim
-				win:perform_action({
-					SendKey = { key = key, mods = resize_or_move == "resize" and "META" or "CTRL" },
-				}, pane)
-			else
-				if resize_or_move == "resize" then
-					win:perform_action({ AdjustPaneSize = { direction_keys[key], 3 } }, pane)
-				else
-					win:perform_action({ ActivatePaneDirection = direction_keys[key] }, pane)
-				end
-			end
-		end),
+		mods = "LEADER",
+		action = wezterm.action.ActivatePaneDirection(direction),
 	}
 end
 
diff --git a/home/modules/wezterm/config/keybindings.lua b/home/modules/wezterm/config/keybindings.lua
index 014f80c..d659f16 100644
--- a/home/modules/wezterm/config/keybindings.lua
+++ b/home/modules/wezterm/config/keybindings.lua
@@ -42,14 +42,10 @@ function M.apply_to_config(config)
 			}),
 		},
 		-- Navigation
-		helpers.split_nav("move", "h"),
-		helpers.split_nav("move", "j"),
-		helpers.split_nav("move", "k"),
-		helpers.split_nav("move", "l"),
-		helpers.split_nav("resize", "h"),
-		helpers.split_nav("resize", "j"),
-		helpers.split_nav("resize", "k"),
-		helpers.split_nav("resize", "l"),
+		helpers.move_pane("j", "Down"),
+		helpers.move_pane("k", "Up"),
+		helpers.move_pane("h", "Left"),
+		helpers.move_pane("l", "Right"),
 		-- Workspaces
 		{
 			key = "s",

From 6c1bc60f85edf549ced484dbc6e15c0274cc078b Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Thu, 15 May 2025 15:44:24 +0200
Subject: [PATCH 14/32] Temporarily removes packages from cdr command

---
 home/modules/fish/work.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index 58a3726..6afa203 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -8,7 +8,7 @@
             fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
             fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
             fd . ~/dev/ride/apps/native -t d -d 1;
-            fd . ~/dev/ride/packages -t d -d 1;
+            # fd . ~/dev/ride/packages -t d -d 1;
             echo "$HOME/dev/ride/apps/frontend";
             echo "$HOME/dev/ride/apps/lib";
             echo "$HOME/dev/ride";

From a83f94a1b773efc160353dc27da8328532d851b2 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Fri, 16 May 2025 08:35:03 +0200
Subject: [PATCH 15/32] Fixes fish config

---
 home/modules/fish/work.nix | 150 ++++++++++++++++++++-----------------
 1 file changed, 80 insertions(+), 70 deletions(-)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index 6afa203..5f27399 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -3,88 +3,98 @@
 
     functions = {
       cdr = ''
-        set folder (begin
-            fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
-            fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
-            fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
-            fd . ~/dev/ride/apps/native -t d -d 1;
-            # fd . ~/dev/ride/packages -t d -d 1;
-            echo "$HOME/dev/ride/apps/frontend";
-            echo "$HOME/dev/ride/apps/lib";
-            echo "$HOME/dev/ride";
-        end | fzf);
-        set service (basename $folder)
+        function cdr
+          set folder (begin
+              fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
+              fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
+              fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
+              fd . ~/dev/ride/apps/native -t d -d 1;
+              # fd . ~/dev/ride/packages -t d -d 1;
+              echo "$HOME/dev/ride/apps/frontend";
+              echo "$HOME/dev/ride/apps/lib";
+              echo "$HOME/dev/ride";
+          end | fzf);
+          set service (basename $folder)
 
-        cd $folder
+          cd $folder
+        end
       '';
       rr = ''
-        set folder (begin
-            fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
-            fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
-            fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
-            fd . ~/dev/ride/apps/native -t d -d 1;
-            echo "$HOME/dev/ride/apps/frontend";
-            echo "$HOME/dev/ride/apps/lib";
-            echo "$HOME/dev/ride";
-        end | fzf);
-        
-        if test -n "$folder"
-            set service (basename $folder)
-            cd $folder
-            
-            # Check if package.json exists
-            if test -f "package.json"
-                # Extract and format npm scripts for fzf
-                set script_cmd (jq -r '.scripts | to_entries | .[] | "\(.key): \(.value)"' package.json | fzf)
-                
-                if test -n "$script_cmd"
-                    # Extract just the script name before the colon
-                    set script_name (string split ": " $script_cmd)[1]
-                    if test -n "$script_name"
-                        echo "Running: npm run $script_name"
-                        npm run $script_name
-                    end
-                end
-            end
+        function rr
+          set folder (begin
+              fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
+              fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
+              fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
+              fd . ~/dev/ride/apps/native -t d -d 1;
+              echo "$HOME/dev/ride/apps/frontend";
+              echo "$HOME/dev/ride/apps/lib";
+              echo "$HOME/dev/ride";
+          end | fzf);
+          
+          if test -n "$folder"
+              set service (basename $folder)
+              cd $folder
+              
+              # Check if package.json exists
+              if test -f "package.json"
+                  # Extract and format npm scripts for fzf
+                  set script_cmd (jq -r '.scripts | to_entries | .[] | "\(.key): \(.value)"' package.json | fzf)
+                  
+                  if test -n "$script_cmd"
+                      # Extract just the script name before the colon
+                      set script_name (string split ": " $script_cmd)[1]
+                      if test -n "$script_name"
+                          echo "Running: npm run $script_name"
+                          npm run $script_name
+                      end
+                  end
+              end
+          end
         end
       '';
       ff = ''
-        set RG_PREFIX "rg --column --line-number --no-heading --color=always --smart-case "
-        set INITIAL_QUERY "$argv"
-        fzf --ansi --disabled --query "$INITIAL_QUERY" \
-          --bind "start:reload:$RG_PREFIX {q}" \
-          --bind "change:reload:sleep 0.1; $RG_PREFIX {q} || true" \
-          --delimiter : \
-          --preview 'bat --color=always {1} --highlight-line {2}' \
-          --preview-window 'up,60%,border-bottom,+{2}+3/3,~3' \
-          --bind 'enter:become(nvim {1} +{2})'
+        function ff
+          set RG_PREFIX "rg --column --line-number --no-heading --color=always --smart-case "
+          set INITIAL_QUERY "$argv"
+          fzf --ansi --disabled --query "$INITIAL_QUERY" \
+            --bind "start:reload:$RG_PREFIX {q}" \
+            --bind "change:reload:sleep 0.1; $RG_PREFIX {q} || true" \
+            --delimiter : \
+            --preview 'bat --color=always {1} --highlight-line {2}' \
+            --preview-window 'up,60%,border-bottom,+{2}+3/3,~3' \
+            --bind 'enter:become(nvim {1} +{2})'
+        end
       '';
       envsource = ''
-        for line in (cat $argv | grep -v '^#')
-            set item (string split -m 1 '=' $line)
-            set -gx $item[1] $item[2]
+        function envsource
+          for line in (cat $argv | grep -v '^#')
+              set item (string split -m 1 '=' $line)
+              set -gx $item[1] $item[2]
+          end
         end
       '';
       fish_greeting = "fortune -a";
       resize_images = ''
-        # Resize all JPG images in the current directory and its subdirectories
-        # Usage: resize_images [percentage]
-        # Example: resize_images 20 - resizes all images to 20% of original size
-        # If no percentage is provided, defaults to 40%
-        
-        set -l percentage $argv[1]
-        if test -z "$percentage"
-          set percentage 40
-        end
-        
-        for img in (find . -type f -name "*.JPG")
-          set original_size (stat -f %z "$img")
-          magick convert "$img" -resize "$percentage%" "$img"
-          set new_size (stat -f %z "$img")
-          echo "Processed $img"
-          echo "Original size: $original_size bytes"
-          echo "New size: $new_size bytes"
-          echo "---"
+        function resize_images
+          # Resize all JPG images in the current directory and its subdirectories
+          # Usage: resize_images [percentage]
+          # Example: resize_images 20 - resizes all images to 20% of original size
+          # If no percentage is provided, defaults to 40%
+          
+          set -l percentage $argv[1]
+          if test -z "$percentage"
+            set percentage 40
+          end
+          
+          for img in (find . -type f -name "*.JPG")
+            set original_size (stat -f %z "$img")
+            magick convert "$img" -resize "$percentage%" "$img"
+            set new_size (stat -f %z "$img")
+            echo "Processed $img"
+            echo "Original size: $original_size bytes"
+            echo "New size: $new_size bytes"
+            echo "---"
+          end
         end
       '';
       localip = "ifconfig | grep \"inet \" | grep -v 127.0.0.1 | awk '{print $2}' | head -n 1";

From 870b25d643eac160604ddd34c33c58c4dcdfdf49 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Fri, 16 May 2025 08:46:29 +0200
Subject: [PATCH 16/32] Updates fish functions

---
 home/modules/fish/work.nix | 162 +++++++++++++++++--------------------
 1 file changed, 75 insertions(+), 87 deletions(-)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index 5f27399..fa5c4ad 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -3,113 +3,101 @@
 
     functions = {
       cdr = ''
-        function cdr
-          set folder (begin
-              fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
-              fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
-              fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
-              fd . ~/dev/ride/apps/native -t d -d 1;
-              # fd . ~/dev/ride/packages -t d -d 1;
-              echo "$HOME/dev/ride/apps/frontend";
-              echo "$HOME/dev/ride/apps/lib";
-              echo "$HOME/dev/ride";
-          end | fzf);
-          set service (basename $folder)
+      set folder (begin
+          fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
+          fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
+          fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
+          fd . ~/dev/ride/apps/native -t d -d 1;
+          # fd . ~/dev/ride/packages -t d -d 1;
+          echo "$HOME/dev/ride/apps/frontend";
+          echo "$HOME/dev/ride/apps/lib";
+          echo "$HOME/dev/ride";
+      end | fzf);
+      set service (basename $folder)
 
-          cd $folder
-        end
+      cd $folder
       '';
       rr = ''
-        function rr
-          set folder (begin
-              fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
-              fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
-              fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
-              fd . ~/dev/ride/apps/native -t d -d 1;
-              echo "$HOME/dev/ride/apps/frontend";
-              echo "$HOME/dev/ride/apps/lib";
-              echo "$HOME/dev/ride";
-          end | fzf);
+      set folder (begin
+          fd . ~/dev/ride/apps/backend/edge-services -t d -d 1;
+          fd . ~/dev/ride/apps/backend/backend-services -t d -d 1;
+          fd . ~/dev/ride/apps/frontend/projects -t d -d 1;
+          fd . ~/dev/ride/apps/native -t d -d 1;
+          echo "$HOME/dev/ride/apps/frontend";
+          echo "$HOME/dev/ride/apps/lib";
+          echo "$HOME/dev/ride";
+      end | fzf);
+      
+      if test -n "$folder"
+          set service (basename $folder)
+          cd $folder
           
-          if test -n "$folder"
-              set service (basename $folder)
-              cd $folder
+          # Check if package.json exists
+          if test -f "package.json"
+              # Extract and format npm scripts for fzf
+              set script_cmd (jq -r '.scripts | to_entries | .[] | "\(.key): \(.value)"' package.json | fzf)
               
-              # Check if package.json exists
-              if test -f "package.json"
-                  # Extract and format npm scripts for fzf
-                  set script_cmd (jq -r '.scripts | to_entries | .[] | "\(.key): \(.value)"' package.json | fzf)
-                  
-                  if test -n "$script_cmd"
-                      # Extract just the script name before the colon
-                      set script_name (string split ": " $script_cmd)[1]
-                      if test -n "$script_name"
-                          echo "Running: npm run $script_name"
-                          npm run $script_name
-                      end
+              if test -n "$script_cmd"
+                  # Extract just the script name before the colon
+                  set script_name (string split ": " $script_cmd)[1]
+                  if test -n "$script_name"
+                      echo "Running: npm run $script_name"
+                      npm run $script_name
                   end
               end
           end
-        end
+      end
       '';
       ff = ''
-        function ff
-          set RG_PREFIX "rg --column --line-number --no-heading --color=always --smart-case "
-          set INITIAL_QUERY "$argv"
-          fzf --ansi --disabled --query "$INITIAL_QUERY" \
-            --bind "start:reload:$RG_PREFIX {q}" \
-            --bind "change:reload:sleep 0.1; $RG_PREFIX {q} || true" \
-            --delimiter : \
-            --preview 'bat --color=always {1} --highlight-line {2}' \
-            --preview-window 'up,60%,border-bottom,+{2}+3/3,~3' \
-            --bind 'enter:become(nvim {1} +{2})'
-        end
+      set RG_PREFIX "rg --column --line-number --no-heading --color=always --smart-case "
+      set INITIAL_QUERY "$argv"
+      fzf --ansi --disabled --query "$INITIAL_QUERY" \
+        --bind "start:reload:$RG_PREFIX {q}" \
+        --bind "change:reload:sleep 0.1; $RG_PREFIX {q} || true" \
+        --delimiter : \
+        --preview 'bat --color=always {1} --highlight-line {2}' \
+        --preview-window 'up,60%,border-bottom,+{2}+3/3,~3' \
+        --bind 'enter:become(nvim {1} +{2})'
       '';
       envsource = ''
-        function envsource
-          for line in (cat $argv | grep -v '^#')
-              set item (string split -m 1 '=' $line)
-              set -gx $item[1] $item[2]
-          end
-        end
+      for line in (cat $argv | grep -v '^#')
+          set item (string split -m 1 '=' $line)
+          set -gx $item[1] $item[2]
+      end
       '';
       fish_greeting = "fortune -a";
       resize_images = ''
-        function resize_images
-          # Resize all JPG images in the current directory and its subdirectories
-          # Usage: resize_images [percentage]
-          # Example: resize_images 20 - resizes all images to 20% of original size
-          # If no percentage is provided, defaults to 40%
-          
-          set -l percentage $argv[1]
-          if test -z "$percentage"
-            set percentage 40
-          end
-          
-          for img in (find . -type f -name "*.JPG")
-            set original_size (stat -f %z "$img")
-            magick convert "$img" -resize "$percentage%" "$img"
-            set new_size (stat -f %z "$img")
-            echo "Processed $img"
-            echo "Original size: $original_size bytes"
-            echo "New size: $new_size bytes"
-            echo "---"
-          end
-        end
+      # Resize all JPG images in the current directory and its subdirectories
+      # Usage: resize_images [percentage]
+      # Example: resize_images 20 - resizes all images to 20% of original size
+      # If no percentage is provided, defaults to 40%
+      
+      set -l percentage $argv[1]
+      if test -z "$percentage"
+        set percentage 40
+      end
+      
+      for img in (find . -type f -name "*.JPG")
+        set original_size (stat -f %z "$img")
+        magick convert "$img" -resize "$percentage%" "$img"
+        set new_size (stat -f %z "$img")
+        echo "Processed $img"
+        echo "Original size: $original_size bytes"
+        echo "New size: $new_size bytes"
+        echo "---"
+      end
       '';
       localip = "ifconfig | grep \"inet \" | grep -v 127.0.0.1 | awk '{print $2}' | head -n 1";
       publicip = "curl -4 ifconfig.me";
       fzf = ''
-        function fzf --wraps="fzf"
-          set -Ux FZF_DEFAULT_OPTS "
-	          --color=fg:#908caa,bg:#191724,hl:#ebbcba
-	          --color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba
-	          --color=border:#403d52,header:#31748f,gutter:#191724
-	          --color=spinner:#f6c177,info:#9ccfd8
-	          --color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa"
+      set -Ux FZF_DEFAULT_OPTS "
+              --color=fg:#908caa,bg:#191724,hl:#ebbcba
+              --color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba
+              --color=border:#403d52,header:#31748f,gutter:#191724
+              --color=spinner:#f6c177,info:#9ccfd8
+              --color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa"
 
-          command fzf
-        end
+      command fzf
       '';
     };
 

From d229ce65370ef69056d639c799d61e1bec85cb19 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 19 May 2025 09:44:09 +0200
Subject: [PATCH 17/32] Updates override

---
 home/modules/wezterm/config/overrides.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/modules/wezterm/config/overrides.lua b/home/modules/wezterm/config/overrides.lua
index 64402cf..e9b3120 100644
--- a/home/modules/wezterm/config/overrides.lua
+++ b/home/modules/wezterm/config/overrides.lua
@@ -6,7 +6,7 @@ local M = {}
 
 function M.apply_to_config(config)
 	if hn == "dnsc-work" then
-		config.window_background_opacity = 0.9
+		config.window_background_opacity = 0.975
 	end
 
 	if hn == "dnsc-desktop" then

From 63125515ecbe4f7bfdc2055c94063a562f204836 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 19 May 2025 10:56:15 +0200
Subject: [PATCH 18/32] Sets up rbenv for qickets

---
 home/modules/fish/work.nix                | 1 +
 home/modules/wezterm/config/overrides.lua | 1 +
 hosts/dnsc-work/default.nix               | 1 +
 3 files changed, 3 insertions(+)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index fa5c4ad..a5b5a97 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -121,6 +121,7 @@
 
       zoxide init fish | source
       fnm env --use-on-cd --shell fish | source
+      rbenv init - | source
     '';
 
     shellAbbrs = {
diff --git a/home/modules/wezterm/config/overrides.lua b/home/modules/wezterm/config/overrides.lua
index e9b3120..3520740 100644
--- a/home/modules/wezterm/config/overrides.lua
+++ b/home/modules/wezterm/config/overrides.lua
@@ -7,6 +7,7 @@ local M = {}
 function M.apply_to_config(config)
 	if hn == "dnsc-work" then
 		config.window_background_opacity = 0.975
+		config.font_size = 19
 	end
 
 	if hn == "dnsc-desktop" then
diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix
index 22476e6..59a19f5 100644
--- a/hosts/dnsc-work/default.nix
+++ b/hosts/dnsc-work/default.nix
@@ -83,6 +83,7 @@
       "librsvg"
       "pixman"
       "python-setuptools"
+      "rbenv"
     ];
 
     casks = [

From 5c3ff27be9ee913ae9ce5c012936711f2eb47357 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 19 May 2025 11:10:54 +0200
Subject: [PATCH 19/32] Updates atuin settings

---
 home/modules/atuin/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/home/modules/atuin/default.nix b/home/modules/atuin/default.nix
index 414910d..aaff4ae 100644
--- a/home/modules/atuin/default.nix
+++ b/home/modules/atuin/default.nix
@@ -2,5 +2,10 @@
   programs.atuin = {
     enable = true;
     enableFishIntegration = true;
+    settings = {
+      invert = true;
+      style = "compact";
+      inline_height = 30;
+    };
   };
 }

From 19a91f54c8a8fae5938b1bac42bb5881ebf87b5f Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 19 May 2025 11:14:14 +0200
Subject: [PATCH 20/32] Updates home manager config

---
 home/darwin-work.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/darwin-work.nix b/home/darwin-work.nix
index c841e62..530b30a 100644
--- a/home/darwin-work.nix
+++ b/home/darwin-work.nix
@@ -23,4 +23,5 @@
   ];
 
   programs.home-manager.enable = true;
+  programs.home-manager.backupFileExtension = "backup";
 }

From cae5167858bfcc3a97b71a839439aaacc076122d Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 19 May 2025 11:15:07 +0200
Subject: [PATCH 21/32] Fixes home manager config

---
 home/darwin-work.nix        | 1 -
 hosts/dnsc-work/default.nix | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/darwin-work.nix b/home/darwin-work.nix
index 530b30a..c841e62 100644
--- a/home/darwin-work.nix
+++ b/home/darwin-work.nix
@@ -23,5 +23,4 @@
   ];
 
   programs.home-manager.enable = true;
-  programs.home-manager.backupFileExtension = "backup";
 }
diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix
index 59a19f5..b553da0 100644
--- a/hosts/dnsc-work/default.nix
+++ b/hosts/dnsc-work/default.nix
@@ -175,6 +175,7 @@
   home-manager = {
     extraSpecialArgs = { inherit inputs outputs; };
     useGlobalPkgs = true;
+    backupFileExtension = "backup";
     users = {
       dennis = import ../../home/darwin-work.nix;
     };

From d1b2be012076624d891f0cd904d40cc934ef6950 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Tue, 20 May 2025 08:38:41 +0200
Subject: [PATCH 22/32] Changes atuin style

---
 home/modules/atuin/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/home/modules/atuin/default.nix b/home/modules/atuin/default.nix
index aaff4ae..268d815 100644
--- a/home/modules/atuin/default.nix
+++ b/home/modules/atuin/default.nix
@@ -3,9 +3,8 @@
     enable = true;
     enableFishIntegration = true;
     settings = {
-      invert = true;
       style = "compact";
-      inline_height = 30;
+      inline_height = 20;
     };
   };
 }

From 37645500c77cce1b2bcb7762a5343a3e7be85bed Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 26 May 2025 10:52:40 +0200
Subject: [PATCH 23/32] Adds pnpm shell completion script

---
 home/modules/fish/work.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index a5b5a97..e36f3af 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -1,3 +1,5 @@
+{ config, pkgs, ... }:
+
 { programs.fish = {
     enable = true;
 
@@ -136,6 +138,18 @@
       pi = "pnpm install";
       px = "pnpm dlx";
     };
+
+    plugins = [
+      {
+         name = "pnpm-shell-completion";
+         src = pkgs.fetchFromGitHub {
+           owner = "g-plane";
+           repo = "pnpm-shell-completion";
+           rev = "v0.5.4";
+           sha256 = "e34eefb80400d1cd2a7e787cf47f0b48bdf767fa";
+         };
+      }
+    ];
   };
 
   home.file.".config/fish/themes".source = ./themes;

From 4469764f04d9eeedd8eed467287583bd65105d5c Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 26 May 2025 10:55:47 +0200
Subject: [PATCH 24/32] Fix work.nix (fish)

---
 home/modules/fish/work.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index e36f3af..17b8459 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -146,7 +146,7 @@
            owner = "g-plane";
            repo = "pnpm-shell-completion";
            rev = "v0.5.4";
-           sha256 = "e34eefb80400d1cd2a7e787cf47f0b48bdf767fa";
+           sha512 = "e34eefb80400d1cd2a7e787cf47f0b48bdf767fa";
          };
       }
     ];

From c07dfdb1b32ce1fa5f5594cbb093f08ddd25c30a Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 26 May 2025 11:02:40 +0200
Subject: [PATCH 25/32] Installs nurl

---
 home/modules/fish/work.nix  | 22 +++++++++++-----------
 hosts/dnsc-work/default.nix |  1 +
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index 17b8459..17a755b 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -139,17 +139,17 @@
       px = "pnpm dlx";
     };
 
-    plugins = [
-      {
-         name = "pnpm-shell-completion";
-         src = pkgs.fetchFromGitHub {
-           owner = "g-plane";
-           repo = "pnpm-shell-completion";
-           rev = "v0.5.4";
-           sha512 = "e34eefb80400d1cd2a7e787cf47f0b48bdf767fa";
-         };
-      }
-    ];
+    # plugins = [
+    #   {
+    #      name = "pnpm-shell-completion";
+    #      src = pkgs.fetchFromGitHub {
+    #        owner = "g-plane";
+    #        repo = "pnpm-shell-completion";
+    #        rev = "v0.5.4";
+    #        sha512 = "e34eefb80400d1cd2a7e787cf47f0b48bdf767fa";
+    #      };
+    #   }
+    # ];
   };
 
   home.file.".config/fish/themes".source = ./themes;
diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix
index b553da0..1f1aa9f 100644
--- a/hosts/dnsc-work/default.nix
+++ b/hosts/dnsc-work/default.nix
@@ -44,6 +44,7 @@
     prettierd
     atuin
     nil
+    nurl
   ];
   
   # Homebrew

From 71c28d4ae9b8509ea3583a176e7f0cfc48f49590 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 26 May 2025 11:13:31 +0200
Subject: [PATCH 26/32] Removes tailscale due to issues

---
 hosts/dnsc-work/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix
index 1f1aa9f..dc74ed1 100644
--- a/hosts/dnsc-work/default.nix
+++ b/hosts/dnsc-work/default.nix
@@ -90,7 +90,7 @@
     casks = [
       "arc"
       "microsoft-teams"
-      "tailscale"
+      # "tailscale"
       "font-victor-mono"
       "font-victor-mono-nerd-font"
       "vlc"

From 73dfe90eb8708a0c3dbac7b92496c8d17a329eb3 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 26 May 2025 11:24:34 +0200
Subject: [PATCH 27/32] Adds fish plugin

---
 home/modules/fish/work.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index 17a755b..b96a271 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -139,17 +139,17 @@
       px = "pnpm dlx";
     };
 
-    # plugins = [
-    #   {
-    #      name = "pnpm-shell-completion";
-    #      src = pkgs.fetchFromGitHub {
-    #        owner = "g-plane";
-    #        repo = "pnpm-shell-completion";
-    #        rev = "v0.5.4";
-    #        sha512 = "e34eefb80400d1cd2a7e787cf47f0b48bdf767fa";
-    #      };
-    #   }
-    # ];
+    plugins = [
+      {
+         name = "pnpm-shell-completion";
+           src = pkgs.fetchFromGitHub {
+             owner = "g-plane";
+             repo = "pnpm-shell-completion";
+             rev = "v0.5.4";
+             hash = "sha256-bc2ZVHQF+lSAmhy/fvdiVfg9uzPPcXYrtiNChjkjHtA=";
+           };
+      }
+    ];
   };
 
   home.file.".config/fish/themes".source = ./themes;

From eb9bb6db2ed677d7c92638c559c8e345a98ab927 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 26 May 2025 11:34:56 +0200
Subject: [PATCH 28/32] Removes plugin due to installation issues

---
 home/modules/fish/work.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index b96a271..dd252eb 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -138,18 +138,6 @@
       pi = "pnpm install";
       px = "pnpm dlx";
     };
-
-    plugins = [
-      {
-         name = "pnpm-shell-completion";
-           src = pkgs.fetchFromGitHub {
-             owner = "g-plane";
-             repo = "pnpm-shell-completion";
-             rev = "v0.5.4";
-             hash = "sha256-bc2ZVHQF+lSAmhy/fvdiVfg9uzPPcXYrtiNChjkjHtA=";
-           };
-      }
-    ];
   };
 
   home.file.".config/fish/themes".source = ./themes;

From b5b93baed4c7b9d9b4c6220a043e4f2c7747d8c1 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 26 May 2025 11:41:38 +0200
Subject: [PATCH 29/32] Adds to path

---
 home/modules/fish/work.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index dd252eb..8da59af 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -118,6 +118,7 @@
       fish_add_path /opt/homebrew/bin
       fish_add_path $ANDROID_HOME/emulator
       fish_add_path $ANDROID_HOME/platform-tools
+      fish_add_path $HOME/.config/fish/plugins
 
       envsource ~/.env
 

From 92a0c193c0b7f133a9714210154fb669af4626e1 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Tue, 27 May 2025 09:13:38 +0200
Subject: [PATCH 30/32] Updates fastlane syntax highlighting

---
 home/modules/nvim/config/ftdetect/fastlane.vim | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 home/modules/nvim/config/ftdetect/fastlane.vim

diff --git a/home/modules/nvim/config/ftdetect/fastlane.vim b/home/modules/nvim/config/ftdetect/fastlane.vim
new file mode 100644
index 0000000..64d666e
--- /dev/null
+++ b/home/modules/nvim/config/ftdetect/fastlane.vim
@@ -0,0 +1,7 @@
+au BufNewFile,BufRead Appfile set ft=ruby
+au BufNewFile,BufRead Deliverfile set ft=ruby
+au BufNewFile,BufRead Fastfile set ft=ruby
+au BufNewFile,BufRead Gymfile set ft=ruby
+au BufNewFile,BufRead Matchfile set ft=ruby
+au BufNewFile,BufRead Snapfile set ft=ruby
+au BufNewFile,BufRead Scanfile set ft=ruby

From 250672e89552a19555ad5800aebf7921161def1c Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Tue, 27 May 2025 14:32:51 +0200
Subject: [PATCH 31/32] removes rsync on work mac

---
 hosts/dnsc-work/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix
index dc74ed1..069e18b 100644
--- a/hosts/dnsc-work/default.nix
+++ b/hosts/dnsc-work/default.nix
@@ -69,7 +69,7 @@
       "yt-dlp"
       "zoxide"
       "sqlite"
-      "rsync"
+      # "rsync" -> Can't install due to: https://github.com/fastlane/fastlane/discussions/27962
       "fnm"
       "imagemagick"
       "todo-txt"

From ec65e4fdf6f82e47e01dd30dd41edf500965c6b0 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Wed, 28 May 2025 12:50:28 +0200
Subject: [PATCH 32/32] Adds SSH key to servers

---
 hosts/dnsc-server/default.nix | 1 +
 hosts/dnsc-vps-sm/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/hosts/dnsc-server/default.nix b/hosts/dnsc-server/default.nix
index 80ca8e1..da28607 100644
--- a/hosts/dnsc-server/default.nix
+++ b/hosts/dnsc-server/default.nix
@@ -57,6 +57,7 @@
     extraGroups = [ "wheel" "networkmanager" ];
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvXWZOPOJJDAoF+Sx/ZLoAVu6G/7/MAWoknBgMAzjul dennis@dnsc-mac"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKnmuxDkpDIku5t1Tykz21u78xoQ7LJR8JEcfth32LGu dennis@dnsc-work"
     ];
   };
 
diff --git a/hosts/dnsc-vps-sm/default.nix b/hosts/dnsc-vps-sm/default.nix
index 3c04612..1ca396c 100644
--- a/hosts/dnsc-vps-sm/default.nix
+++ b/hosts/dnsc-vps-sm/default.nix
@@ -72,6 +72,7 @@
     extraGroups = [ "wheel" "networkmanager" ];
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvXWZOPOJJDAoF+Sx/ZLoAVu6G/7/MAWoknBgMAzjul dennis@dnsc-mac"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKnmuxDkpDIku5t1Tykz21u78xoQ7LJR8JEcfth32LGu dennis@dnsc-work"
     ];
   };