diff --git a/nixos/common/desktops/plasma6/default.nix b/nixos/common/desktops/plasma6/default.nix
index 4f8c97b6..2ca9ae13 100644
--- a/nixos/common/desktops/plasma6/default.nix
+++ b/nixos/common/desktops/plasma6/default.nix
@@ -13,8 +13,8 @@
   # Configure keymap in X11
   services.xserver = {
     enable = true;
-    layout = "us";
-    xkbVariant = "";
+    xkb.layout = "us";
+    xkb.variant = "";
     autorun = true;
   };
   services.desktopManager.plasma6.enable = true;
@@ -28,7 +28,7 @@
   ];
 
   services.xrdp.defaultWindowManager = "startplasma-x11";
-  services.xserver.displayManager.sddm.settings.General.DisplayServer = "x11-user";
+  services.displayManager.sddm.settings.General.DisplayServer = "x11-user";
 
   systemd.user.services = {
     "get-theme-times" = {
diff --git a/nixos/hosts/steamdeck/default.nix b/nixos/hosts/steamdeck/default.nix
index 58ff6ddd..5eaa3bbf 100644
--- a/nixos/hosts/steamdeck/default.nix
+++ b/nixos/hosts/steamdeck/default.nix
@@ -1,6 +1,6 @@
 { inputs, config, lib, username, pkgs, ... }: {
   imports = [ 
-    inputs.jovian.nixosModules
+    # inputs.jovian.nixosModules
     ./disks.nix
     ../../common/modules/boot.nix
     ../../common/services/tailscale-autoconnect.nix
@@ -20,17 +20,17 @@
   # Set the networking hostname:
   networking.hostName = "steamdeck";
 
-  jovian = {
-    decky-loader.enable = true;
-    steam.enable = true;
-    steam.autoStart = true; 
-    steam.user = username;
-    steamos.useSteamOSConfig = true;
-    devices.steamdeck.enable = true;
-    hardwarhas.amd.gpu = true;
-  };
-  environment.systemPackages = with pkgs; [
-    jupiter-dock-updater-bin
-    steamdeck-firmware
-  ];
+#  jovian = {
+#    decky-loader.enable = true;
+#    steam.enable = true;
+#    steam.autoStart = true; 
+#    steam.user = username;
+#    steamos.useSteamOSConfig = true;
+#    devices.steamdeck.enable = true;
+#    hardwarhas.amd.gpu = true;
+#  };
+  # environment.systemPackages = with pkgs; [
+  #  jupiter-dock-updater-bin
+  #  steamdeck-firmware
+  #];
 }