Add files via upload
This commit is contained in:
17
.bashrc
17
.bashrc
@@ -117,10 +117,20 @@ if ! shopt -oq posix; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
parse_git_branch() {
|
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
|
set -o vi
|
||||||
export VISUAL=vim
|
export VISUAL=vim
|
||||||
@@ -144,3 +154,6 @@ fi
|
|||||||
unset __conda_setup
|
unset __conda_setup
|
||||||
# <<< conda initialize <<<
|
# <<< conda initialize <<<
|
||||||
|
|
||||||
|
export PATH=$PATH:/usr/local/go/bin
|
||||||
|
|
||||||
|
. /home/cowley/venv/default/bin/activate
|
||||||
|
|||||||
7
.vimrc
7
.vimrc
@@ -34,7 +34,7 @@ Plugin 'tpope/vim-repeat'
|
|||||||
Plugin 'davidhalter/jedi-vim'
|
Plugin 'davidhalter/jedi-vim'
|
||||||
|
|
||||||
" python folding
|
" python folding
|
||||||
Plugin 'tmhedberg/SimpylFold'
|
"Plugin 'tmhedberg/SimpylFold'
|
||||||
|
|
||||||
" ack search tool
|
" ack search tool
|
||||||
Plugin 'mileszs/ack.vim'
|
Plugin 'mileszs/ack.vim'
|
||||||
@@ -63,6 +63,9 @@ Plugin 'vim-scripts/mru.vim'
|
|||||||
" aka zencoding:
|
" aka zencoding:
|
||||||
Plugin 'mattn/emmet-vim'
|
Plugin 'mattn/emmet-vim'
|
||||||
|
|
||||||
|
" Spell check
|
||||||
|
Plugin 'kamykn/spelunker.vim'
|
||||||
|
|
||||||
call vundle#end()
|
call vundle#end()
|
||||||
|
|
||||||
|
|
||||||
@@ -84,6 +87,8 @@ set expandtab
|
|||||||
set incsearch
|
set incsearch
|
||||||
" highlight search results
|
" highlight search results
|
||||||
set hlsearch
|
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
|
" number of lines to keep below/above cursor, ie scroll when cursor gets
|
||||||
" within 10 spaces top/bottom of screen
|
" within 10 spaces top/bottom of screen
|
||||||
|
|||||||
Reference in New Issue
Block a user