git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/xdg/icons: match XCURSOR_PATH spec
commitb3f4ce351e6e34ad5bcffe0d308701570e445739 authorworldofpeace <worldofpeace@protonmail.ch> dateWed 18 Sep 2019, 11:34 (7 years ago) parent760b677
2 files changed+14−4
nixos/modules/config/xdg/icons.nix+14−3 nixos/modules/programs/environment.nix−1
nixos/modules/config/xdg/icons.nix+14−3
@@ -19,9 +19,20 @@ with lib;
1919 "/share/pixmaps"
2020 ];
2121
22− environment.profileRelativeSessionVariables = {
23− XCURSOR_PATH = [ "/share/icons" ];
24− };
22+ # libXcursor looks for cursors in XCURSOR_PATH
23+ # it mostly follows the spec for icons
24+ # See: https://www.x.org/releases/current/doc/man/man3/Xcursor.3.xhtml Themes
25+
26+ # These are preferred so they come first in the list
27+ environment.sessionVariables.XCURSOR_PATH = [
28+ "$HOME/.icons"
29+ "$HOME/.local/share/icons"
30+ ];
31+
32+ environment.profileRelativeSessionVariables.XCURSOR_PATH = [
33+ "/share/icons"
34+ "/share/pixmaps"
35+ ];
2536 };
2637
2738}
nixos/modules/programs/environment.nix−1
@@ -20,7 +20,6 @@ in
2020 { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
2121 PAGER = mkDefault "less -R";
2222 EDITOR = mkDefault "nano";
23− XCURSOR_PATH = [ "$HOME/.icons" ];
2423 XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc
2524 GTK_DATA_PREFIX = "${config.system.path}"; # needed for gtk2 apps to find themes
2625 GTK_EXE_PREFIX = "${config.system.path}";