nix/11.stylix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kde: replace systemd unit with AutostartScript for theme application (#708)

Browse source 
Replace the systemd unit with a more robust AutostartScript for theme
application during Plasma startup, ensuring D-Bus and session
availability without breaking Home Manager activation.

Closes: https://github.com/danth/stylix/issues/340
Closes: https://github.com/danth/stylix/issues/350
Closes: https://github.com/danth/stylix/issues/422
Link: https://github.com/danth/stylix/pull/708

Co-authored-by: rkuklik <rkuklik@expect-it.cz>
Tested-by: lordkekz <lordkekz@lkekz.de>
Tested-by: rkuklik <rkuklik@expect-it.cz>
Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
This commit is contained in:
Didn't read the style guide 2025-01-03 20:50:01 +01:00 • committed by GitHub
parent 0ce2a52dec
commit e0a41d3a25
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 67 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

110
modules/kde/hm.nix
View file

@ -4,6 +4,8 @@ with config.stylix.fonts;
with config.lib.stylix.colors; with config.lib.stylix.colors;
let let
cfg = config.stylix.targets.kde;
formatValue = value: formatValue = value:
if builtins.isBool value if builtins.isBool value
then if value then "true" else "false" then if value then "true" else "false"
@ -123,6 +125,7 @@ let
ServiceTypes = [ "Plasma/LookAndFeel" ]; ServiceTypes = [ "Plasma/LookAndFeel" ];
Website = "https://github.com/danth/stylix"; Website = "https://github.com/danth/stylix";
}; };
KPackageStructure = "Plasma/LookAndFeel";
}; };
lookAndFeelDefaults = { lookAndFeelDefaults = {
@ -220,52 +223,73 @@ let
printf '%s\n' "$kdeglobals" >"$out/kdeglobals" printf '%s\n' "$kdeglobals" >"$out/kdeglobals"
''; '';
# plasma-apply-wallpaperimage is necessary to change the wallpaper
# after the first login.
#
# plasma-apply-lookandfeel is only here to trigger a hot reload, the theme
# would still be applied without it if you logged out and back in.
#
# Home Manager clears $PATH before running the activation script, but we
# want to avoid installing these tools explicitly because that would pull
# in large dependencies for people who aren't actually using KDE.
# The workaround used is to assume a list of common paths where the tools
# might be installed, and look there. The ideal solution would require
# changes to KDE to make it possible to update the wallpaper through
# config files alone.
activator = pkgs.writeShellScriptBin "stylix-set-kde-wallpaper" ''
set -eu
global_path() {
for directory in /run/current-system/sw/bin /usr/bin /bin; do
if [[ -f "$directory/$1" ]]; then
printf '%s\n' "$directory/$1"
return 0
fi
done
return 1
}
if wallpaper_image="$(global_path plasma-apply-wallpaperimage)"; then
"$wallpaper_image" "${themePackage}/share/wallpapers/stylix"
else
echo "Skipping plasma-apply-wallpaperimage: command not found"
fi
if look_and_feel="$(global_path plasma-apply-lookandfeel)"; then
"$look_and_feel" --apply stylix
else
echo "Skipping plasma-apply-lookandfeel: command not found"
fi
'';
activateDocs = "https://stylix.danth.me/options/hm.html#stylixtargetskdeservice";
in { in {
options.stylix.targets.kde.enable = options.stylix.targets.kde.enable = config.lib.stylix.mkEnableTarget "KDE" true;
config.lib.stylix.mkEnableTarget "KDE" true;
config = lib.mkIf (config.stylix.enable && config.stylix.targets.kde.enable && pkgs.stdenv.hostPlatform.isLinux) { config = lib.mkIf (config.stylix.enable && cfg.enable && pkgs.stdenv.hostPlatform.isLinux) {
home.packages = [ themePackage ]; home = {
xdg.systemDirs.config = [ "${configPackage}" ]; packages = [ themePackage ];
# plasma-apply-wallpaperimage is necessary to change the wallpaper # This activation entry will run the theme activator when the homeConfiguration is activated
# after the first login. # Note: This only works in an already running Plasma session.
# activation.stylixLookAndFeel = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
# plasma-apply-lookandfeel is only here to trigger a hot reload, the theme ${lib.getExe activator} || verboseEcho \
# would still be applied without it if you logged out and back in. "KDE theme setting failed. See `${activateDocs}`"
# '';
# Home Manager clears $PATH before running the activation script, but we };
# want to avoid installing these tools explicitly because that would pull
# in large dependencies for people who aren't actually using KDE.
# The workaround used is to assume a list of common paths where the tools
# might be installed, and look there. The ideal solution would require
# changes to KDE to make it possible to update the wallpaper through
# config files alone.
home.activation.stylixLookAndFeel = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
global_path() {
for directory in /run/current-system/sw/bin /usr/bin /bin; do
if [[ -f "$directory/$1" ]]; then
printf '%s\n' "$directory/$1"
return 0
fi
done
return 1 xdg = {
} systemDirs.config = [ "${configPackage}" ];
if wallpaper_image="$(global_path plasma-apply-wallpaperimage)"; then # This desktop entry will run the theme activator when a new Plasma session is started
"$wallpaper_image" "${themePackage}/share/wallpapers/stylix" # Note: This doesn't run again if a new homeConfiguration is activated from a running Plasma session
else configFile."autostart/stylix-activator.desktop".text = ''
verboseEcho \ [Desktop Entry]
"plasma-apply-wallpaperimage: command not found" Type=Application
fi Exec=${lib.getExe activator}
Name=Stylix Activator
if look_and_feel="$(global_path plasma-apply-lookandfeel)"; then X-KDE-AutostartScript=true
"$look_and_feel" --apply stylix '';
else };
verboseEcho \
"Skipping plasma-apply-lookandfeel: command not found"
fi
'';
}; };
} }