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

[~bandali/configs] / .profile

diff --git a/.profile b/.profile
index bf2741c..d726093 100644 (file)
--- a/.profile
+++ b/.profile
@@ -2,11 +2,20 @@
 # This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
 # exists.
 
 # This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
 # exists.
 

+# source host-specific profile
+if [ -f "$HOME/.config/profiles/$(hostname)" ]; then
+    . "$HOME/.config/profiles/$(hostname)"
+fi
+

 export EDITOR="emacsclient -nw"
 export VISUAL="emcl"
 
 PATH="$HOME/bin:$HOME/.local/bin:$PATH"
 PATH="$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/bin:$PATH"
 export EDITOR="emacsclient -nw"
 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/.config/guix/current/bin${PATH:+:}$PATH"
+    export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale"
+fi

 export PATH
 
 export XDG_CONFIG_HOME="$HOME/.config"
 export PATH
 
 export XDG_CONFIG_HOME="$HOME/.config"


@@ -28,6 +37,14 @@ if [ -n "$BASH_VERSION" ]; then
     fi
 fi
 
     fi
 fi
 

+if [ -z "$IS_GUIX_SYSTEM" ]; then
+    # if guix is installed
+    if [ -x "$(command -v guix)" ]; then
+        GUIX_PROFILE="$HOME/.guix-profile"
+        . "$GUIX_PROFILE/etc/profile"
+    fi
+fi
+

 setxkbmap \
     -layout us,ir \
     -option ctrl:nocaps \
 setxkbmap \
     -layout us,ir \
     -option ctrl:nocaps \