diff --git a/nixos/features/nvidia-no-vrr.nix b/nixos/features/nvidia-no-vrr.nix
index 8082209..d377f96 100644
--- a/nixos/features/nvidia-no-vrr.nix
+++ b/nixos/features/nvidia-no-vrr.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, config, ... }:
 let
   nvidia = config.hardware.nvidia.package;
   vrr-off = pkgs.writeScriptBin "vrr-off" ''
@@ -15,9 +15,9 @@ in {
       };
       wantedBy = [ "graphical-session.target" ];
     };
-  };
 
-  services.xserver.displayManager.setupCommands = ''
-    ${vrr-off}/bin/vrr-off
-  '';
+    services.xserver.displayManager.setupCommands = ''
+      ${vrr-off}/bin/vrr-off
+    '';
+  };
 }
diff --git a/nixos/features/nvidia.nix b/nixos/features/nvidia.nix
index a0837b3..0ae84f5 100644
--- a/nixos/features/nvidia.nix
+++ b/nixos/features/nvidia.nix
@@ -20,6 +20,8 @@
   ];
 
   services.xserver.videoDrivers = ["nvidia"];
+  services.displayManager.sddm.wayland.enable = lib.mkForce false;
+  services.xserver.enable = true;
 
   hardware.nvidia = {
     modesetting.enable = true;
diff --git a/nixos/features/plasma6.nix b/nixos/features/plasma6.nix
index d8fc86e..84f4987 100644
--- a/nixos/features/plasma6.nix
+++ b/nixos/features/plasma6.nix
@@ -1,7 +1,4 @@
-{ inputs, ... }: {
-  # imports = [
-  #   inputs.kde2nix.nixosModules.plasma6
-  # ];
+{ lib, ... }: {
 
   services.desktopManager = {
     plasma6.enable = true;
@@ -10,7 +7,7 @@
   services.displayManager = {
     sddm = {
       enable = true;
-      wayland.enable = true;
+      wayland.enable = lib.mkDefault true;
     };
   };
 }
diff --git a/nixos/hosts/aerial/default.nix b/nixos/hosts/aerial/default.nix
index 8384e76..f5b58de 100644
--- a/nixos/hosts/aerial/default.nix
+++ b/nixos/hosts/aerial/default.nix
@@ -37,8 +37,4 @@
 
   networking.firewall.allowedTCPPorts = [ 42069 8000 ];
   networking.firewall.allowedUDPPorts = [ 42069 ];
-
-  # services.xserver.displayManager.setupCommands = ''
-  #   nvidia-settings -a AllowVRR=0
-  # '';
 }