diff --git a/flake.nix b/flake.nix
index 6926d06..6606808 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,7 @@
         specialArgs = { inherit inputs; };
         modules = [
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+
           ./hosts/laptop
         ];
       };
@@ -90,3 +91,4 @@
     };
   };
 }
+
diff --git a/modules/home/gui/hyprland/default.nix b/modules/home/gui/hyprland/default.nix
index 5e4fec1..17cbfbe 100644
--- a/modules/home/gui/hyprland/default.nix
+++ b/modules/home/gui/hyprland/default.nix
@@ -38,6 +38,13 @@
         "blueman-applet"
       ];
 
+      env = lib.mkIf (config.host == "xv-desktop") [
+        "LIBVA_DRIVER_NAME,nvidia"
+        "XDG_SESSION_TYPE,wayland"
+        "GBM_BACKEND,nvidia-drm"
+        "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+      ];
+
       "$mod" = "SUPER";
 
       input = {
@@ -86,11 +93,11 @@
         
       ]
       (lib.mkIf (config.host == "xv-desktop") [
-        "1, monitor:DP-2"
-        "2, monitor:DP-2"
-        "3, monitor:DP-2"
-        "4, monitor:DP-2"
-        "5, monitor:DP-2"
+        "1, monitor:DP-1"
+        "2, monitor:DP-1"
+        "3, monitor:DP-1"
+        "4, monitor:DP-1"
+        "5, monitor:DP-1"
         "6, monitor:HDMI-A-1"
         "7, monitor:HDMI-A-1"
         "8, monitor:HDMI-A-1"
diff --git a/modules/home/gui/hyprland/waybar.nix b/modules/home/gui/hyprland/waybar.nix
index a9c75b7..193948a 100644
--- a/modules/home/gui/hyprland/waybar.nix
+++ b/modules/home/gui/hyprland/waybar.nix
@@ -35,6 +35,10 @@
             "DP-10" = [ 1 2 3 4 ];
             "DP-9" = [ 5 6 7 ];
             "eDP-1" = [ 8 9 10 ];
+          })
+          (lib.mkIf (config.host == "xv-desktop") {
+            "DP-1" = [ 1 2 3 4 5 ];
+            "HDMI-A-1" = [ 6 7 8 9 10 ];
           })];
           "format-icons" = {
             "default" = "";
diff --git a/modules/system/cli/podman.nix b/modules/system/cli/podman.nix
index ca51568..3d1718c 100644
--- a/modules/system/cli/podman.nix
+++ b/modules/system/cli/podman.nix
@@ -9,6 +9,8 @@
     defaultNetwork.settings.dns_enabled = true;
   };
 
+  virtualisation.oci-containers.backend = "podman";
+
   environment.systemPackages = with pkgs; [
     dive
     podman-tui
diff --git a/modules/system/hardware/nvidia.nix b/modules/system/hardware/nvidia.nix
index 31ac135..9956bb6 100644
--- a/modules/system/hardware/nvidia.nix
+++ b/modules/system/hardware/nvidia.nix
@@ -34,6 +34,13 @@
     open = false;
     nvidiaSettings = true;
 
-    package = config.boot.kernelPackages.nvidiaPackages.beta;
+    package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      version = "555.58.02";
+      sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
+      sha256_aarch64 = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
+      openSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
+      settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
+      persistencedSha256 = lib.fakeSha256;
+    };
   };
 }