diff --git a/flake.nix b/flake.nix
index f939b9d..61a0f34 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,10 +48,9 @@
           inherit (inputs) wrappers;
           pkgs = prev;
         };
-        niphas-niri = import packages/niri {
+        niphas-niri = import packages/niri.nix {
           inherit (inputs) wrappers;
           pkgs = final;
-          lib = inputs.nixpkgs.lib;
         };
         niphas-wallpaper =
           prev.runCommand "niphas-wallpaper.png"
@@ -62,6 +61,10 @@
               # solid white
               convert -size 1920x1080 xc:white $out
             '';
+
+        niphas-set-wallpaper = prev.writers.writeDashBin "niphas-set-wallpaper" ''
+          ${lib.getExe prev.swaybg} --mode fill --image ${toString final.niphas-wallpaper}
+        '';
         vimv = prev.callPackage packages/vimv.nix { };
       };
 
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 87688e7..0349a26 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -19,6 +19,7 @@
     pkgs.niphas-file-browser
     pkgs.niphas-terminal
     pkgs.niphas-web-browser
+    pkgs.niphas-set-wallpaper
     pkgs.niphas-runner
     pkgs.niphas-locker
   ];
diff --git a/packages/niri/default.nix b/packages/niri.nix
similarity index 97%
rename from packages/niri/default.nix
rename to packages/niri.nix
index 010b88d..a285798 100644
--- a/packages/niri/default.nix
+++ b/packages/niri.nix
@@ -1,7 +1,6 @@
 {
   wrappers,
   pkgs,
-  lib,
   screenshotPath ? null,
   geolocation ? [
     52.5244
@@ -9,6 +8,7 @@
   ],
 }:
 let
+  lib = pkgs.lib;
   colors = {
     active-color = "#7fc8ff";
     inactive-color = "#505050";
@@ -60,13 +60,7 @@ let
           };
           spawn-at-startup = [
             (lib.getExe pkgs.niphas-bar)
-          ]
-          ++ lib.optional (pkgs ? niri-wallpaper) [
-            (lib.getExe pkgs.swaybg)
-            "--mode"
-            "fill"
-            "--image"
-            (toString pkgs.niphas-wallpaper)
+            (lib.getExe pkgs.niphas-set-wallpaper)
           ]
           ++ lib.optional (geolocation != null) (
             let