diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-21 22:39:19 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-21 22:39:19 -0400 |
| commit | bc4a3914db8b294238df438750863214bdb83f4d (patch) | |
| tree | 18d1023524b22ea2eee292a8ba603cece46d9768 | |
| parent | ae33398b4eefc8fd729c201c984126960d579afc (diff) | |
| parent | 69e7a06e976bbad54684b8c650853020c8352adb (diff) | |
Merge branch 'master' into hp-dv6426us-par
Conflicts:
.emacs.d/custom.el
| -rw-r--r-- | .bashrc | 7 | ||||
| -rw-r--r-- | .crontab | 2 | ||||
| -rw-r--r-- | .emacs.d/custom.el | 1 | ||||
| -rw-r--r-- | .git.info.exclude | 11 | ||||
| -rw-r--r-- | .irbrc | 1 | ||||
| -rw-r--r-- | .profile | 11 |
6 files changed, 20 insertions, 13 deletions
@@ -23,6 +23,13 @@ shopt -s histappend # update the values of LINES and COLUMNS. shopt -s checkwinsize +# Let ** recursively scan directories +shopt -s globstar + +# Why is this not on by default? +# "We have a cached value, but it isn't valid anymore. Should we trash it?" +shopt -s checkhash + # make less more friendly for non-text input files, see lesspipe(1) [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" @@ -1,3 +1,3 @@ # m h dom mon dow command -*/5 * * * * cd $HOME && make - +*/5 * * * * cd $HOME && make */5 * * * * offlineimap-runner 2 -u quiet diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index fad97a8..ee82309 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -8,6 +8,7 @@ '(erc-nick "lukeshu") '(explicit-shell-file-name "/bin/bash") '(inhibit-startup-screen t) + '(mdmua-maildir "~/Maildir") '(ruby-deep-arglist nil) '(ruby-deep-indent-paren nil) '(scroll-bar-mode nil)) diff --git a/.git.info.exclude b/.git.info.exclude index 048e924..4576b6f 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -54,6 +54,7 @@ history.* .current.asound .dbus/session-bus/* .ddd/history +.ddd/sessions .dvdcss .esd_auth .eshell/history @@ -87,15 +88,17 @@ history.* .config/libretools/blacklist.txt # Ignore these files for no good reason -.terminfo -.config/vlc/vlc-qt-interface.conf -.wine* -.offlineimap .bogofilter .config/Trolltech.conf +.config/vlc/vlc-qt-interface.conf .gem +.offlineimap +.prefix +.terminfo +.wine* # Ignore these files that if I tracked them, would be a separate repo +.config/chromium .config/libreoffice .config/transmission .eclipse @@ -0,0 +1 @@ +require 'rubygems' unless defined? Gem # only needed in 1.8 @@ -25,13 +25,6 @@ done # Settings ########################################################### -# TMPDIR -if [ -d "$HOME/tmp" ]; then - export TMPDIR="$HOME/tmp" -elif [ -d "$HOME/.prefix/tmp" ]; then - export TMPDIR="$HOME/.prefix/tmp" -fi - # Text editor if [ -f "$HOME/.selected_editor" ]; then . "$HOME/.selected_editor" @@ -58,7 +51,9 @@ if [ -x "`which alsactl 2>/dev/null`" ]; then fi # X11 -export XAUTHORITY=$HOME/.Xauthority +if [ -z "$XAUTHORITY" ]; then + export XAUTHORITY=$HOME/.Xauthority +fi # D-Bus if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then |