X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/b25452ae882105b96d82ef52f1c59dc4092a39fa..5fc03b0db7cb90e19ae72ff34b2651555d8f1ad7:/.profile diff --git a/.profile b/.profile index 65221c4..11aaabe 100644 --- a/.profile +++ b/.profile @@ -10,8 +10,7 @@ fi export EDITOR="emacsclient -nw" export VISUAL="emcl" -PATH="$HOME/usr/local/bin:$HOME/.local/bin:$PATH" -PATH="$HOME/.cabal/bin:$HOME/.cargo/bin:$HOME/.elan/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" INFOPATH="$HOME/.config/guix/current/share/info${INFOPATH:+:}$INFOPATH" @@ -20,16 +19,28 @@ fi export PATH export INFOPATH +export MY_GUIX_MANIFESTS="$HOME/.config/guix/manifest" +export MY_GUIX_PROFILES="$HOME/.config/guix/profile" + export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" +if [ -f "$HOME/.config/user-dirs.dirs" ]; then + set -a + . "$HOME/.config/user-dirs.dirs" + set +a +fi + export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc export SCREENRC="$XDG_CONFIG_HOME"/screen/screenrc export MAILDIR="$HOME/mail" export CVS_RSH="ssh" -export GOPATH="$HOME/src/go" +if [ -x "$(command -v go)" ]; then + export GOPATH="$HOME/src/go" + export PATH="$GOPATH/bin:$PATH" +fi # if running bash if [ -n "$BASH_VERSION" ]; then @@ -51,9 +62,21 @@ if [ -z "$IS_GUIX_SYSTEM" ]; then fi GUIX_PROFILE="$HOME/.guix-profile" . "$GUIX_PROFILE/etc/profile" + unset XDG_DATA_DIRS fi fi +for p in $MY_GUIX_PROFILES/*; do + profile=$p/$(basename "$p") + if [ -f "$profile"/etc/profile ]; then + GUIX_PROFILE="$profile" + . "$GUIX_PROFILE"/etc/profile + fi + unset profile +done + +export PATH="$HOME/u/local/bin:$HOME/.local/bin:$PATH" + # start an ssh-agent (with guix's openssh) if [ -z "$IS_GUIX_SYSTEM" ]; then if ! pgrep -u "$USER" ssh-agent > /dev/null; then @@ -71,3 +94,5 @@ fi # see https://docs.xfce.org/xfce/xfce4-session/advanced#ssh_and_gpg_agents # also, MATE does something similar with gnome-keyring-daemon: # http://william.shallum.net/random-notes/disabling-gnome-keyring-daemon-ssh-agent-on-mate-desktop + +export PATH="$HOME/.cargo/bin:$PATH"