diff --git a/system/gnome.nix b/system/gnome.nix
index 6b82916..e662581 100644
--- a/system/gnome.nix
+++ b/system/gnome.nix
@@ -8,18 +8,16 @@
   options.my.gnome.enable = lib.mkEnableOption { };
 
   config = lib.mkIf config.my.gnome.enable {
-    services.xserver = {
+    services.xserver.enable = true;
+    services.displayManager.gdm.enable = true;
+    services.desktopManager.gnome = {
       enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome = {
-        enable = true;
-        # Enable VRR (Variable Refresh Rate)
-        extraGSettingsOverridePackages = with pkgs; [ mutter ];
-        extraGSettingsOverrides = ''
-          [org.gnome.mutter]
-          experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer']
-        '';
-      };
+      # Enable VRR (Variable Refresh Rate)
+      extraGSettingsOverridePackages = with pkgs; [ mutter ];
+      extraGSettingsOverrides = ''
+        [org.gnome.mutter]
+        experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer']
+      '';
     };
 
     # Workaround for https://github.com/NixOS/nixpkgs/issues/103746
diff --git a/system/kde.nix b/system/kde.nix
index 27533ec..4dea6ec 100644
--- a/system/kde.nix
+++ b/system/kde.nix
@@ -11,8 +11,8 @@
     # Enable the X11 windowing system.
     services.xserver.enable = true;
     # Enable the KDE Desktop Environment.
-    services.xserver.displayManager.sddm.enable = true;
-    services.xserver.desktopManager.plasma5.enable = true;
+    services.displayManager.sddm.enable = true;
+    services.desktopManager.plasma6.enable = true;
     # services.xserver.displayManager.autologin.user = "lelgenio";
     programs.dconf.enable = true;
   };