diff --git a/home/linux.nix b/home/linux.nix
index 362404e..ab0b7ac 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -19,7 +19,6 @@
     just
     mmv-go
     zoxide
-    swaybg
     xwayland-satellite
     nerd-fonts.victor-mono
     adwaita-fonts
diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix
index 01370f0..e7e4fd2 100644
--- a/hosts/dnsc-machine/default.nix
+++ b/hosts/dnsc-machine/default.nix
@@ -129,6 +129,7 @@
     fish
     firefox # TODO use zen browser instead
     pavucontrol
+    swaybg
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -183,6 +184,21 @@
   # Tailscale
   services.tailscale.enable = true;
 
+  # Custom systemd services
+  systemd.user.services.wallpaper = {
+    enable = true;
+    description = "Sets the wallpaper with swaybg";
+    unitConfig = {
+      PartOf = "graphical-session.target";
+      After = "graphical-session.target";
+      Requisite = "graphical-session.target";
+    };
+    serviceConfig = {
+      ExecStart = "${pkgs.swaybg} -o * -i %h/Pictures/Wallpapers/cyberpunk.jpg -m fill";
+      Restart = "on-failure";
+    };
+  };
+
   # Environment & session variables
   environment.variables.EDITOR = "nvim";
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index 5fbb746..747c833 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -183,8 +183,8 @@ layout {
 }
 
 // STARTUP
-// spawn-at-startup "waybar"
-spawn-sh-at-startup "swaybg -o * -i ~/Pictures/Wallpapers/cyberpunk.jpg -m fill"
+// spawn-at-startup ""
+// spawn-sh-at-startup ""
 
 hotkey-overlay {
     // Uncomment this line to disable the "Important Hotkeys" pop-up at startup.