diff --git a/flake.lock b/flake.lock
index 31f5b08b..a41c4d7b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -907,6 +907,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_9": {
+      "locked": {
+        "lastModified": 1722630782,
+        "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": [
@@ -1021,7 +1037,8 @@
         "home-manager": "home-manager",
         "niri": "niri",
         "nixd": "nixd",
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_8",
+        "xwayland-satellite-flake": "xwayland-satellite-flake"
       }
     },
     "systems": {
@@ -1114,6 +1131,24 @@
         "repo": "xwayland-satellite",
         "type": "github"
       }
+    },
+    "xwayland-satellite-flake": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_9"
+      },
+      "locked": {
+        "lastModified": 1722945455,
+        "narHash": "sha256-Rvc6wTyOVIFr9Euxxomw1VS7rLyj7g/W7xs4NKmdl0s=",
+        "owner": "cspark-development",
+        "repo": "xwayland-satellite-flake",
+        "rev": "4e1728ede8200e70809b42601693cb0c7ff41482",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cspark-development",
+        "repo": "xwayland-satellite-flake",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 1d0d007c..39a423ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,10 @@
 	nixd = {
 		url = "github:nix-community/nixd";
 	};
- 
+
+	xwayland-satellite-flake = {
+		url = "github:cspark-development/xwayland-satellite-flake";
+	};
 
   };
 
diff --git a/modules/nixos/cspark-desktop-niri/home.nix b/modules/nixos/cspark-desktop-niri/home.nix
index e7fd8900..b8824ab3 100644
--- a/modules/nixos/cspark-desktop-niri/home.nix
+++ b/modules/nixos/cspark-desktop-niri/home.nix
@@ -36,6 +36,7 @@ in
                   mako &
                   swaybg -i ${config.home.homeDirectory}/Pictures/Wallpapers/ourdream.png &
                   wlsunset -l 51.5 -L 0.1 &
+      		  xwayland-satellite & # Xwayland support via xwayland-satellite-flake
         '')
 	(writeShellScriptBin "fuzzel-pass"
 	''
@@ -78,6 +79,9 @@ fi
       MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";
+
+      # Xwayland support via xwayland-satellite-flake
+      DISPLAY = ":0";
     };
 
     # Start sway after login if on TTY1 (Default Linux TTY upon boot/login)
diff --git a/modules/nixos/cspark-desktop-niri/module.nix b/modules/nixos/cspark-desktop-niri/module.nix
index e26c6aab..1dd6404f 100644
--- a/modules/nixos/cspark-desktop-niri/module.nix
+++ b/modules/nixos/cspark-desktop-niri/module.nix
@@ -31,6 +31,7 @@ in
       wlprop # Clone of X11 xprop for wayland (To get window class names etc)
       wev # Clone of X11 xev for wayland
       waybar # Status bar
+      xwayland-satellite # Xwayland support via xwayland-satellite-flake
 
       swayimg # Image viewer
       lxqt.pcmanfm-qt # File Manager
@@ -122,6 +123,9 @@ in
       MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";
+
+      # Xwayland support via xwayland-satellite-flake
+      DISPLAY = ":0";
     };
     environment.variables = {
       TERM = "foot";
@@ -135,6 +139,9 @@ in
       MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";
+
+      # Xwayland support via xwayland-satellite-flake
+      DISPLAY = ":0";
     };
     
   };