Permalink
Browse files

cleanup

  • Loading branch information...
1 parent 84f1653 commit 2d89e1aec5259d0bbed967b30d34f5d856606556 @tuxcanfly committed Apr 12, 2012
Showing with 28 additions and 55 deletions.
  1. +3 −15 .gitmodules
  2. +24 −35 .vimrc
  3. +0 −1 bundle/easymotion
  4. +0 −1 bundle/gundo
  5. +0 −1 bundle/inline_edit
  6. +1 −0 bundle/neocomplete
  7. +0 −1 bundle/screen
  8. +0 −1 bundle/tagbar
View
@@ -25,9 +25,6 @@
[submodule "bundle/nerdtree"]
path = bundle/nerdtree
url = https://github.com/vim-scripts/The-NERD-tree.git
-[submodule "bundle/tagbar"]
- path = bundle/tagbar
- url = https://github.com/majutsushi/tagbar.git
[submodule "bundle/whitespace"]
path = bundle/whitespace
url = https://github.com/vim-scripts/trailing-whitespace.git
@@ -43,9 +40,6 @@
[submodule "bundle/html5"]
path = bundle/html5
url = https://github.com/othree/html5.vim.git
-[submodule "bundle/screen"]
- path = bundle/screen
- url = https://github.com/ervandew/screen.git
[submodule "bundle/indent-object"]
path = bundle/indent-object
url = https://github.com/michaeljsmith/vim-indent-object.git
@@ -55,9 +49,6 @@
[submodule "bundle/ack"]
path = bundle/ack
url = https://github.com/mileszs/ack.vim.git
-[submodule "bundle/gundo"]
- path = bundle/gundo
- url = https://github.com/sjl/gundo.vim.git
[submodule "bundle/matchtag"]
path = bundle/matchtag
url = https://github.com/gregsexton/MatchTag.git
@@ -67,12 +58,9 @@
[submodule "bundle/virtualenv"]
path = bundle/virtualenv
url = https://github.com/jmcantrell/vim-virtualenv.git
-[submodule "bundle/inline_edit"]
- path = bundle/inline_edit
- url = https://github.com/AndrewRadev/inline_edit.vim.git
[submodule "bundle/powerline"]
path = bundle/powerline
url = https://github.com/Lokaltog/vim-powerline.git
-[submodule "bundle/easymotion"]
- path = bundle/easymotion
- url = https://github.com/Lokaltog/vim-easymotion.git
+[submodule "bundle/neocomplete"]
+ path = bundle/neocomplete
+ url = https://github.com/Shougo/neocomplcache.git
View
@@ -33,27 +33,28 @@ set t_Co =256
set wildignore =*.py[co]
set wildmode =list:longest,list:full
set clipboard =unnamedplus
-set gfn =Consolas\ 11
+set gfn =Monaco\ 10
set background =dark
set tags +=~/.tags/django13.tags
set path +=templates
set includeexpr =substitute(v:fname,'\\.','/','g')
set suffixesadd =.py
set statusline =[%n]%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P
set laststatus =2
+set completeopt =
-let NERDTreeIgnore =['\.pyc']
-let g:closetag_default_xml =1
-let g:sparkupNextMapping ='<c-h>'
-let g:pep8_map ='<F6>'
-let g:pyflakes_use_quickfix =0
-let g:ackprg ="ack-grep -H --nocolor --nogroup --column"
-let g:surround_{char2nr("r")} ="_(u\r)"
-let g:virtualenv_directory =".virtualenvs2.7/"
-let g:Powerline_symbols ="fancy"
-let g:UltiSnipsSnippetDirectories =["UltiSnips", "snippets"]
-
+let NERDTreeIgnore =['\.pyc']
+let g:closetag_default_xml =1
+let g:sparkupNextMapping ='<c-h>'
+let g:pep8_map ='<F6>'
+let g:pyflakes_use_quickfix =0
+let g:ackprg ="ack-grep -H --nocolor --nogroup --column"
+let g:surround_{char2nr("r")} ="_(u\r)"
+let g:virtualenv_directory ="/home/tuxcanfly/.virtualenvs2.7/"
+let g:Powerline_symbols ="fancy"
+let g:UltiSnipsSnippetDirectories =["UltiSnips", "snippets"]
+let g:neocomplcache_enable_at_startup =1
colorscheme hemisu
function! s:Gentags()
@@ -76,39 +77,39 @@ map <silent><leader>d :Gdiff<CR>
" insert newline but dont enter insert mode
map <silent><leader><Enter> o<Esc>k
" tabbing
-map <silent>K :tabnext<CR>
-map <silent>J :tabprevious<CR>
-map <silent><A-x> :tabclose<CR>
+map <silent>K :tabnext<CR>
+map <silent>J :tabprevious<CR>
+map <silent><A-x> :tabclose<CR>
" new tab
map <Leader>t :tabnew<CR>
" Project search
-map <leader>g :Ack <cword>
+map <leader>g :Ack <cword>
+map <leader>gp :Ack --py<cword>
+map <leader>gh :Ack --html<cword>
+map <leader>gj :Ack --js<cword>
+map <leader>gc :Ack --css<cword>
" remove trailing whitespace
map <leader>w :FixWhitespace<CR>
-nmap <F5> :Gentags<CR>
+nmap <F5> :Gentags<CR>
nmap <leader>fp :Git push<CR>
nmap <leader>fm :Git pull<CR>
-"toggle TagBar
-nnoremap <silent> <F3> :TagbarToggle<CR>
" clear search highlight
nnoremap <leader><space> :noh<CR>
" shortcuts
nnoremap ; :
" open gf in new tab
nnoremap gf <C-W>gf
-" gundo
-nnoremap <F7> :GundoToggle<CR>
" clear ^M messup
noremap <Leader>m mmHmt:%s/<C-V><cr>//ge<cr>'tzt'm
" prevent cursor jumping
-noremap <S-Up> <Up>
-noremap <S-Down> <Down>
+noremap <S-Up> <Up>
+noremap <S-Down> <Down>
" move between splits
noremap <C-h> <C-w>h
noremap <C-j> <C-w>j
@@ -118,15 +119,3 @@ noremap <C-l> <C-w>l
" allow the . to execute once for each line of a visual selection
vnoremap . :normal .<CR>
-
-
-" screen
-nmap <F11> :ScreenShell<CR>
-nmap <F12> :ScreenQuit<CR>
-
-
-vmap <F7> :ScreenSend<CR>
-
-
-" sudo make me a sandwich
-cmap w!! %!sudo tee > /dev/null %
Submodule easymotion deleted from 667a66
Submodule gundo deleted from 12b6f6
Submodule inline_edit deleted from 15c884
Submodule neocomplete added at 0f8c31
Submodule screen deleted from 2835ac
Submodule tagbar deleted from 3c0756

0 comments on commit 2d89e1a

Please sign in to comment.