about summary refs log tree commit diff stats
path: root/profile
diff options
context:
space:
mode:
Diffstat (limited to 'profile')
-rw-r--r--profile/defaults.sh1
-rw-r--r--profile/profile3
-rw-r--r--profile/ssh-agent.sh2
-rw-r--r--profile/xdg.sh2
4 files changed, 6 insertions, 2 deletions
diff --git a/profile/defaults.sh b/profile/defaults.sh index 347e0e5..e167147 100644 --- a/profile/defaults.sh +++ b/profile/defaults.sh
@@ -1,4 +1,5 @@
1# Default programs 1# Default programs
2 2
3export EDITOR="$(which emacsclient)" 3export EDITOR="$(which emacsclient)"
4export ALTERNATE_EDITOR=
4export VISUAL="$EDITOR" 5export VISUAL="$EDITOR"
diff --git a/profile/profile b/profile/profile index a0dc281..a531e8e 100644 --- a/profile/profile +++ b/profile/profile
@@ -1,6 +1,9 @@
1# ~/.profile -*- sh -*- 1# ~/.profile -*- sh -*-
2# vim: ft=sh 2# vim: ft=sh
3 3
4# Source system profile
5source /etc/profile
6
4# XDG directories 7# XDG directories
5export XDG_CONFIG_HOME="$HOME/etc" 8export XDG_CONFIG_HOME="$HOME/etc"
6export XDG_CACHE_HOME="$HOME/var/cache" 9export XDG_CACHE_HOME="$HOME/var/cache"
diff --git a/profile/ssh-agent.sh b/profile/ssh-agent.sh index 7af5219..acd65a4 100644 --- a/profile/ssh-agent.sh +++ b/profile/ssh-agent.sh
@@ -4,7 +4,7 @@
4if type keychain > /dev/null 2>&1; then 4if type keychain > /dev/null 2>&1; then
5 # Save directory name in a variable (for ease of maintenance) 5 # Save directory name in a variable (for ease of maintenance)
6 export KEYCHAIN_HOME="$HOME/.keychain" 6 export KEYCHAIN_HOME="$HOME/.keychain"
7 eval $(keychain --eval --dir "$KEYCHAIN_HOME" --agents ssh -q) 7 eval $(keychain --eval --dir "$KEYCHAIN_HOME" --agents ssh 2>/dev/null)
8else 8else
9 eval $(ssh-agent -s) 9 eval $(ssh-agent -s)
10fi 10fi
diff --git a/profile/xdg.sh b/profile/xdg.sh index ed58c4f..71ab6bb 100644 --- a/profile/xdg.sh +++ b/profile/xdg.sh
@@ -22,9 +22,9 @@ export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
22export LYNX_CFG="$XDG_CONFIG_HOME/lynx/lynx.cfg" 22export LYNX_CFG="$XDG_CONFIG_HOME/lynx/lynx.cfg"
23 23
24# Xorg 24# Xorg
25export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-$HOME}"
25export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc" 26export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
26export XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc" 27export XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc"
27export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority"
28 28
29# Notmuch 29# Notmuch
30export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:=$HOME/.config}/notmuch/config" 30export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:=$HOME/.config}/notmuch/config"