Permalink
Browse files

yay! no more dependency on bash loginShell!

  • Loading branch information...
1 parent 4f2ef7b commit 0c194b58f9f72236d808e9234437b78b2f71ebb7 @jzacsh committed Jan 19, 2013
Showing with 33 additions and 36 deletions.
  1. +20 −11 .bash_profile
  2. +10 −3 .bashrc
  3. +3 −0 .host/src/distro.ubuntu/.tmux.conf
  4. +0 −22 .pam_environment
View
@@ -1,15 +1,5 @@
#!/usr/bin/env bash
-#colors:
-col_red='\[\e[1;31m\]'
-col_grn='\[\e[1;32m\]'
-col_blu='\[\e[1;34m\]'
-col_end='\[\e[m\]'
-#
-
-# my env. variables, just where ubuntu demands it.
-[[ -r ~/.pam_environment ]] && source ~/.pam_environment
-
#make sure dropbox is running
if [[ $(type -p dropbox &> /dev/null) ]];then
pidof dropbox &> /dev/null || dropbox start >/dev/null & disown
@@ -20,8 +10,27 @@ if [[ -n $DBUS_SESSION_BUS_ADDRESS ]];then
echo "$DBUS_SESSION_BUS_ADDRESS" > ~/.dbus_address
fi
+export EDITOR=vim
+export DIFF=' up '
+export LESS=' XFRr '
+export RLWRAP=' AaN '
+export PAGER=less
+ PATH=$HOME/bin:$HOME/bin/local:$HOME/bin/share:$HOME/bin/dist:$HOME/bin/lib:/srv/http/global/bin/dev/:$HOME/usr/local/bin/androidsdk/platform-tools:$HOME/usr/local/bin/androidsdk/tools:$PATH
+export PATH
+export RUBYOPT='w' #helpful ruby warnings
+export GREP_OPTIONS='--color=auto'
+export CLASSPATH=$HOME/var/edu/princenton/algs4/:$CLASSPATH
+export CSCOPE_DB=$HOME/.vim/cscope.out
+export COWER='cower --color=auto'
+export BROWSER=w3m
+export SHOT_PUB='shot'
+export SHOT_UPLOAD='ompload'
+export PYTHONPATH="$HOME/usr/lib/python/${PYTHONPATH:+":$PYTHONPATH"}"
+export TTS_CONFIG=~/.ttskeyrc
+export NODE_PATH="/usr/lib/node_modules/:/usr/lib/node/:$NODE_PATH"
+export PASTIE='dpaste'
+
#if interactive, source .bashrc
[[ -n $PS1 && -f ~/.bashrc ]] && source ~/.bashrc
-
# vim: et:ts=4:sw=4
View
13 .bashrc
@@ -1,17 +1,24 @@
# If not running interactively, don't do anything
[[ ${-} = ${-/i/} ]] && return
-source ~/.git-completion.bash
+#colors:
+col_red='\[\e[1;31m\]'
+col_grn='\[\e[1;32m\]'
+col_blu='\[\e[1;34m\]'
+col_end='\[\e[m\]'
+#
+
+[[ -r ~/.bash_aliases ]] && source ~/.bash_aliases
# set a fancy prompt (non-color, unless we know we "want" color)
case "$TERM" in
xterm-color) color_prompt=yes;;
esac
# External config
-[[ -r ~/.bash_aliases ]] && . ~/.bash_aliases
[[ -r ~/.dircolors && -x /bin/dircolors ]] && eval $(dircolors -b ~/.dircolors)
-[[ -r ~/.hgbashrc ]] && . ~/.hgbashrc
+[[ -r ~/.git-completion.bash ]] && source ~/.git-completion.bash
+[[ -r ~/.hgbashrc ]] && source ~/.hgbashrc
# shell opts
shopt -s cdspell
@@ -1,5 +1,8 @@
### Unbind existing tmux key bindings (except 0-9).
+# do not need a login shell
+set-option -g default-command bash
+
set-option -g default-terminal screen-256color
set -g visual-activity off
View
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-export EDITOR=vim
-export DIFF=' up '
-export LESS=' XFRr '
-export RLWRAP=' AaN '
-export PAGER=less
- PATH=$HOME/bin:$HOME/bin/local:$HOME/bin/share:$HOME/bin/dist:$HOME/bin/lib:/srv/http/global/bin/dev/:$HOME/usr/local/bin/androidsdk/platform-tools:$HOME/usr/local/bin/androidsdk/tools:$PATH
-export PATH
-export RUBYOPT='w' #helpful ruby warnings
-export GREP_OPTIONS='--color=auto'
-export CLASSPATH=$HOME/var/edu/princenton/algs4/:$CLASSPATH
-export CSCOPE_DB=$HOME/.vim/cscope.out
-export COWER='cower --color=auto'
-export BROWSER=w3m
-export SHOT_PUB='shot'
-export SHOT_UPLOAD='ompload'
-export PYTHONPATH="$HOME/usr/lib/python/${PYTHONPATH:+":$PYTHONPATH"}"
-export TTS_CONFIG=~/.ttskeyrc
-export NODE_PATH="/usr/lib/node_modules/:/usr/lib/node/:$NODE_PATH"
-export PASTIE='dpaste'
-

0 comments on commit 0c194b5

Please sign in to comment.