From f26cc9575d65bd4bda09dd7f100cab9784711db5 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Sun, 19 Jan 2025 00:15:12 -0500
Subject: [PATCH] switch to niri

---
 home/niri/default.nix   | 44 ++++++++++++++++++++++++++++++++++++++---
 home/yt/ytnix.nix       |  1 -
 hosts/ytnix/default.nix |  5 -----
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/home/niri/default.nix b/home/niri/default.nix
index 889e3b1..c865528 100644
--- a/home/niri/default.nix
+++ b/home/niri/default.nix
@@ -5,6 +5,7 @@ let
   menu = "fuzzel";
   browser = "librewolf";
   file-manager = "thunar";
+  clipboard = "cliphist list | ${menu} --dmenu | cliphist decode | wl-copy";
 in
 {
   programs.niri.settings =
@@ -12,9 +13,32 @@ in
     prefer-no-csd = true;
     input.keyboard.xkb.options = "ctrl:nocaps";
     spawn-at-startup = [
-      { command = [ "waybar" ]; }
+      { command = [ "${lib.getExe pkgs.waybar}" ]; }
       { command = [ "${lib.getExe pkgs.swaybg}" "-m" "fill" "-i" wallpaper ]; }
     ];
+    hotkey-overlay.skip-at-startup = true;
+
+    input = {
+      touchpad = {
+        tap = true;
+        dwt = true;
+        natural-scroll = true;
+        click-method = "clickfinger";
+      };
+      warp-mouse-to-focus = true;
+      focus-follows-mouse.enable = true;
+    };
+
+    layout = {
+      gaps = 4;
+      focus-ring = {
+          width = 4;
+          active.color = "#00000055";
+          inactive.color = "#505050";
+        };
+      always-center-single-column = true;
+      border.enable = false;
+    };
   };
 
   programs.niri.settings.binds =
@@ -43,8 +67,8 @@ in
       "Mod+Shift+J".action = move-window-down;
       "Mod+U".action = focus-workspace-up;
       "Mod+I".action = focus-workspace-down;
-      "Mod+Shift+U".action = move-workspace-up;
-      "Mod+Shift+I".action = move-workspace-down;
+      "Mod+Shift+U".action = move-window-to-workspace-up;
+      "Mod+Shift+I".action = move-window-to-workspace-down;
       "Mod+W".action = maximize-column;
       "Mod+C".action = center-column;
       "Mod+Shift+Space".action = toggle-window-floating;
@@ -68,11 +92,25 @@ in
       "Mod+3".action = focus-workspace 3;
       "Mod+4".action = focus-workspace 4;
       "Mod+5".action = focus-workspace 5;
+      "Mod+6".action = focus-workspace 6;
+      "Mod+7".action = focus-workspace 7;
+      "Mod+8".action = focus-workspace 8;
+      "Mod+9".action = focus-workspace 9;
+      "Mod+Shift+1".action = move-column-to-workspace 1;
+      "Mod+Shift+2".action = move-column-to-workspace 2;
+      "Mod+Shift+3".action = move-column-to-workspace 3;
+      "Mod+Shift+4".action = move-column-to-workspace 4;
+      "Mod+Shift+5".action = move-column-to-workspace 5;
+      "Mod+Shift+6".action = move-column-to-workspace 6;
+      "Mod+Shift+7".action = move-column-to-workspace 7;
+      "Mod+Shift+8".action = move-column-to-workspace 8;
+      "Mod+Shift+9".action = move-column-to-workspace 9;
 
       "Mod+Alt+B".action = spawn browser;
       "Mod+Alt+A".action = spawn "anki";
       "Mod+Alt+F".action = spawn file-manager;
       "Mod+Alt+E".action = spawn "evolution";
       "Mod+P".action = spawn "bitwarden";
+      "Mod+Comma".action = sh clipboard;
     };
 }
diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix
index b049bd7..a64bc73 100644
--- a/home/yt/ytnix.nix
+++ b/home/yt/ytnix.nix
@@ -123,7 +123,6 @@
   };
 
   xdg.configFile = {
-    sway.source = ../sway;
     rofi.source = ../rofi;
     waybar.source = ../waybar;
     mpv.source = ../mpv;
diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix
index 36786f4..8912c19 100644
--- a/hosts/ytnix/default.nix
+++ b/hosts/ytnix/default.nix
@@ -188,11 +188,6 @@
   };
   services.blueman.enable = true;
 
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-  };
-
   my.backup = {
     enable = true;
     jobName = "ytnixRsync";