X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/b25452ae882105b96d82ef52f1c59dc4092a39fa..8ab693f86a241e0531b22e04132290267a54e1ea:/.profile?ds=inline

diff --git a/.profile b/.profile
index 65221c4..8ef91c9 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,32 @@ 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/s/go"
+    export PATH="$GOPATH/bin:$PATH"
+fi
+
+export _JAVA_AWT_WM_NONREPARENTING=1
+export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true'
+#export MOZ_USE_XINPUT2=1  # precise scrolling in firefox
 
 # if running bash
 if [ -n "$BASH_VERSION" ]; then
@@ -51,12 +66,25 @@ 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
+        rm -f ~/.ssh-agent-thing
         ssh-agent > ~/.ssh-agent-thing
     fi
     if [[ ! "$SSH_AUTH_SOCK" ]]; then