diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-27 15:50:32 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-27 15:50:32 -0400 |
commit | 9e79a6c3bbc37c2eec19e055566440f0b1173c5c (patch) | |
tree | 7516e65c0289b9a68b3a97fe2abbdf0d7dba8d8d /.config/bash | |
parent | 5c42078bd052705b69d6ea93ff7617445be43789 (diff) | |
parent | d65775a22e1648eca8e74389a4d9c1c299017cf3 (diff) |
Merge remote-tracking branch 'origin/master' into purdue-cs
Conflicts:
.config/X11/clientrc
.config/bash/rc.d/emacs.sh
.config/bash/rc.sh
.config/conkeror
.config/conkerorrc
.config/emacs/custom.el
.config/irbrc
.config/login.sh
.config/maildirproc/att.rc
.config/maildirproc/default.rc
.config/offlineimaprc
.config/ssh/config
.config/wmii-hg/autostart
.config/wmii-hg/include.sh
.config/wmii-hg/quit
.config/wmii-hg/rbar_battery
.config/wmii-hg/rbar_clock
.config/wmii-hg/rbar_cpu
.config/wmii-hg/rbar_wifi
.conkerorrc
.maildirproc/default.rc
Diffstat (limited to '.config/bash')
-rw-r--r-- | .config/bash/aliases.sh | 47 | ||||
-rw-r--r-- | .config/bash/login.sh | 9 |
2 files changed, 28 insertions, 28 deletions
diff --git a/.config/bash/aliases.sh b/.config/bash/aliases.sh index de1a321..aabd073 100644 --- a/.config/bash/aliases.sh +++ b/.config/bash/aliases.sh @@ -6,23 +6,23 @@ # Set up colors and settings for ls/dir/vdir # ###################################################################### if [ -x "`which dircolors`" ]; then - eval "`dircolors -b`" - alias ls='ls -1v --color=auto' - alias dir='dir -v --color=auto' - alias vdir='vdir -v--color=auto' + eval "`dircolors -b`" + alias ls='ls -1v --color=auto' + alias dir='dir -v --color=auto' + alias vdir='vdir -v--color=auto' - for xgrep in ${PATH//:/\/*grep }/*grep; do - if [ -f "$xgrep" ]; then - xgrep=`basename "$xgrep"` - if [ "$xgrep" != pgrep ]; then - alias $xgrep="$xgrep --color=auto" - fi - fi - done + for xgrep in ${PATH//:/\/*grep }/*grep; do + if [ -f "$xgrep" ]; then + xgrep=`basename "$xgrep"` + if [ "$xgrep" != pgrep ]; then + alias $xgrep="$xgrep --color=auto" + fi + fi + done else - alias ls='ls -1v' - alias dir='dir -v' - alias vdir='vdir -v' + alias ls='ls -1v' + alias dir='dir -v' + alias vdir='vdir -v' fi ###################################################################### @@ -36,8 +36,7 @@ alias l='ls -CF' # Some preferences for miscellaneous stuff # ###################################################################### #alias rm='gvfs-trash' -alias ssh='ssh -XC' -alias sed='sed --follow-symlinks' +#alias sed='sed --follow-symlinks' # breaks sed 4.2.2 alias tree='tree --charset utf8' alias cd=pushd alias gitk='gitk --all --date-order' @@ -48,19 +47,11 @@ alias gitk='gitk --all --date-order' redshift='redshift -l39.9030:85.9979' alias gtk-redshift="gtk-$redshift" alias redshift="$redshift" +unset redshift ###################################################################### # Some almost-function aliases # ###################################################################### -#alias serva='ssh luke@servb.ath.cx -p3440' -#alias phpdoctor='php /usr/gnu/www/0-other/phpdoctor-head/phpdoc.php' -function xterm-title () { echo "];$@"; } # Oh, wait this one *is* a function alias lock="clear; away -C 'This terminal is locked'" -alias plock="xterm-title Terminal Locked;lock" - -###################################################################### -# Other # -###################################################################### -case "$TERM" in - eterm*) alias editor='editor -n';; -esac +alias plock="term-title Terminal Locked;lock" +mvln() { mv $1 $2; ln -s $2 $1; } diff --git a/.config/bash/login.sh b/.config/bash/login.sh new file mode 100644 index 0000000..1269a03 --- /dev/null +++ b/.config/bash/login.sh @@ -0,0 +1,9 @@ +# ~/.bash_login: executed by bash(1) when login shell starts. + +# I think this is sane default behavior + +# Load user settings +. "$HOME/.profile" + +# Load bash settings (automatic for non-login shells) +. "$HOME/.bashrc" |