fix(niri): default wallpaper in store

feat(niri): fuzzel_dmenu as derivation

Author: johnrichardrinehart

nixos-modules/desktop/fuzzel_dmenu/fuzzel_dmenu.nix

@@ -0,0 +1,40 @@
+{ stdenv
+, lib
+, makeWrapper
+, niri
+, jq
+, fuzzel
+, coreutils
+, gnugrep
+}:
+
+let
+  buildInputs = [ niri jq fuzzel coreutils gnugrep ];
+in
+stdenv.mkDerivation {
+  pname = "fuzzel_dmenu";
+  version = "0.1.0";
+
+  src = ./fuzzel_dmenu.sh;
+
+  inherit buildInputs;
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontUnpack = true;
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp $src $out/bin/fuzzel_dmenu
+    chmod +x $out/bin/fuzzel_dmenu
+    patchShebangs $out/bin/fuzzel_dmenu
+    wrapProgram $out/bin/fuzzel_dmenu --prefix PATH : ${lib.makeBinPath buildInputs}
+  '';
+
+  meta = with lib; {
+    description = "Fuzzel dmenu script for niri window manager";
+    license = licenses.mit;  # Adjust according to your license
+    platforms = platforms.all;
+    mainProgram = "fuzzel_dmenu";
+  };
+}

nixos-modules/desktop/fuzzel_dmenu/fuzzel_dmenu.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+window_list=$(niri msg --json windows)
+name=$(echo $window_list | jq -r 'map(select(.is_focused | not)) | .[] | "[\(.app_id)(\(.id))]: \(.title)"' | fuzzel --dmenu --width 120)
+id=$(echo $window_list | jq -r '.[] | "[\(.app_id)(\(.id))]: \(.title)", "\(.id)"' | grep -F "$name" -x -A 1 | grep -F "$name" -vx)
+
+niri msg action focus-window --id $id

nixos-modules/desktop/greetd+niri.nix

@@ -54,28 +54,39 @@ in
     services.greetd.settings.default_session.command = "${lib.getExe pkgs.tuigreet}";
     services.greetd.useTextGreeter = true;
 
-    environment.systemPackages = [ pkgs.alacritty pkgs.xwayland-satellite pkgs.fuzzel pkgs.grim pkgs.mako pkgs.slurp pkgs.swaylock pkgs.xwayland-satellite pkgs.satty pkgs.waypaper pkgs.swaybg pkgs.waybar pkgs.brightnessctl pkgs.wlsunset pkgs.wl-clip-persist pkgs.wl-clipboard pkgs.cliphist ];
-
-    environment.etc."niri/config.kdl".source = ./niri.kdl;
+    environment.systemPackages = [
+      pkgs.alacritty
+      pkgs.xwayland-satellite
+      pkgs.fuzzel
+      pkgs.grim
+      pkgs.mako
+      pkgs.slurp
+      pkgs.swaylock
+      pkgs.xwayland-satellite
+      pkgs.satty
+      pkgs.waypaper
+      pkgs.swaybg
+      pkgs.waybar
+      pkgs.brightnessctl
+      pkgs.wlsunset
+      pkgs.wl-clip-persist
+      pkgs.wl-clipboard
+      pkgs.cliphist
+    ];
+
+    environment.etc."niri/config.kdl".source =
+      let
+        fuzzelDmenu = pkgs.callPackage ./fuzzel_dmenu/fuzzel_dmenu.nix { };
+      in
+      (pkgs.replaceVars ./niri.kdl {
+        wallpaper = ../../static/ocean.jpg;
+        fuzzel_dmenu = lib.getExe fuzzelDmenu;
+      }).overrideAttrs
+        (_: {
+          checkPhase = null;
+        });
     environment.etc."xdg/waybar".source = ./waybar;
 
-    systemd.user.services.swaybg = {
-      enable = true;
-      after = [ "graphical-session.target" ];
-      requisite = [ "graphical-session.target" ];
-      partOf = [ "graphical-session.target" ];
-      path = [ pkgs.swaybg ];
-      serviceConfig = {
-        Type = "forking";
-        Restart = "on-failure";
-      };
-      script = ''
-        ${lib.getExe pkgs.waypaper} --fill fill --wallpaper ${../../static/ocean.jpg} --monitor All --backend swaybg &
-      '';
-    };
-
-    services.gnome.gnome-keyring.enable = true;
-
     # Custom PAM config: fingerprint as first factor (rejects bad fingerprints),
     # then mandatory password - applied to greetd, sudo, and TTY logins
     security.pam.services.greetd = {
@@ -94,4 +105,3 @@ in
     };
   };
 }
-

nixos-modules/desktop/niri.kdl

@@ -276,7 +276,7 @@ layout {
 
 // This line starts waybar, a commonly used bar for Wayland compositors.
 spawn-at-startup "waybar"
-spawn-at-startup "waypaper" "--fill" "fill" "--wallpaper" "/home/john/.config/niri/ocean.jpg" "--monitor" "All" "--backend" "swaybg"
+spawn-at-startup "waypaper" "--fill" "fill" "--wallpaper" "@wallpaper@" "--monitor" "All" "--backend" "swaybg"
 spawn-at-startup "wlsunset" "-l" "41.9695" "-L" "-71.1821" "-t" "3000" "-g" ".9"
 spawn-at-startup "wl-paste" "--watch" "cliphist" "store"
 spawn-at-startup "wl-clip-persist" "--clipboard" "regular"
@@ -375,7 +375,7 @@ binds {
     // Suggested binds for running programs: terminal, app launcher, screen locker.
     Mod+T hotkey-overlay-title="Open a Terminal: kitty" { spawn "kitty"; }
     Mod+P hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
-    Mod+D hotkey-overlay-title="Select an Application: fuzzel --dmenu" { spawn "~/test.sh"; }
+    Mod+D hotkey-overlay-title="Select an Application: fuzzel --dmenu" { spawn "@fuzzel_dmenu@"; }
     Super+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.