niri: init

Author: debugloop

flake.lock

@@ -25,6 +25,9 @@
     nvim-blink-cmp = {
       url = "github:Saghen/blink.cmp";
     };
+    niri = {
+      url = "github:sodiboo/niri-flake";
+    };
     wunschkonzert = {
       url = "github:debugloop/wunschkonzert";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -103,6 +106,7 @@
               inputs.neovim-nightly-overlay.overlays.default
             ];
           })
+          inputs.niri.nixosModules.niri
         ];
       };
 

flake.nix

@@ -33,7 +33,7 @@
       set fish_cursor_visual block
 
       # connect to gnome-keyring in graphical terminals
-      if test -n "$DISPLAY"
+      if test -n "$WAYLAND_DISPLAY"
         for env_var in (gnome-keyring-daemon --start 2>/dev/null);
           set -x (echo $env_var | string split "=")
         end
@@ -42,7 +42,7 @@
     loginShellInit = ''
       # start wm on tty1
       if test (tty) = /dev/tty1
-        sway
+        alias startx=exec niri-session
       end
     '';
     shellAbbrs = {

home/fish.nix

@@ -5,7 +5,7 @@
 }: {
   imports = [
     # our windowmanager
-    ./sway.nix
+    ./niri.nix
     # auxiliary services
     ./avizo.nix
     ./clipman.nix