From ecb074fc541fba8e316a1715eb65d5fc6f3a8978 Mon Sep 17 00:00:00 2001 From: Adam Hellberg Date: Tue, 20 Jun 2023 20:40:23 +0200 Subject: [PATCH] [zsh] Fix setting XDG_DATA_DIRS breaking KDE Plasma Setting XDG_DATA_DIRS in .zshenv means it will no longer fall back to the default values, so we need to first add those if XDG_DATA_DIRS is empty. Not doing this causes KDE Plasma to fail to launch (stuck at a black screen). --- zsh/.zshenv | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/zsh/.zshenv b/zsh/.zshenv index 6323baf..4299441 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -30,7 +30,14 @@ export NIX_REMOTE=daemon export BASE16_THEME="eighties" export CATPPUCCIN_THEME="macchiato" -export XDG_DATA_DIRS="$HOME/.nix-profile/share:$XDG_DATA_DIRS" +if [[ -z "$XDG_DATA_DIRS" ]]; then + export XDG_DATA_DIRS="/usr/local/share:/usr/share" +fi + +nix_share="$HOME/.nix-profile/share:$XDG_DATA_DIRS" +if [[ ":${XDG_DATA_DIRS}:" != *":${nix_share}:"* ]]; then + export XDG_DATA_DIRS="${nix_share}${XDG_DATA_DIRS:+:${XDG_DATA_DIRS}}" +fi # WTF, Ansible? export ANSIBLE_NOCOWS=1 -- 2.54.0