From b9c34239fedbef80997c333f471480a40d48dcd8 Mon Sep 17 00:00:00 2001 From: eoli3n Date: Sat, 15 May 2021 21:43:18 +0200 Subject: [PATCH] fixed flatpak with fish as default shell --- TODO | 1 + roles/fish/files/fish/desktop/conf.d/flatpak.fish | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index 306e248..ea52d9b 100644 --- a/TODO +++ b/TODO @@ -11,6 +11,7 @@ # ISSUES * tiny-irc : https://github.com/osa1/tiny/issues/created_by/eoli3n * firefox menu size when scaling : https://bugzilla.mozilla.org/show_bug.cgi?id=1638168 +- /etc/profile.d not used with fish as default shell # IMPROVMENTS - wrap all .desktop with wofi diff --git a/roles/fish/files/fish/desktop/conf.d/flatpak.fish b/roles/fish/files/fish/desktop/conf.d/flatpak.fish index 03554f4..1a70924 100644 --- a/roles/fish/files/fish/desktop/conf.d/flatpak.fish +++ b/roles/fish/files/fish/desktop/conf.d/flatpak.fish @@ -1,3 +1,11 @@ -# Set path by host +# See https://github.com/flatpak/flatpak/issues/3109 -set -x XDG_DATA_DIRS "$XDG_DATA_DIRS:/usr/share/:/usr/local/share/:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share" +# Flatpak directories don't get picked up anymore, so we'll mimic /etc/profile.d/flatpak*.sh +set -ga fish_user_paths ~/.local/share/flatpak/exports/bin /var/lib/flatpak/exports/bin +set -gx --path XDG_DATA_DIRS ~/.local/share/flatpak/exports/share +for install_dir in (flatpak --installations) + set -gxa XDG_DATA_DIRS $install_dir/exports/share +end + +# These should also be here +set -gxa XDG_DATA_DIRS /usr/local/share /usr/share