From bccc720ab16f8fe6ee311e6893e348f2ef0c8368 Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Mon, 3 Mar 2025 19:21:32 -0800
Subject: [PATCH 1/3] feat(home/xwayland-satellite): Write module

---
 .../wayland/xwayland-satellite/default.nix    | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 modules/home/programs/wayland/xwayland-satellite/default.nix

diff --git a/modules/home/programs/wayland/xwayland-satellite/default.nix b/modules/home/programs/wayland/xwayland-satellite/default.nix
new file mode 100644
index 0000000..6df4ab1
--- /dev/null
+++ b/modules/home/programs/wayland/xwayland-satellite/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.marleyos.programs.xwayland-satellite;
+in {
+  options.marleyos.programs.xwayland-satellite.enable = lib.mkEnableOption "xwayland-satellite";
+
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      xwayland-satellite
+    ];
+
+    systemd.user.services."xwayland-satellite" = {
+      Unit = {
+        Description = "Xwayland outside your Wayland";
+        BindsTo = ["xdg-desktop-autostart.target"];
+        PartOf = ["xdg-desktop-autostart.target"];
+        After = ["xdg-desktop-autostart.target"];
+        Requisite = ["xdg-desktop-autostart.target"];
+      };
+
+      Service = {
+        Type = "notify";
+        NotifyAccess = "all";
+        ExecStart = lib.getExe pkgs.xwayland-satellite;
+        StandardOutput = "journal";
+      };
+
+      Install = {
+        WantedBy = ["xdg-desktop-autostart.target"];
+      };
+    };
+
+    home.sessionVariables.DISPLAY = ":0";
+  };
+}

From 41742c1ad041ee7a385c534f9d039caa47dd4428 Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Mon, 3 Mar 2025 19:22:07 -0800
Subject: [PATCH 2/3] fix(home/swaybg): Make it so the systemd unit can
 actually succeed at boot

---
 modules/home/services/swaybg/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/home/services/swaybg/default.nix b/modules/home/services/swaybg/default.nix
index e2df7e1..a5c2868 100644
--- a/modules/home/services/swaybg/default.nix
+++ b/modules/home/services/swaybg/default.nix
@@ -15,14 +15,14 @@ in {
 
     systemd.user.services.swaybg = {
       Install = {
-        WantedBy = ["graphical-session.target"];
+        WantedBy = ["xdg-desktop-autostart.target"];
       };
 
       Unit = {
         Description = "Wallpaper tool for Wayland compositors";
         Documentation = ["man:swaybg(1)"];
-        After = ["graphical-session-pre.target"];
-        PartOf = ["graphical-session.target"];
+        After = ["graphical-session.target"];
+        PartOf = ["xdg-desktop-autostart.target"];
       };
 
       Service = {
@@ -31,6 +31,9 @@ in {
         ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -SIGUSR2 $MAINPID";
         KillMode = "mixed";
         Restart = "on-failure";
+        RestartSec = "1s";
+        RestartMaxDelaySec = "30s";
+        RestartSteps = 10;
       };
     };
   };

From df5d11ceef6cd69b3ca23f29a9bfcc898194865c Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Mon, 3 Mar 2025 19:29:13 -0800
Subject: [PATCH 3/3] feat(home/niri): Setup xwayland-satellite on niri

---
 modules/home/wayland/niri/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/home/wayland/niri/default.nix b/modules/home/wayland/niri/default.nix
index 20ed7b4..b540e95 100644
--- a/modules/home/wayland/niri/default.nix
+++ b/modules/home/wayland/niri/default.nix
@@ -23,6 +23,7 @@ in {
         waybar.enable = true;
         wlogout.enable = true;
         fuzzel.enable = true;
+        xwayland-satellite.enable = true;
       };
       services = {
         swaybg.enable = true;
@@ -40,6 +41,11 @@ in {
         prefer-no-csd = true;
         hotkey-overlay.skip-at-startup = true;
 
+        environment = {
+          # For some reason this won't set properly from home.sessionVariables.
+          DISPLAY = ":0";
+        };
+
         ### Startup Programs ###
         spawn-at-startup = let
           inherit (config.marleyos) apps;