X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/c0ace3ce0e4fd5c53572c547252365a724110c03..68b2cdaa7c4c412acb831759fc78f3c0c8844f97:/.profile?ds=sidebyside diff --git a/.profile b/.profile index 3b0071f..b419e55 100644 --- a/.profile +++ b/.profile @@ -10,17 +10,25 @@ fi export EDITOR="emacsclient -nw" export VISUAL="emcl" -PATH="$HOME/bin:$HOME/.local/bin:$PATH" +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" + INFOPATH="$HOME/.config/guix/current/share/info${INFOPATH:+:}$INFOPATH" export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" fi export PATH +export INFOPATH 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 @@ -62,11 +70,10 @@ 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 +# xfconf-query -c xfce4-session -p /startup/gpg-agent/enabled -n -t bool -s false +# 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