1 files changed, 7 insertions, 3 deletions

diff --git a/home-config/fish/config.fish b/home-config/fish/config.fish
index 4705a90..3ccd0cb 100644
--- a/home-config/fish/config.fish
+++ b/home-config/fish/config.fish
@@ -4,17 +4,21 @@ if status is-login
         -p ~/.guix-profile \
         -p /run/current-system/profile)"
 
+    fenv source /etc/profile
+    set -gx HOME_ENVIRONMENT $HOME/.guix-home
+    fenv source $HOME_ENVIRONMENT/setup-environment
+    fenv $HOME_ENVIRONMENT/on-first-login
     fish_add_path -Pp ~/.local/bin
     fish_add_path -Pp ~/.guix-home/profile/bin
     fish_add_path -Pp /run/setuid-programs
     fish_add_path -Pp ~/.nix-profile/bin
     set -gx EDITOR nvim
-    set -gax XDG_DATA_DIRS ~/.nix-profile/share
-    fenv source ~/.profile
+    set -gax --path XDG_DATA_DIRS ~/.nix-profile/share
     # Bad
-    find ~/.config/fish/ -name "*tmp*" -exec {} +
+    find ~/.config/fish/ -name "*tmp*" -exec rm {} +
 end
 if status is-interactive
+    set -gax --path XDG_DATA_DIRS ~/.local/share/flatpak/exports/share
     # Commands to run in interactive sessions can go here
     alias quit exit
     alias cat "bat --paging=never"