diff --git a/base/apollo/configuration.nix b/base/apollo/configuration.nix
index b5cffe2..437992c 100644
--- a/base/apollo/configuration.nix
+++ b/base/apollo/configuration.nix
@@ -178,6 +178,7 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666
     ddcutil
     xrizer
     wayvr-dashboard
+    xwayland-satellite
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/home/niri.nix b/home/niri.nix
index 3615956..07466f9 100644
--- a/home/niri.nix
+++ b/home/niri.nix
@@ -285,7 +285,7 @@
       spawn-at-startup = [
         {command = ["waybar"];}
         {command = ["xwayland-satellite"];}
-        {command = if !vars.isTough then ["swaybg" "-m" "fill" "-i" "/home/alyx/.config/nixos/assets/scenes.jpg"] else ["swaybg" "-m" "fill" "-i" "/home/alyx/.config/nixos/assets/scenes.jpg"];}
+        {command = if vars.user == "alyx" then ["swaybg" "-m" "fill" "-i" "/home/${vars.user}/.config/nixos/assets/scenes.jpg"] else ["swaybg" "-m" "fill" "-i" "/home/${vars.user}/.config/nixos/assets/scenes.jpg"];}
 	{command = ["udiskie" "--appindicator"];}
         {command = [ "systemctl" "--user" "restart" "xdg-desktop-portal-gnome.service"];}
       ];