diff --git a/flake.nix b/flake.nix
index 754ec2c..69aed27 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,16 @@
     # Jovian
     jovian = {
       url = "github:jovian-experiments/jovian-nixos";
-        inputs.nixpkgs.follows = "unstable";
+      inputs.nixpkgs.follows = "unstable";
+    };
+    # Breezy XR for Jovian
+    xr-linux = {
+      url = "github:shymega/XRLinuxDriver?ref=shymega/nix-flake-support";
+      inputs.nixpkgs.follows = "unstable";
+    };
+    breezy = {
+      url = "github:shymega/breezy-desktop?ref=shymega/add-nix-flake-support";
+      inputs.nixpkgs.follows = "unstable";
     };
     # OSX
     darwin = {
@@ -107,7 +116,9 @@
     , homebrew-cask
     , sourcegraph-src-cli-cask
     , sg-nvim
-  , jovian
+    , jovian
+    , breezy
+    , xr-linux
     , ...
     }@inputs:
     let
@@ -164,16 +175,6 @@
         ];
       });
 
-      unstableFor = forAllSystems (system: import unstable {
-        inherit system;
-        config = {
-          allowUnfree = true;
-	};
-        overlays = [
-          nur.overlay
-	  ];
-	  });
-
       # for when space matters
       litePkgsFor = forAllSystems (system: import nixpkgs {
         inherit system;
@@ -187,6 +188,19 @@
         ];
       });
 
+      # for deck
+      deckPkgsFor = forAllSystems (system: import unstable {
+        inherit system;
+        config = {
+          allowUnfree = true;
+        };
+        overlays = [
+          breezy.overlays.default
+          xr-linux.overlays.default
+          nur.overlay
+        ];
+      });
+
       darwinSystems = [ "aarch64-darwin" "x86_64-darwin" ];
     in
     {
@@ -337,10 +351,10 @@
           ];
         };
 
-        deck = unstable.lib.nixosSystem rec {
+        deck = unstable.lib.nixoxSystem rec {
           specialArgs = { inherit inputs self; };
           system = "x86_64-linux";
-	  pkgs = unstableFor.${system};
+          pkgs = deckPkgsFor.${system};
           modules = [
             ./hosts/deck
             jovian.nixosModules.default
diff --git a/hosts/deck/default.nix b/hosts/deck/default.nix
index fcf8c0e..dca448f 100644
--- a/hosts/deck/default.nix
+++ b/hosts/deck/default.nix
@@ -35,6 +35,21 @@
   jovian.devices.steamdeck.enable = true;
   jovian.steam.user = "anish";
   jovian.steam.autoStart = true;
+<<<<<<< Updated upstream
   jovian.steam.desktopSession = "gnome";
   jovian.decky-loader.enable = true;
+=======
+  jovian.steam.desktopSession = "none+bspwm";
+
+  # Install XR drivers
+  environment.systemPackages = with pkgs; [
+    xrlinuxdriver
+    breezy-gnome
+  ];
+
+  services.udev.packages = with pkgs; [
+    xrlinuxdriver
+  ];
+
+>>>>>>> Stashed changes
 }