diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-18 17:42:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 17:42:20 -0400 |
| commit | 58f090cc7b92edfee8c390b5a131a1417273c590 (patch) | |
| tree | ed372ba44e768bef799dbb36eaa17fe62dad74d3 /nixos | |
| parent | 22812a240fd1ca9e96bd92fe4125e1cc7fac4449 (diff) | |
| parent | b3f4ce351e6e34ad5bcffe0d308701570e445739 (diff) | |
Merge pull request #69031 from worldofpeace/xcursor-update
nixos/xdg/icons: match XCURSOR_PATH spec
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/xdg/icons.nix | 17 | ||||
| -rw-r--r-- | nixos/modules/programs/environment.nix | 1 |
2 files changed, 14 insertions, 4 deletions
diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix index cc82b9e94f9..4677ce090b0 100644 --- a/nixos/modules/config/xdg/icons.nix +++ b/nixos/modules/config/xdg/icons.nix @@ -19,9 +19,20 @@ with lib; "/share/pixmaps" ]; - environment.profileRelativeSessionVariables = { - XCURSOR_PATH = [ "/share/icons" ]; - }; + # libXcursor looks for cursors in XCURSOR_PATH + # it mostly follows the spec for icons + # See: https://www.x.org/releases/current/doc/man/man3/Xcursor.3.xhtml Themes + + # These are preferred so they come first in the list + environment.sessionVariables.XCURSOR_PATH = [ + "$HOME/.icons" + "$HOME/.local/share/icons" + ]; + + environment.profileRelativeSessionVariables.XCURSOR_PATH = [ + "/share/icons" + "/share/pixmaps" + ]; }; } diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 4bbc750fd52..fcffb213498 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -20,7 +20,6 @@ in { NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; PAGER = mkDefault "less -R"; EDITOR = mkDefault "nano"; - XCURSOR_PATH = [ "$HOME/.icons" ]; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc GTK_DATA_PREFIX = "${config.system.path}"; # needed for gtk2 apps to find themes GTK_EXE_PREFIX = "${config.system.path}"; |