Update to NixOS 24.05

common/pc/default.nix

@@ -6,7 +6,7 @@ in
 {
   imports = [
     ./kde.nix
-    ./xfce.nix
+    # ./xfce.nix
     ./yubikey.nix
     ./chromium.nix
     #    ./firefox.nix
@@ -41,7 +41,6 @@ in
       mpv
       nextcloud-client
       signal-desktop
-      minecraft
       gparted
       libreoffice-fresh
       thunderbird
@@ -70,7 +69,7 @@ in
     ];
     # Printer discovery
     services.avahi.enable = true;
-    services.avahi.nssmdns = true;
+    services.avahi.nssmdns4 = true;
 
     programs.file-roller.enable = true;
 

common/pc/kde.nix

@@ -5,12 +5,9 @@ let
 in
 {
   config = lib.mkIf cfg.enable {
-    # kde plasma
-    services.xserver = {
-      enable = true;
-      desktopManager.plasma5.enable = true;
-      displayManager.sddm.enable = true;
-    };
+    services.displayManager.sddm.enable = true;
+    services.displayManager.sddm.wayland.enable = true;
+    services.desktopManager.plasma6.enable = true;
 
     # kde apps
     nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
@@ -20,7 +17,5 @@ in
       # plasma5Packages.kmail-account-wizard
       kate
     ];
-
-    services.xserver.desktopManager.plasma5.useQtScaling = true;
   };
 }

common/pc/spotify.nix

@@ -43,7 +43,6 @@ in
     services.spotifyd.users = [ "googlebot" ];
     users.users.googlebot.packages = with pkgs; [
       spotify
-      spotify-tui
     ];
 
     users.groups.spotifyd = {

common/pc/touchpad.nix

@@ -9,7 +9,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    services.xserver.libinput.enable = true;
-    services.xserver.libinput.touchpad.naturalScrolling = true;
+    services.libinput.enable = true;
+    services.libinput.touchpad.naturalScrolling = true;
   };
 }