From 64ecc76bf0f2b08a612f959bc7a8d27358303c4d Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 18 Aug 2017 09:52:36 -0400 Subject: bash: Source guix profile instead of setting env vars manually. --- dotfiles/.bash_profile | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/dotfiles/.bash_profile b/dotfiles/.bash_profile index 2813e89..f93bf65 100644 --- a/dotfiles/.bash_profile +++ b/dotfiles/.bash_profile @@ -15,9 +15,6 @@ export -f vhl # Honor per-interactive-shell startup file if [ -f ~/.bashrc ]; then . ~/.bashrc; fi -# Search for binaries in user profile /sbin. -export PATH="$HOME/.guix-profile/sbin:$PATH" - # Only configure the SSH agent if we're not in an SSH session with a # forwarded agent. if ! [ -n "$SSH_CLIENT" -a -n "$SSH_AUTH_SOCK" ] @@ -27,28 +24,19 @@ fi export EDITOR=emacsclient -# Guile -export GUILE_LOAD_PATH="$HOME/.guix-profile/share/guile/site/2.0:$GUILE_LOAD_PATH" -export GUILE_LOAD_COMPILED_PATH="$HOME/.guix-profile/lib/guile/2.0/ccache:$HOME/.guix-profile/share/guile/site/2.0:$GUILE_LOAD_COMPILED_PATH" +export GUIX_PROFILE="$HOME/.guix-profile" -# Ruby -export GEM_PATH="$HOME/.guix-profile/lib/ruby/gems/2.2.0" +if [ -f $HOME/.guix-profile/etc/profile ] +then + source $HOME/.guix-profile/etc/profile +fi # Guix -export GUIX_PACKAGE_PATH="$HOME/Code/guix-custom" - -# Info -export INFOPATH="$HOME/.guix-profile/share/info" - -# Pidgin -export PURPLE_PLUGIN_PATH="$HOME/.guix-profile/lib/purple-2:/home/dthompson/.guix-profile/lib/pidgin" - -export TERMINFO_DIRS="/home/dave/.guix-profile/share/terminfo" +#export GUIX_PACKAGE_PATH="$HOME/Code/guix-custom" # Extra configuration needed on non-GuixSD systems. if ! guixsd then - export PATH="$HOME/.guix-profile/bin:$PATH" export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" fi -- cgit v1.2.3