From 83c92deef58fbe36e73d7d27fa7798f69c3be883 Mon Sep 17 00:00:00 2001
From: martyTF <marty@marty.tf>
Date: Fri, 24 Apr 2026 20:54:24 +0200
Subject: [PATCH] zeniri

---
 home/apps/internet/zen-browser.nix    |  1 +
 home/desktop/window-managers/niri.nix | 23 ++++++++++++++++++-----
 hosts/marty-thinkpad/options.nix      |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/home/apps/internet/zen-browser.nix b/home/apps/internet/zen-browser.nix
index 8df7295..c49002b 100644
--- a/home/apps/internet/zen-browser.nix
+++ b/home/apps/internet/zen-browser.nix
@@ -48,6 +48,7 @@ let
     (extension "floccus" "floccus@handmadeideas.org")
     (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}")
     (extension "simplelogin" "addon@simplelogin")
+    (extension "vimium-ff" "d7742d87-e61d-4b78-b8a1-b469842139fa")
     (extension "localcdn-fork-of-decentraleyes" "{b86e4813-687a-43e6-ab65-0bde4ab75758}")
     (extension "catppuccin-web-file-icons" "{bbb880ce-43c9-47ae-b746-c3e0096c5b76}")
     (extension "peertube-companion" "peertube-companion@booteille")
diff --git a/home/desktop/window-managers/niri.nix b/home/desktop/window-managers/niri.nix
index aada878..1843e14 100644
--- a/home/desktop/window-managers/niri.nix
+++ b/home/desktop/window-managers/niri.nix
@@ -9,6 +9,7 @@
 
 let
   modifier = if (osConfig.keybinds.modifier == "Meta") then "Mod" else null;
+  nsipc = "noctalia-shell ipc call";
   kb-layout = builtins.substring 0 2 osConfig.system.locale;
 in
 
@@ -61,26 +62,38 @@ in
                   //Applications
               	  ${modifier}+${osConfig.keybinds.hotkeys.terminal} hotkey-overlay-title="Open Terminal" { spawn "${osConfig.apps.terminal.binary}";}
                   ${modifier}+${osConfig.keybinds.hotkeys.browser} hotkey-overlay-title="Open Browser" { spawn "${osConfig.apps.internet.browsers.default}";}
-                  ${modifier}+${osConfig.keybinds.hotkeys.launcher} hotkey-overlay-title="Open Launcher" { spawn "noctalia-shell" "ipc" "call" "launcher" "toggle";}
+                  ${modifier}+${osConfig.keybinds.hotkeys.launcher} hotkey-overlay-title="Open Launcher" { spawn-sh "${nsipc} launcher toggle || walker";}
                   ${modifier}+Shift+${osConfig.keybinds.hotkeys.editor} hotkey-overlay-title="Open Editor" { spawn "${osConfig.apps.development.editor.default}";}
 
                   //Window Management
                   ${modifier}+Shift+${osConfig.keybinds.hotkeys.close-window} { close-window; }
-
-                  //Column Navigation
-                  ${modifier}+H { focus-column-left; }
-                  ${modifier}+L { focus-column-right; }
                   ${modifier}+R { switch-preset-column-width; }
                   ${modifier}+Shift+R { switch-preset-column-width-back; }
                   ${modifier}+F { expand-column-to-available-width; }
                   ${modifier}+G { toggle-window-floating; }
 
+                  //Column Navigation
+                  ${modifier}+H { focus-column-left; }
+                  ${modifier}+L { focus-column-right; }
+                  ${modifier}+Left { focus-column-left; }
+                  ${modifier}+Right { focus-column-right; }
+                  ${modifier}+Shift+H { move-column-left-or-to-monitor-left; }
+                  ${modifier}+Shift+L { move-column-right-or-to-monitor-right; }
+                  ${modifier}+Shift+Left { move-column-left-or-to-monitor-left; }
+                  ${modifier}+Shift+Right { move-column-right-or-to-monitor-right; }
+
                   //Workspace Navigation
                   ${modifier}+J cooldown-ms=150 { focus-workspace-down; }
                   ${modifier}+K   cooldown-ms=150 { focus-workspace-up; }
+                  ${modifier}+Down cooldown-ms=150 { focus-workspace-down; }
+                  ${modifier}+Up   cooldown-ms=150 { focus-workspace-up; }
 
                   //Screenshots
                   Print { screenshot;}
+
+                  //Misc
+                  ${modifier}+Shift+Y hotkey-overlay-title="Open Keyboard Cheatsheet" { spawn-sh "${nsipc} plugin:keybind-cheatsheet toggle"; }
+                  ${modifier}+P hotkey-overlay-title="Open Session Menu" { spawn-sh "${nsipc} sessionMenu toggle"; }
               }
 
               switch-events {
diff --git a/hosts/marty-thinkpad/options.nix b/hosts/marty-thinkpad/options.nix
index 7570c88..f3873ab 100644
--- a/hosts/marty-thinkpad/options.nix
+++ b/hosts/marty-thinkpad/options.nix
@@ -28,7 +28,7 @@
         editor = {
           vscodium.enable = true;
           emacs.enable = true;
-          default = "vscodium";
+          default = "codium";
         };
         languages = {
           python.enable = true;