post-merge clean

1 files changed, 71 insertions, 35 deletions

diff --git a/.config/login.sh b/.config/login.sh
index 377dc9b..4065baa 100644
--- a/.config/login.sh
+++ b/.config/login.sh
@@ -1,4 +1,9 @@
 # ~/.profile: executed by the command interpreter for login shells.
+# I like that graphical login scripts be configured to load this, so
+# it always runs, graphical or not.
+#
+# This file should be executable by /bin/sh, but I'm going to assume bash(1)
+#
 # This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
 # exists.
 
@@ -8,60 +13,91 @@ umask 022
 
 ## Paths #############################################################
 
-# Unix
-bins=$(echo $HOME/bin $HOME/.local.`uname -m`/bin $HOME/.local/bin $HOME/.prefix.`uname -m`/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin)
-for dir in $bins; do
-    if [ -d "$dir" ]; then
-	export PATH="$dir:$PATH"
-    fi
-done
-
-# Ruby
-for dir in $HOME/.prefix/lib; do
-    if [ -d "$dir" ]; then
-	export RUBYLIB="$dir"
-    fi
-done
+. "$HOME/.local/lib/path.sh"
+
+# TMPDIR #############################################################
+
+if [[ ! -d "$HOME/tmp" ]]; then
+	tmp="$(mktemp --tmpdir -d "$USER-tmpdir.XXXXXXXXXXXXXXXXXXX")"
+	ln -sf "$tmp" "$HOME/tmp"
+	unset tmp
+fi
+export TMPDIR="$HOME/tmp"
+
+# XDG ################################################################
+
+. "$HOME/.local/lib/xdg.sh"
+ln -sf -- "$XDG_RUNTIME_DIR/sessions" ~/.sessions
 
 # Settings ###########################################################
 
+# Spell check
+if [[ -z "$DICTIONARY" ]] && [[ -n "$LANG" ]]; then
+	export DICTIONARY="${LANG%%.*}"
+fi
+
 # Text editor
-if [ -f "$HOME/.selected_editor" ]; then
-    . "$HOME/.selected_editor"
-    export SELECTED_EDITOR
-    export ALTERNATE_EDITOR
-    export EDITOR="${EDITOR:-$SELECTED_EDITOR}"
-    export VISUAL="${VISUAL:-$SELECTED_EDITOR}"
+if [[ -f "$HOME/.selected_editor" ]]; then
+	. "$HOME/.selected_editor"
+	export SELECTED_EDITOR
+	export ALTERNATE_EDITOR
+	export EDITOR="${EDITOR:-$SELECTED_EDITOR}"
+	export VISUAL="${VISUAL:-$SELECTED_EDITOR}"
 fi
 
 # GPG
-export GPGKEY=D4FFBFC9
+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
+	. ~/.sessions/gpg
+	export GPG_AGENT_INFO
+	#export SSH_AUTH_SOCK
+fi
 
 # Java
 _JAVA_OPTIONS=''
 _JAVA_OPTIONS+=' -Dawt.useSystemAAFontSettings=on'
 _JAVA_OPTIONS+=' -Dswing.aatext=true'
 _JAVA_OPTIONS+=' -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
-_JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR"
+if [[ -n $TMPDIR ]]; then
+	_JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR"
+fi
 export _JAVA_OPTIONS
 
 # X11
-if [ -z "$XAUTHORITY" ]; then
-    export XAUTHORITY=$HOME/.Xauthority
+if [[ -z $XAUTHORITY ]]; then
+	export XAUTHORITY=$HOME/.Xauthority
+	#export XAUTHORITY=$HOME/.sessions/Xauthority
 fi
 
-# Start background programs ##########################################
-if [ -f "$HOME/.login-daemons" ]; then
-    . "$HOME/.login-daemons"
-fi
+# D-Bus
+# if [[ -z $DBUS_SESSION_BUS_ADDRESS ]] && type dbus-launch &>/dev/null; then
+# 	# I want a separate instance for each login
+# 	#dbus-launch > "${HOME}/.cache/sessions/dbus"
+# 	#. "${HOME}/.cache/sessions/dbus"
+# 	eval `dbus-launch`
 
-# BASH ###############################################################
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-        . "$HOME/.bashrc"
-    fi
+# 	export DBUS_SESSION_BUS_ADDRESS
+# 	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 PERL5LIB=/homes/shumakl/.prefix.x86_64/lib64/perl5:$PERL5LIB
 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";
+export PERL5LIB=/homes/shumakl/.prefix.x86_64/lib64/perl5:$PERL5LIB
+export PERL_LOCAL_LIB_ROOT="/home/luke/perl5";
+export PERL_MB_OPT="--install_base /home/luke/perl5";
+export PERL_MM_OPT="INSTALL_BASE=/home/luke/perl5";