Merge branch 'main' of github.com:duckwork/etc

4 files changed, 6 insertions, 2 deletions

@@ -1,4 +1,5 @@
 # Default programs
 
 export EDITOR="$(which emacsclient)"
+export ALTERNATE_EDITOR=
 export VISUAL="$EDITOR"
@@ -1,6 +1,9 @@
 # ~/.profile -*- sh -*-
 # vim: ft=sh
 
+# Source system profile
+source /etc/profile
+
 # XDG directories
 export XDG_CONFIG_HOME="$HOME/etc"
 export XDG_CACHE_HOME="$HOME/var/cache"
@@ -4,7 +4,7 @@
 if type keychain > /dev/null 2>&1; then
     # Save directory name in a variable (for ease of maintenance)
     export KEYCHAIN_HOME="$HOME/.keychain"
-    eval $(keychain --eval --dir "$KEYCHAIN_HOME" --agents ssh -q)
+    eval $(keychain --eval --dir "$KEYCHAIN_HOME" --agents ssh 2>/dev/null)
 else
     eval $(ssh-agent -s)
 fi
@@ -22,9 +22,9 @@ export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
 export LYNX_CFG="$XDG_CONFIG_HOME/lynx/lynx.cfg"
 
 # Xorg
+export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-$HOME}"
 export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
 export XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc"
-export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority"
 
 # Notmuch
 export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:=$HOME/.config}/notmuch/config"