diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-03 22:56:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-03 22:56:02 -0400 |
| commit | 4ab7be69dc77bf158fe89fffd816b9cc9212cb75 (patch) | |
| tree | 3c89708bd6caaa88f6c8354eddeb5dd14970d31e /.config | |
| parent | 05a133cdb0d56d485b005100154848641480e684 (diff) | |
| parent | 89b0bf196d73a8ee53a4d608d95c470fcdae2ca8 (diff) | |
Merge remote-tracking branch 'origin/master' into thinkpenguin-par
Diffstat (limited to '.config')
| -rw-r--r-- | .config/X11/clientrc | 1 | ||||
| -rw-r--r-- | .config/bash/rc.sh | 5 | ||||
| -rw-r--r-- | .config/irbrc | 3 | ||||
| -rw-r--r-- | .config/login.sh | 18 |
4 files changed, 14 insertions, 13 deletions
diff --git a/.config/X11/clientrc b/.config/X11/clientrc index d1e1725..c261324 100644 --- a/.config/X11/clientrc +++ b/.config/X11/clientrc @@ -23,5 +23,4 @@ fi # exec startkde # exec startxfce4 # ...or the Window Manager of your choice -#export WMII_CONFPATH="$XDG_CONFIG_HOME/wmii" exec wmii diff --git a/.config/bash/rc.sh b/.config/bash/rc.sh index 2bf60bc..ab690cf 100644 --- a/.config/bash/rc.sh +++ b/.config/bash/rc.sh @@ -13,7 +13,8 @@ shopt -s checkhash ################################################################################ # History settings -HISTCONTROL=ignoredups +# don't overwrite GNU Midnight Commander's setting of `ignorespace'. +HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups HISTFILE=${XDG_CACHE_HOME}/bash/history HISTTIMEFORMAT='[%Y-%m-%d %H:%M] ' HISTSIZE=5000 @@ -66,7 +67,7 @@ unset make_prompt ################################################################################ -# Load my alaises +# Load my aliases if [[ -f ${XDG_CONFIG_HOME}/bash/aliases.sh ]]; then . ${XDG_CONFIG_HOME}/bash/aliases.sh fi diff --git a/.config/irbrc b/.config/irbrc index 27cce66..cda5ada 100644 --- a/.config/irbrc +++ b/.config/irbrc @@ -1,4 +1,5 @@ +# -*- mode: Ruby -*- require 'rubygems' unless defined? Gem # only needed in 1.8 require 'irb/ext/save-history' IRB.conf[:SAVE_HISTORY] = 5000 -IRB.conf[:HISTORY_FILE] = "#{ENV['XDG_CACHE_HOME']}/irb/history"
\ No newline at end of file +IRB.conf[:HISTORY_FILE] = "#{ENV['XDG_CACHE_HOME']}/irb/history" diff --git a/.config/login.sh b/.config/login.sh index 2687a8e..1fd9505 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -1,6 +1,7 @@ #!/bin/bash # ~/.profile: executed by the command interpreter for login shells. -# Should be whether logging in graphically or not. +# 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) # @@ -27,6 +28,7 @@ export TMPDIR="$HOME/tmp" # XDG ################################################################ . "$HOME/.local/lib/xdg.sh" +mkdir -p -- "$XDG_RUNTIME_DIR/sessions" ln -sf -- "$XDG_RUNTIME_DIR/sessions" ~/.sessions # Settings ########################################################### @@ -50,15 +52,14 @@ 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)" ]] && [[ -n $XDG_RUNTIME_DIR ]] && type gpg-agent &>/dev/null; then +if [[ -z "$(pgrep -u `whoami` gpg-agent)" ]] && type gpg-agent &>/dev/null; then echo 'login: Starting gpg-agent' - mkdir -p "${XDG_RUNTIME_DIR}/sessions" - gpg-agent --daemon --write-env-file "${XDG_RUNTIME_DIR}/sessions/gpg" >/dev/null + gpg-agent --daemon --write-env-file ~/.sessions/gpg >/dev/null fi -if [[ -f "${XDG_RUNTIME_DIR}/sessions/gpg" ]]; then +if [[ -f ~/.sessions/gpg ]]; then echo 'login: Setting gpg-agent info:' - cat "${XDG_RUNTIME_DIR}/sessions/gpg" - . "${XDG_RUNTIME_DIR}/sessions/gpg" + cat ~/.sessions/gpg + . ~/.sessions/gpg export GPG_AGENT_INFO #export SSH_AUTH_SOCK fi @@ -76,8 +77,7 @@ export _JAVA_OPTIONS # X11 if [[ -z $XAUTHORITY ]]; then #export XAUTHORITY="$HOME/.Xauthority" - mkdir -p "${XDG_RUNTIME_DIR}/sessions" - export XAUTHORITY="${XDG_RUNTIME_DIR}/sessions/Xauthority" + export XAUTHORITY=$HOME/.sessions/Xauthority fi # D-Bus |