diff --git a/.bashrc b/.bashrc index aa27644..c467bd7 100644 --- a/.bashrc +++ b/.bashrc @@ -117,10 +117,20 @@ if ! shopt -oq posix; then fi parse_git_branch() { - git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' + + CURR_BRANCH="$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/')" + + if [[ -z "$CURR_BRANCH" ]]; then + return + fi + + GIT_MSG="$CURR_BRANCH" + + echo "$GIT_MSG" + } -export PS1="$PS1\[\033[33m\]\$(parse_git_branch)\[\033[00m\] " +export PS1="$PS1\033[33m\$(parse_git_branch)\033[00m " set -o vi export VISUAL=vim @@ -144,3 +154,6 @@ fi unset __conda_setup # <<< conda initialize <<< +export PATH=$PATH:/usr/local/go/bin + +. /home/cowley/venv/default/bin/activate diff --git a/.vimrc b/.vimrc index 7be08cc..01cc275 100755 --- a/.vimrc +++ b/.vimrc @@ -34,7 +34,7 @@ Plugin 'tpope/vim-repeat' Plugin 'davidhalter/jedi-vim' " python folding -Plugin 'tmhedberg/SimpylFold' +"Plugin 'tmhedberg/SimpylFold' " ack search tool Plugin 'mileszs/ack.vim' @@ -63,6 +63,9 @@ Plugin 'vim-scripts/mru.vim' " aka zencoding: Plugin 'mattn/emmet-vim' +" Spell check +Plugin 'kamykn/spelunker.vim' + call vundle#end() @@ -84,6 +87,8 @@ set expandtab set incsearch " highlight search results set hlsearch +" case insensitive IFF search string is all lower case +set smartcase " number of lines to keep below/above cursor, ie scroll when cursor gets " within 10 spaces top/bottom of screen