shell: fix up profile to correctly use user’s local guix

diff --git a/.profile b/.profile
index 89951ab..d726093 100644 (file)
--- a/.profile
+++ b/.profile
@@ -13,7 +13,8 @@ export VISUAL="emcl"
 PATH="$HOME/bin:$HOME/.local/bin:$PATH"
 PATH="$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin:$PATH"
 if [ -z "$IS_GUIX_SYSTEM" ]; then
 PATH="$HOME/bin:$HOME/.local/bin:$PATH"
 PATH="$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin:$PATH"
 if [ -z "$IS_GUIX_SYSTEM" ]; then

-    PATH="$HOME/.guix-profile/bin:$HOME/.guix-profile/sbin${PATH:+:}$PATH"
+    PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH"
+    export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale"

 fi
 export PATH
 
 fi
 export PATH
 


@@ -39,8 +40,6 @@ fi
 if [ -z "$IS_GUIX_SYSTEM" ]; then
     # if guix is installed
     if [ -x "$(command -v guix)" ]; then
 if [ -z "$IS_GUIX_SYSTEM" ]; then
     # if guix is installed
     if [ -x "$(command -v guix)" ]; then

-        export GIT_EXEC_PATH="$HOME/.guix-profile/libexec/git-core"
-        export PASSWORD_STORE_SYSTEM_EXTENSION_DIR="$HOME/.guix-profile/lib/password-store/extensions${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:+:}$PASSWORD_STORE_SYSTEM_EXTENSION_DIR"

         GUIX_PROFILE="$HOME/.guix-profile"
         . "$GUIX_PROFILE/etc/profile"
     fi
         GUIX_PROFILE="$HOME/.guix-profile"
         . "$GUIX_PROFILE/etc/profile"
     fi