From 3067f59687ef16486dda139363e4d6d2f91b830b Mon Sep 17 00:00:00 2001
From: TheWanderingCrow <contact@wanderingcrow.net>
Date: Tue, 1 Jul 2025 10:29:42 -0400
Subject: [PATCH] I think I like this niri config

---
 home/crow/Incarceron.nix                    |  1 -
 home/crow/common/optional/desktops/niri.nix | 40 +++++++--------------
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/home/crow/Incarceron.nix b/home/crow/Incarceron.nix
index 782c953..ea571a6 100644
--- a/home/crow/Incarceron.nix
+++ b/home/crow/Incarceron.nix
@@ -1,7 +1,6 @@
 {...}: {
   imports = [
     common/core
-    common/optional/desktops/sway
     common/optional/desktops/niri.nix
     common/optional/browsers/firefox.nix
     common/optional/comms
diff --git a/home/crow/common/optional/desktops/niri.nix b/home/crow/common/optional/desktops/niri.nix
index 9266d6a..219eb7e 100644
--- a/home/crow/common/optional/desktops/niri.nix
+++ b/home/crow/common/optional/desktops/niri.nix
@@ -96,19 +96,14 @@
         "Mod+Shift+Q" = {
           action = close-window;
         };
-        "Mod+Left" = {action = focus-column-left;};
-        "Mod+Down" = {action = focus-window-down;};
-        "Mod+Up" = {action = focus-window-up;};
-        "Mod+Right" = {action = focus-column-right;};
+
+        # Window switching (vim style)
         "Mod+H" = {action = focus-column-left;};
         "Mod+J" = {action = focus-window-down;};
         "Mod+K" = {action = focus-window-up;};
         "Mod+L" = {action = focus-column-right;};
 
-        "Mod+Ctrl+Left" = {action = move-column-left;};
-        "Mod+Ctrl+Down" = {action = move-window-down;};
-        "Mod+Ctrl+Up" = {action = move-window-up;};
-        "Mod+Ctrl+Right" = {action = move-column-right;};
+        # Window moving
         "Mod+Ctrl+H" = {action = move-column-left;};
         "Mod+Ctrl+J" = {action = move-window-down;};
         "Mod+Ctrl+K" = {action = move-window-up;};
@@ -118,36 +113,25 @@
         "Mod+Ctrl+Home" = {action = move-column-to-first;};
         "Mod+Ctrl+End" = {action = move-column-to-last;};
 
-        "Mod+Shift+Left" = {action = focus-monitor-left;};
-        "Mod+Shift+Down" = {action = focus-monitor-down;};
-        "Mod+Shift+Up" = {action = focus-monitor-up;};
-        "Mod+Shift+Right" = {action = focus-monitor-right;};
+        # Monitor switching
         "Mod+Shift+H" = {action = focus-monitor-left;};
         "Mod+Shift+J" = {action = focus-monitor-down;};
         "Mod+Shift+K" = {action = focus-monitor-up;};
         "Mod+Shift+L" = {action = focus-monitor-right;};
 
-        "Mod+Shift+Ctrl+Left" = {action = move-column-to-monitor-left;};
-        "Mod+Shift+Ctrl+Down" = {action = move-column-to-monitor-down;};
-        "Mod+Shift+Ctrl+Up" = {action = move-column-to-monitor-up;};
-        "Mod+Shift+Ctrl+Right" = {action = move-column-to-monitor-right;};
         "Mod+Shift+Ctrl+H" = {action = move-column-to-monitor-left;};
         "Mod+Shift+Ctrl+J" = {action = move-column-to-monitor-down;};
         "Mod+Shift+Ctrl+K" = {action = move-column-to-monitor-up;};
         "Mod+Shift+Ctrl+L" = {action = move-column-to-monitor-right;};
-        "Mod+Page_Down" = {action = focus-workspace-down;};
-        "Mod+Page_Up" = {action = focus-workspace-up;};
-        "Mod+U" = {action = focus-workspace-down;};
-        "Mod+I" = {action = focus-workspace-up;};
-        "Mod+Ctrl+Page_Down" = {action = move-column-to-workspace-down;};
-        "Mod+Ctrl+Page_Up" = {action = move-column-to-workspace-up;};
-        "Mod+Ctrl+U" = {action = move-column-to-workspace-down;};
-        "Mod+Ctrl+I" = {action = move-column-to-workspace-up;};
 
-        "Mod+Shift+Page_Down" = {action = move-workspace-down;};
-        "Mod+Shift+Page_Up" = {action = move-workspace-up;};
-        "Mod+Shift+U" = {action = move-workspace-down;};
-        "Mod+Shift+I" = {action = move-workspace-up;};
+        # Workspace switching
+        "Mod+U" = {action = focus-workspace-up;};
+        "Mod+I" = {action = focus-workspace-down;};
+        "Mod+Ctrl+U" = {action = move-column-to-workspace-up;};
+        "Mod+Ctrl+I" = {action = move-column-to-workspace-down;};
+
+        "Mod+Shift+U" = {action = move-workspace-up;};
+        "Mod+Shift+I" = {action = move-workspace-down;};
 
         "Mod+WheelScrollDown" = {
           action = focus-workspace-down;