split up bashrc and put it in ~/.config/bash

6 files changed, 118 insertions, 124 deletions

diff --git a/.bashrc b/.bashrc
index f792c0c..6f478c3 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,124 +1 @@
-# /etc/skel/.bashrc
-#
-# This file is sourced by all *interactive* bash shells on startup,
-# including some apparently interactive shells such as scp and rcp
-# that can't tolerate any output.  So make sure this doesn't display
-# anything or bad things will happen !
-
-[[ -d ~/bin/  ]] && PATH="~/bin/:$PATH"
-[[ -d ~/.bin/ ]] && PATH="~/.bin/:$PATH"
-
-# Test for an interactive shell.  There is no need to set anything
-# past this point for scp and rcp, and it's important to refrain from
-# outputting anything in those cases.
-if [[ $- != *i* ]] ; then
-	# Shell is non-interactive.  Be done now!
-	return
-fi
-# enable bashcompletion
-alias ebc="[[ -f /etc/profile.d/bash-completion.sh ]] && source /etc/profile.d/bash-completion.sh"
-
-alias player="/home/ben/coding/cpp/audio/player"
-alias packages="eix -I --format \" \" |  grep --color=never Found.*matches."
-alias gplay="gnome-mplayer"
-
-max() { [[ $# -eq  2 ]] && ( [[ $1 -ge $2 ]] && echo $1 || echo $2 ) }
-
-resize_to_min() {
-#  eval $(resize -s $(max $LINES $2) $(max $COLUMNS $1))
-  printf "\e[8;%d;%dt" $(max $LINES $2) $(max $COLUMNS $1)
-}
-# list hidden files  - if directory do NOT show contents and dont display ".."
-alias lh="ls -d .[^.]*"
-alias r="resize_to_min 100 35"
-#export PAGER="col -b 2>/dev/null | view -c 'set ft=man' -c 'set titlestring=[view]man' -c 'set number!' -"
-#export PAGER="sed 's/\[[^m]*m//g; s/.//g' | view -c 'set ft=man' -c 'set titlestring=[view]man' -c 'set number!' -"
-#export MANWIDTH=4294967296
-#export PAGER="sed 's/\[[^m]*m//g' | view -c 'set ft=man' -c 'set titlestring=[view]man' -c 'set number!' -"
-
-# since vim has support - use built in ones..
-export MANPAGER="vimmanpager"
-export PAGER="vimpager"
-
-alias vim="r; vim"
-alias man="r; man"
-
-alias ccat="highlight --ansi"
-alias hhtml="highlight --wrap --xhtml --linenumbers --anchors --linenumbers --anchor-prefix=line"
-
-alias use="quse -D"
-alias tv="~/.scripts/tv.sh"
-# if files are requested to open, open in existing in tabs.
-gvim() {
-	/usr/bin/gvim $([[ $# > 0 ]] && echo --remote-tab-silent $@)
-}
-
-[[ -f ~/.bashrc.functions ]] && source ~/.bashrc.functions
-
-if [[ ${EUID} == 0 ]]; then
-	DELIM_COL='\[\e[0;31m\]'
-	DIR_COL='\[\e[0;34m\]'
-	UNAME_COL='\[\e[0;31m\]'
-else
-	DELIM_COL='\[\e[0;34m\]'
-	DIR_COL='\[\e[0;32m\]'
-	UNAME_COL='\[\e[1;32m\]'
-fi
-NOR_COL='\[\e[0m\]'
-
-PS1="${DELIM_COL}[${DIR_COL}\W${DELIM_COL}] \\\$ ${NOR_COL}"
-[[ -n $SSH_CLIENT ]] && PS1="${UNAME_COL}`[[ ${EUID} != 0 ]] && echo '\u@'`\h $PS1"
-
-unset BRACKET_COL DIR_COL PROMPT_COL NOR_COL UNAME_COL
-
-#if [[ ${EUID} == 0 ]] ; then
-#  PS1='\[\e[0;31m\][\[\e[0;34m\]\W\[\e[0;31m\]] \$\[\e[0m\] '
-#  [[ -n $SSH_CLIENT ]] && PS1="\[\e[0;31m\]\h\[\e[0m\] $PS1"
-#else
-#  PS1='\[\e[0;34m\][\[\e[0;32m\]\W\[\e[0;34m\]] \$\[\e[0m\] '
-#  [[ -n $SSH_CLIENT ]] && PS1="\[\e[1;32m\]\u@\h\[\e[0m\] $PS1"
-
-#fi
-
-##PS1="\$(test \$(~/coding/c/get_cursor_pos) -gt 1 && echo '\[\n\]')${PS1}"
-
-##PS1="\$([[ \$(get_cursor_y) -gt 1 ]] && echo -n '\[\n\]')$PS1"
-##PS1="\$(prompt_nl_needed && echo '\[\n\]')${PS1}"
-
-#PS1="\$(print_prompt_nl_if_needed)${PS1}"
-
-#PS1="\$(~/coding/c/nl_if_needed)$PS1"
-
-#inspired by http://www.xfce-look.org/content/show.php/My+Destkop+(December)?content=50362
-#PS1="\[\e[\$((COLUMNS-\$(echo -n '\W' | wc -c)-2))G\] [\W]\[\e[0G\]\$ "
-CMD="\$(date +%H:%M)"
-
-#PS1="\[\e[\$((COLUMNS-\$(echo -n $CMD | wc -c)-2))G\] \[\e[0;34m\][\[\e[0;32m\]$CMD\[\e[0;34m\]]\[\e[0G\]${PS1}" 
-#PS1="$PS1\[\e[s\[\e[\$((COLUMNS-\$(echo -n $CMD | wc -c)-2))G\]abc\[\e[u\]"
-
-#if [[ ${EUID} != 0 ]] ; then
-  #PS1='\[\033[1;34m\]\W \$\[\033[00m\] '
-  #PS1='[\[\e[0;31m\]\W\[\e[0m\]] \$ '
-  #PS1='\[\033[01;32m\]\u\[\033[00m\]@\[\033[01;31m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ '
-  #PS1='\[\e[1;31m\][\[\e[1;32m\]\W\[\e[1;31m\]]\[\e[1;34m\] \$\[\e[0m\] '
-  #PS1='\[\e[0;34m\][\[\e[0;32m\]\W\[\e[0;34m\]] \$\[\e[0m\] '
-  #PS1='\[\033[01;32m\]\u\[\033[00m\]@\[\033[01;31m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ '
-  #PS1='[\[\e[36;40m\]\u\[\e[0m\]] \[\e[32;40m\]\W \[\e[0m\]\$ '
-  #PS1='[\u \w]\$ '
-  #PS1="\[\033[0;36m\]\t\[\033[1;35m\]^\
-    #\[\033[0;32m\]\u\[\033[1;34m\]@\[\033[0;32m\]\
-    #\h\[\033[1;35m\]:\[\033[1;33m\]\w\[\033[0m\]\
-    #\[\033[1;34m\]$\[\033[0m\] "
-#fi
-
-#for matlab - wont start with out this
-#export LIBXCB_ALLOW_SLOPPY_LOCK=true
-
-#for sdl
-export SDL_AUDIODRIVER=alsa
-export AUDIODEV=plug:upmix
-
-
-export XDG_DATA_HOME="${HOME}/.config"
-export XDG_CONFIG_HOME="${HOME}/.config"
-export INPUTRC="${XDG_CONFIG_HOME}/readline/inputrc"
+source ~/.config/bash/bashrc
diff --git a/.config/bash/.bashrc.swp b/.config/bash/.bashrc.swp
new file mode 100644
index 0000000..3ce3a05
--- /dev/null
+++ b/.config/bash/.bashrc.swp
diff --git a/.config/bash/alias.sh b/.config/bash/alias.sh
new file mode 100644
index 0000000..06bb069
--- /dev/null
+++ b/.config/bash/alias.sh
@@ -0,0 +1,19 @@
+# enable bashcompletion
+alias ebc="[[ -f /etc/profile.d/bash-completion.sh ]] && source /etc/profile.d/bash-completion.sh"
+
+alias player="/home/ben/coding/cpp/audio/player"
+alias packages="eix -I --format \" \" |  grep --color=never Found.*matches."
+alias gplay="gnome-mplayer"
+
+# list hidden files  - if directory do NOT show contents and dont display ".."
+alias lh="ls -d .[^.]*"
+alias r="resize_to_min 100 35"
+alias vim="r; vim"
+alias man="r; man"
+
+alias ccat="highlight --ansi"
+alias hhtml="highlight --wrap --xhtml --linenumbers --anchors --linenumbers --anchor-prefix=line"
+
+alias use="quse -D"
+alias tv="~/.scripts/tv.sh"
+
diff --git a/.config/bash/bashrc b/.config/bash/bashrc
new file mode 100644
index 0000000..3fd0fcb
--- /dev/null
+++ b/.config/bash/bashrc
@@ -0,0 +1,11 @@
+[[ -d ~/bin/  ]] && PATH="~/bin/:$PATH"
+[[ -d ~/.bin/ ]] && PATH="~/.bin/:$PATH"
+
+if [[ $- != *i* ]] ; then
+	# Shell is non-interactive.  Be done now!
+	return
+fi
+
+source ~/.config/bash/environment.sh
+source ~/.config/bash/functions.sh
+source ~/.config/bash/alias.sh
diff --git a/.config/bash/environment.sh b/.config/bash/environment.sh
new file mode 100644
index 0000000..8781e92
--- /dev/null
+++ b/.config/bash/environment.sh
@@ -0,0 +1,76 @@
+#export PAGER="col -b 2>/dev/null | view -c 'set ft=man' -c 'set titlestring=[view]man' -c 'set number!' -"
+#export PAGER="sed 's/\[[^m]*m//g; s/.//g' | view -c 'set ft=man' -c 'set titlestring=[view]man' -c 'set number!' -"
+#export MANWIDTH=4294967296
+#export PAGER="sed 's/\[[^m]*m//g' | view -c 'set ft=man' -c 'set titlestring=[view]man' -c 'set number!' -"
+
+# since vim has support - use built in ones..
+export MANPAGER="vimmanpager"
+export PAGER="vimpager"
+
+if [[ ${EUID} == 0 ]]; then
+	DELIM_COL='\[\e[0;31m\]'
+	DIR_COL='\[\e[0;34m\]'
+	UNAME_COL='\[\e[0;31m\]'
+else
+	DELIM_COL='\[\e[0;34m\]'
+	DIR_COL='\[\e[0;32m\]'
+	UNAME_COL='\[\e[1;32m\]'
+fi
+NOR_COL='\[\e[0m\]'
+
+PS1="${DELIM_COL}[${DIR_COL}\W${DELIM_COL}] \\\$ ${NOR_COL}"
+[[ -n $SSH_CLIENT ]] && PS1="${UNAME_COL}`[[ ${EUID} != 0 ]] && echo '\u@'`\h $PS1"
+
+unset BRACKET_COL DIR_COL PROMPT_COL NOR_COL UNAME_COL
+
+#if [[ ${EUID} == 0 ]] ; then
+#  PS1='\[\e[0;31m\][\[\e[0;34m\]\W\[\e[0;31m\]] \$\[\e[0m\] '
+#  [[ -n $SSH_CLIENT ]] && PS1="\[\e[0;31m\]\h\[\e[0m\] $PS1"
+#else
+#  PS1='\[\e[0;34m\][\[\e[0;32m\]\W\[\e[0;34m\]] \$\[\e[0m\] '
+#  [[ -n $SSH_CLIENT ]] && PS1="\[\e[1;32m\]\u@\h\[\e[0m\] $PS1"
+
+#fi
+
+##PS1="\$(test \$(~/coding/c/get_cursor_pos) -gt 1 && echo '\[\n\]')${PS1}"
+
+##PS1="\$([[ \$(get_cursor_y) -gt 1 ]] && echo -n '\[\n\]')$PS1"
+##PS1="\$(prompt_nl_needed && echo '\[\n\]')${PS1}"
+
+#PS1="\$(print_prompt_nl_if_needed)${PS1}"
+
+#PS1="\$(~/coding/c/nl_if_needed)$PS1"
+
+#inspired by http://www.xfce-look.org/content/show.php/My+Destkop+(December)?content=50362
+#PS1="\[\e[\$((COLUMNS-\$(echo -n '\W' | wc -c)-2))G\] [\W]\[\e[0G\]\$ "
+CMD="\$(date +%H:%M)"
+
+#PS1="\[\e[\$((COLUMNS-\$(echo -n $CMD | wc -c)-2))G\] \[\e[0;34m\][\[\e[0;32m\]$CMD\[\e[0;34m\]]\[\e[0G\]${PS1}" 
+#PS1="$PS1\[\e[s\[\e[\$((COLUMNS-\$(echo -n $CMD | wc -c)-2))G\]abc\[\e[u\]"
+
+#if [[ ${EUID} != 0 ]] ; then
+  #PS1='\[\033[1;34m\]\W \$\[\033[00m\] '
+  #PS1='[\[\e[0;31m\]\W\[\e[0m\]] \$ '
+  #PS1='\[\033[01;32m\]\u\[\033[00m\]@\[\033[01;31m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ '
+  #PS1='\[\e[1;31m\][\[\e[1;32m\]\W\[\e[1;31m\]]\[\e[1;34m\] \$\[\e[0m\] '
+  #PS1='\[\e[0;34m\][\[\e[0;32m\]\W\[\e[0;34m\]] \$\[\e[0m\] '
+  #PS1='\[\033[01;32m\]\u\[\033[00m\]@\[\033[01;31m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ '
+  #PS1='[\[\e[36;40m\]\u\[\e[0m\]] \[\e[32;40m\]\W \[\e[0m\]\$ '
+  #PS1='[\u \w]\$ '
+  #PS1="\[\033[0;36m\]\t\[\033[1;35m\]^\
+    #\[\033[0;32m\]\u\[\033[1;34m\]@\[\033[0;32m\]\
+    #\h\[\033[1;35m\]:\[\033[1;33m\]\w\[\033[0m\]\
+    #\[\033[1;34m\]$\[\033[0m\] "
+#fi
+
+#for matlab - wont start with out this
+#export LIBXCB_ALLOW_SLOPPY_LOCK=true
+
+#for sdl
+export SDL_AUDIODRIVER=alsa
+export AUDIODEV=plug:upmix
+
+
+export XDG_DATA_HOME="${HOME}/.config"
+export XDG_CONFIG_HOME="${HOME}/.config"
+export INPUTRC="${XDG_CONFIG_HOME}/readline/inputrc"
diff --git a/.bashrc.functions b/.config/bash/functions.sh
index 60f59c2..34bd71b 100644
--- a/.bashrc.functions
+++ b/.config/bash/functions.sh
@@ -1,3 +1,14 @@
+max() { [[ $# -eq  2 ]] && ( [[ $1 -ge $2 ]] && echo $1 || echo $2 ) }
+
+resize_to_min() {
+#  eval $(resize -s $(max $LINES $2) $(max $COLUMNS $1))
+  printf "\e[8;%d;%dt" $(max $LINES $2) $(max $COLUMNS $1)
+}
+
+gvim() {
+	/usr/bin/gvim $([[ $# > 0 ]] && echo --remote-tab-silent $@)
+}
+
 print_prompt_nl_if_needed() {
   local pos
   local char