summaryrefslogtreecommitdiff
path: root/.config/bash
diff options
context:
space:
mode:
Diffstat (limited to '.config/bash')
-rw-r--r--.config/bash/aliases.sh47
-rw-r--r--.config/bash/login.sh9
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"