Update old options to new formats

machines/SteamDeck/configuration.nix

@@ -45,7 +45,7 @@
       enable = true;
     };
   };
-  services.xserver.displayManager.sddm.enable = lib.mkForce false;
+  services.displayManager.sddm.enable = lib.mkForce false;
 
   # Enable bluetooth
   hardware.bluetooth = {

machines/WinMax2/configuration.nix

@@ -69,8 +69,8 @@
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-  services.xserver = {
-    xkb.layout = lib.mkForce "us";
+  services = {
+    xserver.xkb.layout = lib.mkForce "us";
     displayManager.sddm.settings = {
       General.GreeterEnvironment = "QT_SCREEN_SCALE_FACTORS=2";
     };

roles/kde/plasma.nix

@@ -49,10 +49,12 @@
     '';
   };
 in {
-  services.xserver = {
-    # Enable the Plasma 5 Desktop Environment
-    desktopManager.plasma5.enable = true;
+  services = {
     displayManager.defaultSession = "plasmawayland";
+    xserver = {
+      # Enable the Plasma 5 Desktop Environment
+      desktopManager.plasma5.enable = true;
+    };
   };
 
   qt.enable = true;

roles/kde/sddm.nix

@@ -3,7 +3,7 @@
   pkgs,
   ...
 }: let
-  currentTheme = config.services.xserver.displayManager.sddm.theme;
+  currentTheme = config.services.displayManager.sddm.theme;
 
   sddm-sugar-candy = pkgs.stdenv.mkDerivation {
     pname = "sddm-sugar-candy";
@@ -43,11 +43,11 @@
   };
 in {
   # Enable SDDM.
-  services.xserver.displayManager.sddm = {
+  services.displayManager.sddm = {
     enable = true;
     theme = "sugar-candy";
     settings = {
-      General = {Numlock = "on";};
+      General = {Numlock = "off";};
       Theme = {CursorTheme = "Breeze_Snow";};
     };
   };