roles/gaming/programs/default.nix

@@ -8,6 +8,6 @@
   ];
   environment.systemPackages = with pkgs; [
     heroic
-    prismlauncher-qt5
+    prismlauncher
   ];
 }

roles/kde/plasma.nix

@@ -19,21 +19,6 @@
     };
   };
 
-  # Make custom packages
-  breezeTint = pkgs.stdenv.mkDerivation {
-    name = "breeze-tint";
-    src = "${pkgs.breeze-qt5}";
-    patches = [./patches/BreezeTint.patch];
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/share/color-schemes/
-      cp -r share/color-schemes/* $out/share/color-schemes/
-
-      runHook postInstall
-    '';
-  };
-
   # /etc/xdg is not read by plasma, so to change the default settings you need to put them in a package
   plasmaDefaults = pkgs.stdenv.mkDerivation {
     name = "toast-plasma-defaults";
@@ -49,21 +34,16 @@
     '';
   };
 in {
-  services = {
-    displayManager.defaultSession = "plasmawayland";
-    xserver = {
-      # Enable the Plasma 5 Desktop Environment
-      desktopManager.plasma5.enable = true;
-    };
-  };
+  # Enable the Plasma 6 Desktop Environment
+  services.desktopManager.plasma6.enable = true;
 
   qt.enable = true;
 
   # GTK apps need dconf to grab the correct theme on Wayland
   programs.dconf.enable = true;
 
-  # Install the patched Breeze color schemes as well as the plasma default configs
-  environment.systemPackages = [breezeTint plasmaDefaults];
+  # Install the plasma default configs
+  environment.systemPackages = [plasmaDefaults];
 
   # Plasma configs should be on all users
   home-manager.sharedModules = [
@@ -82,15 +62,15 @@ in {
         enable = true;
         # Most apps are dark, so a white cursor is easier to spot
         cursorTheme = {
-          package = pkgs.breeze-qt5;
-          name = "Breeze_Snow";
+          package = pkgs.kdePackages.breeze;
+          name = "Breeze_Light";
         };
         iconTheme = {
-          package = pkgs.breeze-icons;
+          package = pkgs.kdePackages.breeze-icons;
           name = "breeze-dark";
         };
         theme = {
-          package = pkgs.breeze-gtk;
+          package = pkgs.kdePackages.breeze-gtk;
           name = "Breeze";
         };
         # Gtk2 doesn't have a dark mode, so I just tell gtk 3 and 4 to use the dark variant
@@ -110,7 +90,7 @@ in {
         enable = true;
         workspace = {
           clickItemTo = "select";
-          cursorTheme = "Breeze_Snow";
+          cursorTheme = "Breeze_Light";
           iconTheme = "breeze-dark";
           lookAndFeel = "Catppuccin-Mocha-Mauve";
           theme = "default";

roles/kde/sddm.nix

@@ -45,12 +45,12 @@ in {
   # Enable SDDM.
   services.displayManager.sddm = {
     enable = true;
-    theme = "sugar-candy";
+    # theme = "sugar-candy";
     settings = {
       General = {Numlock = "off";};
       Theme = {CursorTheme = "Breeze_Snow";};
     };
   };
-
-  environment.systemPackages = [sddm-sugar-candy customcfg];
+  # Sugar candy doesn't seem to work on qt6 :(
+  # environment.systemPackages = [sddm-sugar-candy customcfg];
 }