From e9cd5fd549d1245c65f5aa9fba37315f70f4b7f7 Mon Sep 17 00:00:00 2001
From: Gabriella Bere <contact@gabbie.blue>
Date: Sun, 12 Oct 2025 13:58:14 +0100
Subject: [PATCH] niri config is now pretty usable

using fuzzel instead of wofi because wofi wouldnt launch for some
reason, and fuzzel looks alright it just needs a better font
---
 home-manager/home.nix |  1 +
 home-manager/niri.nix | 24 +++++++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 6d217dd..99c4f41 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -77,4 +77,5 @@
   services.mpris-proxy.enable = true;
 
   programs.kitty.enable = true; 
+  programs.fuzzel.enable = true;
 }
diff --git a/home-manager/niri.nix b/home-manager/niri.nix
index f7aebd6..f224cf0 100644
--- a/home-manager/niri.nix
+++ b/home-manager/niri.nix
@@ -1,7 +1,7 @@
 { pkgs, config, lib, ... }: {
   programs.niri = {
     enable = true;
-    package = pkgs.niri; # follows nixpkgs version because i am lazy, probably more stable to use the flake one TODO
+    package = pkgs.niri; # follows nixpkgs version because i am lazy, probably more stable to use the flake one, TODO
     settings = {
       prefer-no-csd = true; # no client-side-decorations
       hotkey-overlay = {
@@ -13,6 +13,7 @@
           enable = true;
           max-scroll-amount = "95%";
         };
+        warp-mouse-to-focus.enable = true;
         mouse.natural-scroll = false;
       };
       outputs = {
@@ -56,18 +57,22 @@
             bottom = r;
             top = r;
           };
+        preset-column-widths = [
+          { proportion = 1. / 2.; }
+          { proportion = 1. / 1.; }
+        ];
       };
       binds = with config.lib.niri.actions; {
         # keybinds for spawning apps
         "Mod+1".action = spawn "kitty";
         "Mod+F".action = spawn "librewolf";
         "Mod+D".action = spawn "vesktop";
-        "Mod+Space".action = spawn "sh -c 'wofi --show drun, run'";
+        "Mod+Space".action = spawn "fuzzel";
         "Mod+Alt+L".action = spawn "hyprlock";
         "Print".action = screenshot;
         "Mod+2".action = show-hotkey-overlay;
         # window controls
-        #"Mod".action = toggle-overview;
+        #"Mod".action = toggle-overview; # i really want this but i dont know how to make it work TODO
         "Mod+F11".action = fullscreen-window;
         "Mod+x".action = close-window;
         "Mod+Tab".action = toggle-window-floating;
@@ -75,12 +80,16 @@
         "Mod+j".action = focus-window-or-monitor-down;
         "Mod+k".action = focus-window-or-monitor-up;
         "Mod+l".action = focus-column-or-monitor-right;
-        "Mod+Shift+h".action = consume-or-expel-window-left; # no idea if this should be swap-window-left instead
+        "Mod+Shift+h".action = move-column-left-or-to-monitor-left;
         "Mod+Shift+j".action = move-window-down;
         "Mod+Shift+k".action = move-window-up;
-        "Mod+Shift+l".action = consume-or-expel-window-right; # see above comment
+        "Mod+Shift+l".action = move-column-right-or-to-monitor-right;
+        "Mod+Comma".action = consume-or-expel-window-left;
+        "Mod+Period".action = consume-or-expel-window-right;
+        "Mod+Return".action = switch-preset-column-width;
+
         "Mod+WheelScrollUp".action = focus-workspace-up;
-        "Mod+WheelScrollDown".action = focus-workspace-down; # not sure if these mouse scroll keybinds are in the right direction
+        "Mod+WheelScrollDown".action = focus-workspace-down;
         "Mod+Up".action = focus-workspace-up;
         "Mod+Down".action = focus-workspace-down;
         # not sure how to do the "send window to workspace" keybinds from the hyprland config
@@ -105,7 +114,8 @@
               is-active = true;
             }
           ];
-          opacity = 0.7;
+          opacity = 0.9;
+          draw-border-with-background = false;
         }
       ];
       xwayland-satellite = {