pre-merge move

4 files changed, 200 insertions, 0 deletions

diff --git a/.config/bash/aliases.sh b/.config/bash/aliases.sh
new file mode 100644
index 0000000..de1a321
--- /dev/null
+++ b/.config/bash/aliases.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+# The above line probably should never be *used* in this file, but it
+# lets text editors know that this is BASH syntax.
+
+######################################################################
+# 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'
+
+    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'
+fi
+
+######################################################################
+# Set up the standard aliases for ls                                 #
+######################################################################
+alias ll='ls -l'
+alias la='ls -a'
+alias l='ls -CF'
+
+######################################################################
+# Some preferences for miscellaneous stuff                           #
+######################################################################
+#alias rm='gvfs-trash'
+alias ssh='ssh -XC'
+alias sed='sed --follow-symlinks'
+alias tree='tree --charset utf8'
+alias cd=pushd
+alias gitk='gitk --all --date-order'
+
+######################################################################
+# Remember lat/long for redshift                                     #
+######################################################################
+redshift='redshift -l39.9030:85.9979'
+alias gtk-redshift="gtk-$redshift"
+alias redshift="$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
diff --git a/.config/bash/logout.sh b/.config/bash/logout.sh
new file mode 100644
index 0000000..a8b88c1
--- /dev/null
+++ b/.config/bash/logout.sh
@@ -0,0 +1,9 @@
+# ~/.bash_logout: executed by bash(1) when login shell exits.
+
+# when leaving the console clear the screen to increase privacy
+
+if [ "$SHLVL" = 1 ]; then
+    [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
+fi
+
+make -C "$HOME"
diff --git a/.config/bash/rc.d/emacs.sh b/.config/bash/rc.d/emacs.sh
new file mode 100644
index 0000000..f484bbb
--- /dev/null
+++ b/.config/bash/rc.d/emacs.sh
@@ -0,0 +1,8 @@
+case "$TERM" in
+	eterm*)
+			SELECTED_EDITOR='emacsclient'
+			EDITOR=$SELECTED_EDITOR
+			VISUAL=$SELECTED_EDITOR
+			export SELECTED_EDITOR EDITOR VISUAL
+			:;;
+esac
diff --git a/.config/bash/rc.sh b/.config/bash/rc.sh
new file mode 100644
index 0000000..ed5d87e
--- /dev/null
+++ b/.config/bash/rc.sh
@@ -0,0 +1,117 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# I include this file for all interactive invocations of bash(1), whether
+# they are login shells or not.
+
+# If not running interactively, don't do anything
+[ -z "$PS1" ] && return
+
+# don't put duplicate lines in the history. See bash(1) for more options
+# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
+export HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups
+# ... or force ignoredups and ignorespace
+export HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+
+# check the window size after each command and, if necessary,
+# 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
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+case "$TERM" in
+    xterm) export TERM=xterm-256color;;
+esac
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    linux)       color_prompt=yes;;
+    *-*color*)   color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	# We have color support; assume it's compliant with Ecma-48
+	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+	# a case would tend to support setf rather than setaf.)
+	color_prompt=yes
+    else
+	color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\n\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\n\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# Include modular config files
+if [ -d ~/.bash.d ]; then
+    for file in ~/.bash.d/*.sh; do
+	. $file;
+    done
+fi
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+fi
+
+if [ -f "$HOME/.login-daemons" ]; then
+    . "$HOME/.login-daemons"
+fi
+
+if [ -f "${HOME}/.gnupg/agent-info" ]; then
+    .   "${HOME}/.gnupg/agent-info"
+    export GPG_AGENT_INFO
+    #export SSH_AUTH_SOCK
+fi
+
+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";
+export PERL5LIB="/home/luke/perl5/lib/perl5/i686-linux-thread-multi:/home/luke/perl5/lib/perl5";
+export PATH="/home/luke/perl5/bin:$PATH";