From c2dd8c26f5a706c8b0ad9b74b9ac341585ad6701 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Fri, 21 Nov 2025 16:36:19 +0100
Subject: [PATCH] wip: dnsc-machine setup

---
 home/linux.nix             | 14 +++++++-------
 modules/fish/default.nix   |  2 +-
 modules/wm/niri/config.kdl | 31 +++++++++++++++++++------------
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/home/linux.nix b/home/linux.nix
index f095986..179d5ef 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -22,7 +22,7 @@
     swaybg
     xwayland-satellite
     nerd-fonts.victor-mono
-    work-sans
+    adwaita-fonts
     bodoni-moda
     reversal-icon-theme
     fnm
@@ -47,7 +47,7 @@
     antialiasing = true;
     defaultFonts = {
       monospace = [ "VictorMono Nerd Font" ];
-      sansSerif = ["Work Sans"];
+      sansSerif = ["Adwaita Sans"];
       serif = ["Bodoni Moda"];
     };
   };
@@ -56,17 +56,17 @@
     enable = true;
     colorScheme = "dark";
     font = {
-      package = pkgs.work-sans;
-      name = "Work Sans";
-      size = 10;
+      package = pkgs.adwaita-fonts;
+      name = "Adwaita Sans";
+      size = 12;
     };
     iconTheme = {
       package = pkgs.reversal-icon-theme;
-      name = "Reversal";
+      name = "reversal-icon-theme";
     };
     cursorTheme = {
       package = pkgs.bibata-cursors;
-      name = "Bibata Ice";
+      name = "Bibata-Modern-Ice";
       size = 24;
     }; 
   };
diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index 4fa1e48..358ebd9 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -121,7 +121,7 @@
       set hn (prompt_hostname)
       set fish_cursor_default     block      blink
 
-      fish_vi_keybindings insert
+      fish_vi_key_bindings insert
 
       # Custom Colorscheme
       set --universal fish_color_autosuggestion brblack # autosuggestions
diff --git a/modules/wm/niri/config.kdl b/modules/wm/niri/config.kdl
index ecd93b7..e9b8f45 100644
--- a/modules/wm/niri/config.kdl
+++ b/modules/wm/niri/config.kdl
@@ -66,6 +66,13 @@ output "DP-3" {
     position x=0 y=0
 }
 
+cursor {
+    x-cursor-theme "Bibata-Modern-Ice"
+    x-cursor-size 24
+    hide-when-typing
+    hide-after-inactive-ms 1000
+}
+
 layout {
     gaps 8
 
@@ -268,11 +275,11 @@ binds {
     Mod+Shift+Slash { show-hotkey-overlay; }
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
-    Super+Enter hotkey-overlay-title="Open a terminal" { spawn "wezterm"; }
-    Super+Space hotkey-overlay-title="Launcher" { spawn "fuzzel"; }
-    Super+B hotkey-overlay-title="Browser" { spawn "firefox"; }
-    Super+M hotkey-overlay-title="System Monitor" { spawn "wezterm start -- btop"; }
-    Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
+    Mod+Return hotkey-overlay-title="Open a terminal" { spawn "wezterm"; }
+    Mod+Space hotkey-overlay-title="Launcher" { spawn "fuzzel"; }
+    Mod+B hotkey-overlay-title="Browser" { spawn "firefox"; }
+    Mod+M hotkey-overlay-title="System Monitor" { spawn "wezterm start -- btop"; }
+    Mod+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
 
     // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc.
     // Note: the entire command goes as a single argument. It's passed verbatim to `sh -c`.
@@ -304,8 +311,8 @@ binds {
     Mod+Up    { focus-window-up; }
     Mod+Right { focus-column-right; }
     Mod+H     { focus-column-left; }
-    Mod+J     { focus-window-down; }
-    Mod+K     { focus-window-up; }
+    Mod+J     { focus-window-or-workspace-down; }
+    Mod+K     { focus-window-or-workspace-up; }
     Mod+L     { focus-column-right; }
 
     Mod+Ctrl+Left  { move-column-left; }
@@ -314,11 +321,6 @@ binds {
     Mod+Ctrl+Right { move-column-right; }
     Mod+Ctrl+H     { move-column-left; }
     Mod+Ctrl+L     { move-column-right; }
-
-    // Alternative commands that move across workspaces when reaching
-    // the first or last window in a column.
-    Mod+J     { focus-window-or-workspace-down; }
-    Mod+K     { focus-window-or-workspace-up; }
     Mod+Ctrl+J     { move-window-down-or-to-workspace-down; }
     Mod+Ctrl+K     { move-window-up-or-to-workspace-up; }
 
@@ -518,3 +520,8 @@ binds {
     // moving the mouse or pressing any other key.
     Mod+Shift+P { power-off-monitors; }
 }
+
+xwayland-satellite {
+    // off
+    path "xwayland-satellite"
+}