diff options
Diffstat (limited to '.config/login.sh')
| -rw-r--r-- | .config/login.sh | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/.config/login.sh b/.config/login.sh index a86f558..4634685 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -44,9 +44,16 @@ fi # XDG ################################################################ . "$HOME/.local/lib/xdg.sh" -mkdir -p "$XDG_RUNTIME_DIR/sessions" +mkdir -p -- "$XDG_RUNTIME_DIR/sessions" ln -sfT -- "$XDG_RUNTIME_DIR/sessions" ~/.sessions + +# Box-specific stuff ################################################# + +if [[ -f "$XDG_CONFIG_HOME/login.local.sh" ]]; then + . "$XDG_CONFIG_HOME/login.local.sh" +fi + # Settings ########################################################### # Spell check @@ -55,9 +62,6 @@ if [[ -z "$DICTIONARY" ]] && [[ -n "$LANG" ]]; then fi # Text editor -if [[ $EDITOR = /usr/bin/vi ]]; then - unset EDITOR -fi if [[ -f "$HOME/.selected_editor" ]]; then . "$HOME/.selected_editor" export SELECTED_EDITOR @@ -71,10 +75,6 @@ if [[ -z $GPGKEY ]] && [[ -f "${HOME}/.gnupg/gpg.conf" ]]; then echo 'login: Setting GPGKEY' export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf"` fi -if [[ -z "$(pgrep -u `whoami` gpg-agent)" ]] && type gpg-agent &>/dev/null; then - echo 'login: Starting gpg-agent' - gpg-agent --daemon --write-env-file ~/.sessions/gpg >/dev/null -fi if [[ -f ~/.sessions/gpg ]]; then echo 'login: Setting gpg-agent info:' cat ~/.sessions/gpg @@ -110,11 +110,6 @@ fi # export DBUS_SESSION_BUS_PID # fi -# Load any box-specific stuff -if [[ -f "$XDG_CONFIG_HOME/login.local.sh" ]]; then - . "$XDG_CONFIG_HOME/login.local.sh" -fi - export GOROOT=/homes/shumakl/.prefix.x86_64/go export PATH="/home/luke/perl5/bin:$PATH"; export PERL5LIB="/home/luke/perl5/lib/perl5/i686-linux-thread-multi:/home/luke/perl5/lib/perl5"; |