diff --git a/desktop/plasma.nix b/desktop/plasma.nix
index 1d7ccb2..9e748fc 100644
--- a/desktop/plasma.nix
+++ b/desktop/plasma.nix
@@ -1,52 +1,62 @@
 { config, pkgs, lib, home-manager, ... }:
 
 {
+  services.xserver.enable = true;
 
-    services.xserver.enable = true;
-    services.displayManager.sddm.enable = true;
-    services.xserver.displayManager.lightdm.enable = false;
-    services.desktopManager.plasma6.enable = true;
-    environment.plasma6.excludePackages = with pkgs.kdePackages; [
-      khelpcenter
-    ];
+  # Use GDM because SDDM and LightDM suck.
+  services.xserver.displayManager = {
+    gdm.enable = true;
+    lightdm.enable = false;
+  };
 
-    programs.dconf.enable = true;
-    programs.kdeconnect.enable = true;  
-    hardware.bluetooth.enable = true;
-    
-    environment.systemPackages = with pkgs; [
-      kdePackages.spectacle
-      arc-theme        # Desktop theme
-      pinentry         # GUI pinentry for GPG
-      tigervnc         # VNC client/server
-      firefox          # Web browser
-    ];
+  # New-style SDDM option name (explicitly disabled)
+  services.displayManager.sddm.enable = false;
 
-    # GNUPG Stuff 
-    services.pcscd.enable = true;
-    programs.gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
+  # Default to Plasma (Wayland). Use "plasmax11" for X11.
+  services.displayManager.defaultSession = "plasma";
 
-    # RDP
-    services.xrdp.enable = true;
-    services.xrdp.defaultWindowManager = "startplasma-x11";
-    networking.firewall.allowedTCPPorts = [ 3389 ];
-    services.xrdp.openFirewall = true;
+  services.desktopManager.plasma6.enable = true;
 
-    # Custom Keyboard Shortcuts for Plasma 6
-    environment.etc."kglobalshortcutsrc".text = ''
-      [khotkeys]
-      Ctrl+Alt+Delete=Lock Session,none,Lock the session
-    '';
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [
+    khelpcenter
+  ];
 
-    # stop PackageKit polling
-    services.packagekit.enable = false;
+  programs.dconf.enable = true;
+  programs.kdeconnect.enable = true;
+  hardware.bluetooth.enable = true;
+  
+  environment.systemPackages = with pkgs; [
+    kdePackages.spectacle
+    arc-theme        # Desktop theme
+    pinentry         # GUI pinentry for GPG
+    tigervnc         # VNC client/server
+    firefox          # Web browser
+  ];
 
-    # remove the Discover GUI + tray notifier
-    environment.plasma5.excludePackages = with pkgs.libsForQt5; [
-      discover
-    ];
+  # GNUPG Stuff 
+  services.pcscd.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
 
+  # RDP
+  services.xrdp.enable = true;
+  services.xrdp.defaultWindowManager = "startplasma-x11";
+  networking.firewall.allowedTCPPorts = [ 3389 ];
+  services.xrdp.openFirewall = true;
+
+  # Custom Keyboard Shortcuts for Plasma 6
+  environment.etc."kglobalshortcutsrc".text = ''
+    [khotkeys]
+    Ctrl+Alt+Delete=Lock Session,none,Lock the session
+  '';
+
+  # stop PackageKit polling
+  services.packagekit.enable = false;
+
+  # remove the Discover GUI + tray notifier
+  environment.plasma5.excludePackages = with pkgs.libsForQt5; [
+    discover
+  ];
 }
diff --git a/flake.lock b/flake.lock
index 737db6c..4d354a3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -166,11 +166,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1764283894,
-        "narHash": "sha256-5BWYZDmJKwUGxhY+43obUZItkAL6rm3xkvBYdltUWz4=",
+        "lastModified": 1764607679,
+        "narHash": "sha256-1Bsem6lhJWMQmkLIml5oKOL+z1dYMewZ6ql0K35Y3TA=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "7e1e24fea615503a3cc05218c12b06c1b6cabdc7",
+        "rev": "f82a8630d7a51dab4cc70924f500bf70e723db12",
         "type": "github"
       },
       "original": {
@@ -383,11 +383,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1764328224,
-        "narHash": "sha256-hFyF1XQd+XrRx7WZCrGJp544dykexD8Q5SrJJZpEQYg=",
+        "lastModified": 1764440730,
+        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d62603a997438e19182af69d3ce7be07565ecad4",
+        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
         "type": "github"
       },
       "original": {
@@ -415,11 +415,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1764242076,
-        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
+        "lastModified": 1764517877,
+        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
+        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
         "type": "github"
       },
       "original": {
@@ -430,11 +430,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1764316264,
-        "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
+        "lastModified": 1764560356,
+        "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
+        "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
         "type": "github"
       },
       "original": {