X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/a71a12e16a9d94484e15141b4dea7f37f4091abd..af78214bf739edac031fe183327b8361d05f72fd:/.profile diff --git a/.profile b/.profile index c812eb9..2644551 100644 --- a/.profile +++ b/.profile @@ -9,8 +9,8 @@ fi export EDITOR="emacsclient -nw" export VISUAL="emcl" +export GPG_TTY=$(tty) -PATH="$HOME/usr/local/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" @@ -20,16 +20,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 +67,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 @@ -64,15 +93,6 @@ if [ -z "$IS_GUIX_SYSTEM" ]; then fi fi -setxkbmap \ - -layout us,ir \ - -option ctrl:nocaps \ - -option grp:shifts_toggle - -xmodmap -e "keysym Menu = Super_R" - -xrdb -merge "$HOME/.Xresources" - # footenote: when on a foreign distro and using Xfce, don't forget to # disable its auto-start of gpg- and ssh-agent, by issuing # xfconf-query -c xfce4-session -p /startup/ssh-agent/enabled -n -t bool -s false