Commits

James Sumners  committed 8fe16e1

* Add an alias for apt-get to aptitude
* Change line endings to Unix because Notepad++ was retarded

  • Participants
  • Parent commits 3077dba

Comments (0)

Files changed (6)

-### Personal customizations ###
-
-alias ls='ls --color=auto'
-
-[ -e "`which most 2> /dev/null`" ] && export PAGER='most'
-[ -e "`which vim 2> /dev/null`" ] && export EDITOR='vim'
-
-##################################################
-# The home directory (HOME) is replaced with a ~
-# The last pwdmaxlen characters of the PWD are displayed
-# Leading partial directory names are striped off
-# /home/me/stuff          -> ~/stuff               if USER=me
-# /usr/share/big_dir_name -> ../share/big_dir_name if pwdmaxlen=20
-##################################################
-function bash_prompt_command() {
-    # How many characters of the $PWD should be kept
-    local pwdmaxlen=25
-    # Indicate that there has been dir truncation
-    local trunc_symbol=".."
-    local dir=${PWD##*/}
-    pwdmaxlen=$(( ( pwdmaxlen < ${#dir} ) ? ${#dir} : pwdmaxlen ))
-    NEW_PWD=${PWD/#$HOME/\~}
-    local pwdoffset=$(( ${#NEW_PWD} - pwdmaxlen ))
-    if [ ${pwdoffset} -gt "0" ]
-    then
-        NEW_PWD=${NEW_PWD:$pwdoffset:$pwdmaxlen}
-        NEW_PWD=${trunc_symbol}/${NEW_PWD#*/}
-    fi
-
-    export NEW_PWD
-}
-
-PROMPT_COMMAND=bash_prompt_command
-# Color chart @ http://wiki.archlinux.org/index.php/Color_Bash_Prompt
-case "${TERM}" in
-    "xterm")
-        TITLEBAR='\[\033]0;\u@\h > ${NEW_PWD}\007\]'
-        PS1="${TITLEBAR}\[\e[1;32m\][\[\e[0;36m\]\u\[\e[1;32m\]@\[\e[1;33m\]\h\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;32m\]\$ \[\e[0m\]"
-        ;;
-    "screen")
-        TITLEBAR='\033_\u@\h > ${NEW_PWD}\033\\'
-        ESC='\[\ek\]\[\e\\\]'
-        PS1="\[\e[1;32m\][\[\e[0;36m\]\u\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;32m\]\$\[\e[0m\] ${ESC}"
-        ;;
-    *)
-        PS1="\[\e[1;32m\][\[\e[0;36m\]\u\[\e[1;32m\]@\[\e[1;33m\]\h\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;32m\]\$ \[\e[0m\]"
-    ;;
-esac
-
-shopt -s checkwinsize
-
-# Because screen won't update the xterm title if you set hardstatus to alwayslastline
+### Personal customizations ###
+
+alias ls='ls --color=auto'
+
+[ -e "`which most 2> /dev/null`" ] && export PAGER='most'
+[ -e "`which vim 2> /dev/null`" ] && export EDITOR='vim'
+
+##################################################
+# The home directory (HOME) is replaced with a ~
+# The last pwdmaxlen characters of the PWD are displayed
+# Leading partial directory names are striped off
+# /home/me/stuff          -> ~/stuff               if USER=me
+# /usr/share/big_dir_name -> ../share/big_dir_name if pwdmaxlen=20
+##################################################
+function bash_prompt_command() {
+    # How many characters of the $PWD should be kept
+    local pwdmaxlen=25
+    # Indicate that there has been dir truncation
+    local trunc_symbol=".."
+    local dir=${PWD##*/}
+    pwdmaxlen=$(( ( pwdmaxlen < ${#dir} ) ? ${#dir} : pwdmaxlen ))
+    NEW_PWD=${PWD/#$HOME/\~}
+    local pwdoffset=$(( ${#NEW_PWD} - pwdmaxlen ))
+    if [ ${pwdoffset} -gt "0" ]
+    then
+        NEW_PWD=${NEW_PWD:$pwdoffset:$pwdmaxlen}
+        NEW_PWD=${trunc_symbol}/${NEW_PWD#*/}
+    fi
+
+    export NEW_PWD
+}
+
+PROMPT_COMMAND=bash_prompt_command
+# Color chart @ http://wiki.archlinux.org/index.php/Color_Bash_Prompt
+case "${TERM}" in
+    "xterm")
+        TITLEBAR='\[\033]0;\u@\h > ${NEW_PWD}\007\]'
+        PS1="${TITLEBAR}\[\e[1;32m\][\[\e[0;36m\]\u\[\e[1;32m\]@\[\e[1;33m\]\h\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;32m\]\$ \[\e[0m\]"
+        ;;
+    "screen")
+        TITLEBAR='\033_\u@\h > ${NEW_PWD}\033\\'
+        ESC='\[\ek\]\[\e\\\]'
+        PS1="\[\e[1;32m\][\[\e[0;36m\]\u\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;32m\]\$\[\e[0m\] ${ESC}"
+        ;;
+    *)
+        PS1="\[\e[1;32m\][\[\e[0;36m\]\u\[\e[1;32m\]@\[\e[1;33m\]\h\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;32m\]\$ \[\e[0m\]"
+    ;;
+esac
+
+shopt -s checkwinsize
+
+# Because screen won't update the xterm title if you set hardstatus to alwayslastline
 alias screen='echo -ne "\[\033]0;${USER}@`hostname` > screen\007\]"; screen'
-### Personal customizations ###
-
-[ -e "`which most 2> /dev/null`" ] && export PAGER='most'
-[ -e "`which vim 2> /dev/null`" ] && export EDITOR='vim'
-
-##################################################
-# The home directory (HOME) is replaced with a ~
-# The last pwdmaxlen characters of the PWD are displayed
-# Leading partial directory names are striped off
-# /home/me/stuff          -> ~/stuff               if USER=me
-# /usr/share/big_dir_name -> ../share/big_dir_name if pwdmaxlen=20
-##################################################
-function bash_prompt_command() {
-    # How many characters of the $PWD should be kept
-    local pwdmaxlen=25
-    # Indicate that there has been dir truncation
-    local trunc_symbol=".."
-    local dir=${PWD##*/}
-    pwdmaxlen=$(( ( pwdmaxlen < ${#dir} ) ? ${#dir} : pwdmaxlen ))
-    NEW_PWD=${PWD/#$HOME/\~}
-    local pwdoffset=$(( ${#NEW_PWD} - pwdmaxlen ))
-    if [ ${pwdoffset} -gt "0" ]
-    then
-        NEW_PWD=${NEW_PWD:$pwdoffset:$pwdmaxlen}
-        NEW_PWD=${trunc_symbol}/${NEW_PWD#*/}
-    fi
-
-    export NEW_PWD
-}
-
-PROMPT_COMMAND=bash_prompt_command
-# Color chart @ http://wiki.archlinux.org/index.php/Color_Bash_Prompt
-case "${TERM}" in
-    "xterm")
-        TITLEBAR='\[\033]0;\u@\h > ${NEW_PWD}\007\]'
-        PS1="${TITLEBAR}\[\e[1;32m\][\[\e[1;31m\]\u\[\e[1;32m\]@\[\e[1;33m\]\h\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;31m\]# \[\e[0m\]"
-        ;;
-    "screen")
-        TITLEBAR='\[\033]0;\u@\h > ${NEW_PWD}\007\]'
-        ESC='\[\ek\]\[\e\\\]'
-        PS1="\[\e[1;32m\][\[\e[1;31m\]\u\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;31m\]#\[\e[0m\] ${ESC}"
-        ;;
-    *)
-        PS1="\[\e[1;32m\][\[\e[1;31m\]\u\[\e[1;32m\]@\[\e[1;33m\]\h\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;31m\]# \[\e[0m\]"
-    ;;
-esac
-
-shopt -s checkwinsize
-
-# Because screen won't update the xterm title if you set hardstatus to alwayslastline
+### Personal customizations ###
+
+[ -e "`which most 2> /dev/null`" ] && export PAGER='most'
+[ -e "`which vim 2> /dev/null`" ] && export EDITOR='vim'
+
+[ -e "`which aptitude 2> /dev/null`" ] && alias apt-get="aptitude"
+
+##################################################
+# The home directory (HOME) is replaced with a ~
+# The last pwdmaxlen characters of the PWD are displayed
+# Leading partial directory names are striped off
+# /home/me/stuff          -> ~/stuff               if USER=me
+# /usr/share/big_dir_name -> ../share/big_dir_name if pwdmaxlen=20
+##################################################
+function bash_prompt_command() {
+    # How many characters of the $PWD should be kept
+    local pwdmaxlen=25
+    # Indicate that there has been dir truncation
+    local trunc_symbol=".."
+    local dir=${PWD##*/}
+    pwdmaxlen=$(( ( pwdmaxlen < ${#dir} ) ? ${#dir} : pwdmaxlen ))
+    NEW_PWD=${PWD/#$HOME/\~}
+    local pwdoffset=$(( ${#NEW_PWD} - pwdmaxlen ))
+    if [ ${pwdoffset} -gt "0" ]
+    then
+        NEW_PWD=${NEW_PWD:$pwdoffset:$pwdmaxlen}
+        NEW_PWD=${trunc_symbol}/${NEW_PWD#*/}
+    fi
+
+    export NEW_PWD
+}
+
+PROMPT_COMMAND=bash_prompt_command
+# Color chart @ http://wiki.archlinux.org/index.php/Color_Bash_Prompt
+case "${TERM}" in
+    "xterm")
+        TITLEBAR='\[\033]0;\u@\h > ${NEW_PWD}\007\]'
+        PS1="${TITLEBAR}\[\e[1;32m\][\[\e[1;31m\]\u\[\e[1;32m\]@\[\e[1;33m\]\h\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;31m\]# \[\e[0m\]"
+        ;;
+    "screen")
+        TITLEBAR='\[\033]0;\u@\h > ${NEW_PWD}\007\]'
+        ESC='\[\ek\]\[\e\\\]'
+        PS1="\[\e[1;32m\][\[\e[1;31m\]\u\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;31m\]#\[\e[0m\] ${ESC}"
+        ;;
+    *)
+        PS1="\[\e[1;32m\][\[\e[1;31m\]\u\[\e[1;32m\]@\[\e[1;33m\]\h\[\e[1;32m\]] \[\e[0;37m\]\${NEW_PWD}/ \[\e[1;31m\]# \[\e[0m\]"
+    ;;
+esac
+
+shopt -s checkwinsize
+
+# Because screen won't update the xterm title if you set hardstatus to alwayslastline
 alias screen='echo -ne "\[\033]0;ROOT@`hostname` > screen\007\]"; screen'
-defscrollback 5000
-
-vbell off
-startup_message off
-hardstatus alwayslastline
-hardstatus string '%{= kg}[%{Y}%H%{g}][%= %{= kw}%?%-Lw%?%{=b kR}(%{W}%n-%t%?(%u)%?%{=b kR})%{= kw}%?%+Lw%?%?%= %{g}][%{Y}%l%{g}]%{g}[%{B}%m.%d.%Y %{G}%c%{g}]'
-termcapinfo xterm|xterms|xs|rxvt ti@:te@
-termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
-
-altscreen on
-shelltitle '$ |bash'
-
-# Binds
-bind s split
+defscrollback 5000
+
+vbell off
+startup_message off
+hardstatus alwayslastline
+hardstatus string '%{= kg}[%{Y}%H%{g}][%= %{= kw}%?%-Lw%?%{=b kR}(%{W}%n-%t%?(%u)%?%{=b kR})%{= kw}%?%+Lw%?%?%= %{g}][%{Y}%l%{g}]%{g}[%{B}%m.%d.%Y %{G}%c%{g}]'
+termcapinfo xterm|xterms|xs|rxvt ti@:te@
+termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
+
+altscreen on
+shelltitle '$ |bash'
+
+# Binds
+bind s split
 bind S remove

File screenrc.root

-defscrollback 5000
-
-vbell off
-startup_message off
-hardstatus alwayslastline
-hardstatus string '%{= kg}[%{Y}%H%{g}][%= %{= kw}%?%-Lw%?%{=b kR}(%{W}%n-%t%?(%u)%?%{=b kR})%{= kw}%?%+Lw%?%?%= %{g}][%{Y}%l%{g}]%{g}[%{B}%m.%d.%Y %{G}%c%{g}]'
-termcapinfo xterm|xterms|xs|rxvt ti@:te@
-termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
-
-altscreen on
-shelltitle '$ |bash'
-
-# Binds
-bind s split
+defscrollback 5000
+
+vbell off
+startup_message off
+hardstatus alwayslastline
+hardstatus string '%{= kg}[%{Y}%H%{g}][%= %{= kw}%?%-Lw%?%{=b kR}(%{W}%n-%t%?(%u)%?%{=b kR})%{= kw}%?%+Lw%?%?%= %{g}][%{Y}%l%{g}]%{g}[%{B}%m.%d.%Y %{G}%c%{g}]'
+termcapinfo xterm|xterms|xs|rxvt ti@:te@
+termcapinfo xterm 'hs:ts=\E]2;:fs=\007:ds=\E]2;screen\007'
+
+altscreen on
+shelltitle '$ |bash'
+
+# Binds
+bind s split
 bind S remove
-" Set the title string to the current file being edited
-let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]"
-if &term == "screen" || &term == "xterm"
-  set title
-endif
-
-" Jump to last position from previous edit
-if has("autocmd")
-    au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
-    \| exe "normal! g'\"" | endif
-endif
-
-" Custom Settings
-syntax on
-set cindent " smarter smartindent
-set shiftwidth=4 " instead of 8
-set tabstop=4 " instead of 8
-set shiftwidth=4 " instead of 8
-set background=dark " brighter colors for dark terminals
-set showcmd " show the current command in the bottom bar
-set showmatch " show the matching {([<
-set ignorecase " for searching
-set hlsearch " highlight searches
-set ruler " display line,col in lower right
+" Set the title string to the current file being edited
+let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]"
+if &term == "screen" || &term == "xterm"
+  set title
+endif
+
+" Jump to last position from previous edit
+if has("autocmd")
+    au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
+    \| exe "normal! g'\"" | endif
+endif
+
+" Custom Settings
+syntax on
+set cindent " smarter smartindent
+set shiftwidth=4 " instead of 8
+set tabstop=4 " instead of 8
+set shiftwidth=4 " instead of 8
+set background=dark " brighter colors for dark terminals
+set showcmd " show the current command in the bottom bar
+set showmatch " show the matching {([<
+set ignorecase " for searching
+set hlsearch " highlight searches
+set ruler " display line,col in lower right
 set scrolloff=3 " show some context at the bottom of the screen
-" Set the title string to the current file being edited
-let &titlestring = "ROOT@" . hostname() . "[vim(" . expand("%:t") . ")]"
-if &term == "xterm"
-  set title
-endif
-
-" Jump to last position from previous edit
-if has("autocmd")
-    au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
-    \| exe "normal! g'\"" | endif
-endif
-
-" Custom Settings
-syntax on
-set cindent " smarter smartindent
-set shiftwidth=4 " instead of 8
-set tabstop=4 " instead of 8
-set shiftwidth=4 " instead of 8
-set background=dark " brighter colors for dark terminals
-set showcmd " show the current command in the bottom bar
-set showmatch " show the matching {([<
-set ignorecase " for searching
-set hlsearch " highlight searches
-set ruler " display line,col in lower right
+" Set the title string to the current file being edited
+let &titlestring = "ROOT@" . hostname() . "[vim(" . expand("%:t") . ")]"
+if &term == "xterm"
+  set title
+endif
+
+" Jump to last position from previous edit
+if has("autocmd")
+    au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
+    \| exe "normal! g'\"" | endif
+endif
+
+" Custom Settings
+syntax on
+set cindent " smarter smartindent
+set shiftwidth=4 " instead of 8
+set tabstop=4 " instead of 8
+set shiftwidth=4 " instead of 8
+set background=dark " brighter colors for dark terminals
+set showcmd " show the current command in the bottom bar
+set showmatch " show the matching {([<
+set ignorecase " for searching
+set hlsearch " highlight searches
+set ruler " display line,col in lower right
 set scrolloff=3 " show some context at the bottom of the screen