From 012687565a98ca13bf21485b5938761c8020a026 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 29 Apr 2024 13:56:33 +0200 Subject: [PATCH 1/6] Kde/plasma: update breeze packages --- roles/kde/plasma.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix index f7052e8..13d1156 100644 --- a/roles/kde/plasma.nix +++ b/roles/kde/plasma.nix @@ -82,15 +82,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 -- 2.51.2 From 26798e0356d9b8c41b9e7a206ae9720fa259fd24 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 29 Apr 2024 13:57:43 +0200 Subject: [PATCH 2/6] Kde/plasma: get rid of the custom breeze colorscheme --- roles/kde/plasma.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix index 13d1156..7817573 100644 --- a/roles/kde/plasma.nix +++ b/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"; @@ -62,8 +47,8 @@ in { # 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 = [ -- 2.51.2 From 0be1aa7adc4f306f947cf0318f9092c000275dbf Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 29 Apr 2024 18:55:29 +0200 Subject: [PATCH 3/6] Gaming: use qt6 version of prism launcher --- roles/gaming/programs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gaming/programs/default.nix b/roles/gaming/programs/default.nix index 4148b85..e43a6db 100755 --- a/roles/gaming/programs/default.nix +++ b/roles/gaming/programs/default.nix @@ -8,6 +8,6 @@ ]; environment.systemPackages = with pkgs; [ heroic - prismlauncher-qt5 + prismlauncher ]; } -- 2.51.2 From 3425b0704018123069154dad71f907e19f118090 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 29 Apr 2024 18:59:07 +0200 Subject: [PATCH 4/6] Kde/plasma: upgrade to plasma 6 --- roles/kde/plasma.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix index 7817573..b9d835f 100644 --- a/roles/kde/plasma.nix +++ b/roles/kde/plasma.nix @@ -34,13 +34,8 @@ ''; }; 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; @@ -48,7 +43,7 @@ in { programs.dconf.enable = true; # Install the plasma default configs - environment.systemPackages = [ plasmaDefaults]; + environment.systemPackages = [plasmaDefaults]; # Plasma configs should be on all users home-manager.sharedModules = [ -- 2.51.2 From b37b576eada65af3f26a674723f8157549c695a0 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 29 Apr 2024 19:00:04 +0200 Subject: [PATCH 5/6] Kde/plasma: rename cursor name --- roles/kde/plasma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix index b9d835f..881694a 100644 --- a/roles/kde/plasma.nix +++ b/roles/kde/plasma.nix @@ -90,7 +90,7 @@ in { enable = true; workspace = { clickItemTo = "select"; - cursorTheme = "Breeze_Snow"; + cursorTheme = "Breeze_Light"; iconTheme = "breeze-dark"; lookAndFeel = "Catppuccin-Mocha-Mauve"; theme = "default"; -- 2.51.2 From ca0c84006eedf7c86845128942d2e644462b9385 Mon Sep 17 00:00:00 2001 From: Toast Date: Mon, 29 Apr 2024 19:32:01 +0200 Subject: [PATCH 6/6] Kde/sddm: temporarely disable sdd theme --- roles/kde/sddm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kde/sddm.nix b/roles/kde/sddm.nix index bc331d7..9b7f8c9 100644 --- a/roles/kde/sddm.nix +++ b/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]; } -- 2.51.2