diff options
| -rw-r--r-- | bundle/README | 1 | ||||
| m--------- | bundle/neobundle.vim | 0 | ||||
| -rw-r--r-- | dotvimrc | 91 |
3 files changed, 21 insertions, 71 deletions
diff --git a/bundle/README b/bundle/README deleted file mode 100644 index ab26cf1..0000000 --- a/bundle/README +++ /dev/null @@ -1 +0,0 @@ -git clone git://github.com/Shougo/neobundle.vim diff --git a/bundle/neobundle.vim b/bundle/neobundle.vim deleted file mode 160000 -Subproject 88951d60547595606ea0ca8f28f643d2506f271 @@ -35,8 +35,6 @@ set scrolloff=3 set undodir=~/.vim/undodir set undofile -set runtimepath+=~/.vim/bundle/neobundle.vim/ - " remove toolbar set guioptions-=T " remove menu @@ -57,40 +55,26 @@ let mapleader="\<Space>" "\ endif "endif -call neobundle#begin(expand('~/.vim/bundle/')) - -" Let NeoBundle manage NeoBundle -NeoBundleFetch 'Shougo/neobundle.vim' - -" Recommended to install -" After install, turn shell ~/.vim/bundle/vimproc, (n,g)make -f your_machines_makefile -"NeoBundle 'Shougo/vimproc' +"'CoatiSoftware/vim-sourcetrail' +"nnoremap <leader>sr :SourcetrailRefresh<CR> +"nnoremap <leader>sa :SourcetrailActivateToken<CR> -NeoBundle 'hashivim/vim-terraform' - -NeoBundle 'CoatiSoftware/vim-sourcetrail' -nnoremap <leader>sr :SourcetrailRefresh<CR> -nnoremap <leader>sa :SourcetrailActivateToken<CR> - -"NeoBundle 'elixir-lang/vim-elixir' +if executable('rg') + let g:ackprg = "rg -i --vimgrep" + let g:ack_default_options = " -i --vimgrep" +elseif executable('ag') + let g:ackprg = 'ag --vimgrep' +endif -let g:ack_default_options = " -i --vimgrep" -let g:ackprg = "rg -i --vimgrep" -NeoBundle 'mileszs/ack.vim.git' noremap <Leader>a :Ack! -t rust -t cpp -t c -t py <cword><CR> noremap <Leader>A :Ack! <cword><CR> -NeoBundle 'tpope/vim-fugitive' - "Show + - ~ in the margin for vim modification -NeoBundle "airblade/vim-gitgutter" let g:gitgutter_eager = 0 " only update on read/write - -NeoBundle 'kien/ctrlp.vim' "amazing search with ctrl p - -NeoBundle 'JazzCore/ctrlp-cmatcher' -let g:ctrlp_match_func = {'match' : 'matcher#cmatch' } +" The C matcher is supposedly faster +"'JazzCore/ctrlp-cmatcher' +"let g:ctrlp_match_func = {'match' : 'matcher#cmatch' } " Also search tags let g:ctrlp_extensions = ['tag'] @@ -102,9 +86,7 @@ noremap <Leader>b :CtrlPBuffer<CR> " Ignore some folders and files for CtrlP indexing let g:ctrlp_custom_ignore = { 'dir': '\.git$\|\CODENAME_Data' } -NeoBundle 'git-time-lapse' - -NeoBundle 'Valloric/YouCompleteMe.git' +"Valloric/YouCompleteMe.git let g:ycm_extra_conf_globlist = ['~/dab/*', '~/*'] let g:ycm_always_populate_location_list = 1 let g:ycm_rust_src_path = '/home/bram/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src' @@ -112,33 +94,24 @@ noremap <Leader>y :YcmDiags<CR> noremap <Leader>Y :YcmRestartServer<CR> noremap <Leader>F :YcmCompleter FixIt<CR>:ccl<CR> +"rust-lang/rust.vim let g:rust_recommended_style = 0 -NeoBundle 'rust-lang/rust.vim' - au FileType rust nmap <Leader>m :make build<CR> -NeoBundle 'tpope/vim-surround.git' -NeoBundle 'taglist.vim' -NeoBundle 'majutsushi/tagbar' +"tpope/vim-surround.git +"taglist.vim +"majutsushi/tagbar noremap <Leader>t :TagbarToggle<CR> -NeoBundle 'ifdef-highlighting' -NeoBundle 'ciaranm/detectindent' "adapts tabstop and this shit automagically +"ifdef-highlighting +"scrooloose/nerdtree -NeoBundle "scrooloose/nerdtree" - -" Nice tabulation -NeoBundle 'godlygeek/tabular' -"http://vimcasts.org/episodes/aligning-text-with-tabular-vim/ - -let g:Powerline_symbols = 'unicode' +colorscheme bramwombat function! ToggleFullScreen() call system("wmctrl -i -r ".v:windowid." -b toggle,fullscreen") redraw endfunction -colorscheme bramwombat - if has("nvim") set termguicolors set noincsearch @@ -175,10 +148,6 @@ set cursorline "set a sudo vim cmap w!! w !sudo tee % > /dev/null -hi scalaNew gui=underline -hi scalaMethodCall gui=italic -hi scalaValName gui=underline -hi scalaVarName gui=underline "folding set foldcolumn=2 set foldmethod=marker @@ -206,7 +175,7 @@ set statusline+=%{((exists(\"+bomb\")\ &&\ &bomb)?\"B,\":\"\")}]\ " BOM set statusline+=%{strftime('%a\ %b\ %e\ %H:%M')}\ " hour "set statusline+=%{SyntaxItem()} " syntax highlight group under cursor set statusline+=%= " right align -if !empty(glob("$HOME/.vim/bundle/vim-fugitive/plugin/fugitive.vim")) +if !empty(glob("$HOME/.vim/pack/tpope/start/vim-fugitive/plugin/fugitive.vim")) set statusline+=%{fugitive#statusline()}\ " git branch endif set statusline+=0x%-8B\ " current char @@ -215,12 +184,6 @@ set statusline+=%-14.(%l,%c%V%)\ %<%P " offset "tags set tags=tags,./tags,../tags,../../tags -"C syntax for ellisys files -autocmd BufNewFile,BufRead *.usbs set filetype=c - -"C syntax for ARM Scatterfiles -autocmd BufNewFile,BufRead *.scat set filetype=c - "ARM Assembler for .s files autocmd BufNewFile,BufRead *.s set filetype=armasm @@ -294,19 +257,11 @@ noremap <F5> :let @/ = expand('<cword>')<CR>:3match none<CR> highlight ManualHighlight ctermbg=darkcyan guibg=darkcyan noremap <F6> :exe printf('match ManualHighlight /%s/', escape(expand('<cword>'), '/\'))<CR> -"if has("gui_running") -" " auto highlight word under cursor -" highlight WordUnderCursor ctermbg=darkred guibg=#552211 -" autocmd CursorMoved * exe printf('3match WordUnderCursor /\V\<%s\>/', escape(expand('<cword>'), '/\')) -"endif - "Show tabs set listchars=tab:›\ ,trail:␣ set list -"clang_complete options set completeopt=menu,menuone,longest -"let g:clang_complete_copen=1 noremap <Leader>R :cscope reset<Enter>:CtrlPClearAllCaches<Enter> @@ -363,9 +318,5 @@ inoremap <up> <nop> "very magic search noremap <Leader>/ /\v -call neobundle#end() - filetype plugin indent on -NeoBundleCheck - |