Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

removed misplaced bundle

  • Loading branch information...
commit 98fcb1258dc7f9091595973a2d43d8be8e424bfd 1 parent 8574970
@kennethlove authored
View
18 .gitmodules
@@ -58,12 +58,24 @@
[submodule ".vim/bundle/vim-less"]
path = .vim/bundle/vim-less
url = https://github.com/groenewege/vim-less.git
-[submodule "bundle/coffee-script"]
- path = bundle/coffee-script
- url = https://github.com/kchmck/vim-coffee-script.git
[submodule ".vim/bundle/makegreen"]
path = .vim/bundle/makegreen
url = https://github.com/reinh/vim-makegreen
[submodule ".vim/bundle/py.test"]
path = .vim/bundle/py.test
url = https://github.com/alfredodeza/pytest.vim.git
+[submodule ".vim/bundle/nose.vim"]
+ path = .vim/bundle/nose.vim
+ url = https://github.com/lambdalisue/nose.vim.git
+[submodule ".vim/bundle/vim-virtualenv"]
+ path = .vim/bundle/vim-virtualenv
+ url = https://github.com/jmcantrell/vim-virtualenv.git
+[submodule ".vim/bundle/powerline"]
+ path = .vim/bundle/powerline
+ url = https://github.com/Lokaltog/vim-powerline.git
+[submodule ".vim/bundle/ctrlp"]
+ path = .vim/bundle/ctrlp
+ url = https://github.com/kien/ctrlp.vim.git
+[submodule ".vim/bundle/coffeescript"]
+ path = .vim/bundle/coffeescript
+ url = https://github.com/kchmck/vim-coffee-script.git
1  .vim/bundle/coffeescript
@@ -0,0 +1 @@
+Subproject commit 2591fefbc78ee7448da8da4a0537a531f710c743
1  .vim/bundle/ctrlp
@@ -0,0 +1 @@
+Subproject commit d1a64232ade597dda37ddcfc7e45906694a6cb73
1  .vim/bundle/nose.vim
@@ -0,0 +1 @@
+Subproject commit 0418999b63398eeeb137e63fb982b96f3d0b6e38
1  .vim/bundle/powerline
@@ -0,0 +1 @@
+Subproject commit 7d34e35e55862f6687b11ce16b59c2e99e968b14
1  .vim/bundle/vim-virtualenv
@@ -0,0 +1 @@
+Subproject commit d6b8a5ae09b553db75ef650b8818232afc99957d
View
15 .vimrc
@@ -121,7 +121,6 @@ syntax on
set t_Co=256
set background=dark
colorscheme solarized
-let g:colors_name="Tomorrow-Night-Bright"
hi NonText ctermfg=7 guifg=gray
hi SpecialKey ctermfg=8
@@ -148,20 +147,19 @@ set laststatus=2
set statusline=%-.50F " Full path to file, 50 characters max
set statusline+=\ %{fugitive#statusline()} " Fugitive status line
set statusline+=\ %{g:HgStatusForFile()} " Thermometer status line
+set statusline+=\ %{VirtualEnvStatusline()} " Virtualenv status line
set statusline+=\ (%n) " buffer number
set statusline+=\ %([%M%R%H%W]\ %) " Modified, Read-only, Help, and Preview flags
set statusline+=\ %y " Filetype
set statusline+=\ %#error# " switch to error color
set statusline+=%{StatuslineTabWarning()} " show warning about mixed tabs or bad &et
set statusline+=%{StatuslineTrailingSpaceWarning()} " show warning about trailing whitespace
-"set statusline+=%{StatuslineLongLineWarning()} " show warning about long
-"lines
+set statusline+=%{StatuslineLongLineWarning()} " show warning about long lines
set statusline+=%* " back to normal color
set statusline+=\ %#warningmsg# " switch to warningmsg color
set statusline+=%{SyntasticStatuslineFlag()} " show Syntastic flag
set statusline+=%* " back to normal color
-set statusline+=\ %=%< " Right-align and start truncation
-"set statusline+=%{TagInStatusLine()} " Show current class/function in Python
+set statusline+=\ %= " Right-align and start truncation
set statusline+=\ [%04l/%04L\ %03c] " Show current line number, total lines, current column
set statusline+=\ %p%% " Percentage through file in lines
@@ -300,7 +298,6 @@ if has("autocmd")
autocmd FileType htmldjango setlocal ts=4 sts=4 sw=4 expandtab
autocmd FileType css setlocal ts=4 sts=4 sw=4 expandtab
autocmd FileType javascript setlocal ts=4 sts=4 sw=4 expandtab
- autocmd FileType python setlocal ts=4 sts=4 sw=4 expandtab nocindent
autocmd FileType python setlocal ts=4 sts=4 sw=4 expandtab
" Treat .rss files as XML
@@ -333,6 +330,7 @@ if has("autocmd")
" au BufRead,BufNewFile *.py,*.pyw match ExtraWhitespace /\s\+$/
au BufRead,BufNewFile *.py,*.pyw let python_space_errors = 1
au BufRead,BufNewfile *.py,*.pyw call s:HighlightLongLines(79)
+ au BufNewFile,BufRead *.py compiler nose
" only UNIX line endings.
au BufNewFile *.* set fileformat=unix
@@ -592,6 +590,10 @@ vnoremap <Leader>/ :TComment<CR>
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" PLUGIN SETTINGS
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" POWERLINE
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let g:Powerline_symbols = "fancy"
" SIMPLENOTE
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -960,3 +962,4 @@ EOF
nmap <F3> <C-R>=strftime("%Y-%m-%d %H:%M:%S")<CR><Esc>
imap <F3> <C-R>=strftime("%Y-%m-%d %H:%M:%S")<CR>
+
View
17 .zshrc
@@ -21,13 +21,11 @@ ZSH_THEME="../custom/themes/kennethlove"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git brew django github osx pip redis-cli ssh-agent vagrant vi-mode lol zsh-syntax-highlighting zsh-history-substring-search)
+plugins=(git brew django github osx pip redis-cli ssh-agent vagrant vi-mode lol mercurial python zsh-syntax-highlighting zsh-history-substring-search)
source $ZSH/oh-my-zsh.sh
# Customize to your needs...
-#export
-#PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/Users/kennethlove/Developer/.rvm/gems/ruby-1.9.2-p180/bin:/Users/kennethlove/Developer/.rvm/gems/ruby-1.9.2-p180@global/bin:/Users/kennethlove/Developer/.rvm/rubies/ruby-1.9.2-p180/bin:/Users/kennethlove/Developer/.rvm/bin:/Users/kennethlove/Developer/bin
export PATH="/usr/local/bin:/usr/local/sbin:/Users/kennethlove/.oh-my-zsh:$PATH"
export TERM="xterm-256color"
export NODE_PATH="/usr/local/lib/node_modules:$NODE_PATH"
@@ -48,6 +46,8 @@ alias pmrp="python manage.py runserver_plus"
alias pmsp="python manage.py shell_plus"
alias pmcs="python manage.py collectstatic --noinput"
+alias start_jenkins="java -jar /usr/local/Cellar/jenkins/1.443/lib/jenkins.war --httpPort 8888"
+
export WORKON_HOME=$HOME/.virtualenvs
source /usr/local/bin/virtualenvwrapper.sh
export PIP_RESPECT_VIRTUALENV=true
@@ -58,5 +58,16 @@ export ARCH_FLAGS="-arch i386 -arch x86_64"
setopt auto_cd
cdpath=(/Sites)
+any() {
+ emulate -L zsh
+ unsetopt KSH_ARRAYS
+ if [[ -z "$1" ]] ; then
+ echo "any - grep for process(es) by keyword" >&2
+ echo "Usage: any " >&2 ; return 1
+ else
+ ps xauwww | grep -i --color=auto "[${1[1]}]${1[2,-1]}"
+ fi
+}
+
source ~/.cider.profile
[[ -s "/Users/kennethlove/Developer/.rvm/scripts/rvm" ]] && . "/Users/kennethlove/Developer/.rvm/scripts/rvm"
1  bundle/coffee-script
@@ -1 +0,0 @@
-Subproject commit 5ea71f6a66dd6f68f7658d715fa0d03b3d461e7f
Please sign in to comment.
Something went wrong with that request. Please try again.