From 6300c392279ecdebebf9e2047edcf1f2838773f1 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 24 Mar 2025 16:49:19 +0000 Subject: [PATCH 1/3] nixos/plasma6: make optional wallpapers optional --- nixos/modules/services/desktop-managers/plasma6.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index ef9c66d1336d..c70bb52966c0 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -136,7 +136,6 @@ in breeze-icons breeze-gtk ocean-sound-theme - plasma-workspace-wallpapers pkgs.hicolor-icon-theme # fallback icons qqc2-breeze-style qqc2-desktop-style @@ -158,6 +157,7 @@ in [ aurorae plasma-browser-integration + plasma-workspace-wallpapers konsole kwin-x11 (lib.getBin qttools) # Expose qdbus in PATH From 49dd486796ea0c45c9a1fd7ab799bd69bb6836f7 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 24 Mar 2025 13:35:31 +0000 Subject: [PATCH 2/3] nixos/installer/plasma6: exclude `kdePackages.plasma-workspace-wallpapers` --- .../cd-dvd/installation-cd-graphical-calamares-plasma6.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix index f71a624156cd..d9fae053e771 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix @@ -24,6 +24,13 @@ pkgs.maliit-keyboard ]; + environment.plasma6.excludePackages = [ + # Optional wallpapers that add 126 MiB to the graphical installer + # closure. They will still need to be downloaded when installing a + # Plasma system, though. + pkgs.kdePackages.plasma-workspace-wallpapers + ]; + system.activationScripts.installerDesktop = let From a7a3457082bd1c942a803e2b1043b4f694ad401c Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 24 Mar 2025 17:28:08 +0000 Subject: [PATCH 3/3] nixos/installer/plasma6: disable KDE PIM --- .../cd-dvd/installation-cd-graphical-calamares-plasma6.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix index d9fae053e771..90683fa088dc 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix @@ -31,6 +31,9 @@ pkgs.kdePackages.plasma-workspace-wallpapers ]; + # Avoid bundling an entire MariaDB installation on the ISO. + programs.kde-pim.enable = false; + system.activationScripts.installerDesktop = let