From 6834946774e2902c46361491b60983f3ff04c0cc Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Tue, 4 Feb 2025 09:31:59 -0600
Subject: [PATCH] Niri and need to fix a.lyte.dev

---
 flake.nix                            |  1 +
 modules/home-manager/default.nix     |  6 ++++++
 modules/home-manager/niri/config.kdl |  6 ++++--
 nixos/router.nix                     | 21 ++++++++++-----------
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index af4e978..a0ccd92 100644
--- a/flake.nix
+++ b/flake.nix
@@ -497,6 +497,7 @@
               imports = with homeManagerModules; [
                 senpai
                 iex
+                niri
                 cargo
                 firefox-no-tabs
                 linux-desktop-environment-config
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 93eff12..d9d7c23 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -176,6 +176,7 @@
       stateVersion = lib.mkDefault "24.05";
 
       sessionVariables = {
+        TERMINAL = "wezterm";
         EDITOR = "hx";
         VISUAL = "hx";
         PAGER = "less";
@@ -1208,11 +1209,16 @@
   }: {
     home.packages = with pkgs; [
       niri
+      fuzzel
     ];
 
     home.file."${config.xdg.configHome}/niri" = {
       source = config.lib.file.mkOutOfStoreSymlink /etc/nix/flake/modules/home-manager/niri;
     };
+
+    home.file."${config.xdg.configHome}/fuzzel" = {
+      source = config.lib.file.mkOutOfStoreSymlink /etc/nix/flake/modules/home-manager/fuzzel;
+    };
   };
 
   iex = {
diff --git a/modules/home-manager/niri/config.kdl b/modules/home-manager/niri/config.kdl
index 090d250..cb43633 100644
--- a/modules/home-manager/niri/config.kdl
+++ b/modules/home-manager/niri/config.kdl
@@ -214,6 +214,7 @@ layout {
 spawn-at-startup "wezterm"
 spawn-at-startup "firefox"
 spawn-at-startup "mako"
+spawn-at-startup "swayosd-server"
 
 // Uncomment this line to ask the clients to omit their client-side decorations if possible.
 // If the client will specifically ask for CSD, the request will be honored.
@@ -291,7 +292,8 @@ binds {
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
     Mod+T { spawn "wezterm"; }
-    Mod+Space { spawn "tofi-run"; }
+    Mod+Space { spawn "fuzzel"; }
+    Mod+D { spawn "fuzzel --drun"; }
     Super+Alt+L { spawn "swaylock"; }
 
     // You can also use a shell. Do this if you need pipes, multiple commands, etc.
@@ -446,7 +448,7 @@ binds {
     // Mod+Ctrl+1 { move-window-to-workspace 1; }
 
     // Switches focus between the current and the previous workspace.
-    // Mod+Tab { focus-workspace-previous; }
+    Mod+Tab { focus-workspace-previous; }
 
     // Consume one window from the right into the focused column.
     Mod+Comma  { consume-window-into-column; }
diff --git a/nixos/router.nix b/nixos/router.nix
index d0dbc29..612bbe3 100644
--- a/nixos/router.nix
+++ b/nixos/router.nix
@@ -47,23 +47,22 @@
       ip = "192.168.0.9";
       additionalHosts = [
         ".beefcake.lan"
-        "nix.h.lyte.dev"
-        "idm.h.lyte.dev"
-        "git.lyte.dev"
-        "video.lyte.dev"
-        "paperless.h.lyte.dev"
-        "audio.lyte.dev"
         "a.lyte.dev"
+        "atuin.h.lyte.dev"
+        "audio.lyte.dev"
         "bw.lyte.dev"
         "files.lyte.dev"
-        "vpn.h.lyte.dev"
-        "atuin.h.lyte.dev"
-        "grafana.h.lyte.dev"
-        "prometheus.h.lyte.dev"
         "finances.h.lyte.dev"
+        "git.lyte.dev"
+        "grafana.h.lyte.dev"
+        "idm.h.lyte.dev"
         "nextcloud.h.lyte.dev"
+        "nix.h.lyte.dev"
         "onlyoffice.h.lyte.dev"
-        "a.lyte.dev"
+        "paperless.h.lyte.dev"
+        "prometheus.h.lyte.dev"
+        "video.lyte.dev"
+        "vpn.h.lyte.dev"
       ];
     };
   };