dotfiles

configuration files
git clone https://pi.duncano.de/git/dotfiles.git
Log | Files | Refs | README

commit 70639f0303edbadac2b6aece02f208ad5377489f
parent b82cb33b65bcbff0074dea0e842b9265f5c50df6
Author: Duncaen <mail@duncano.de>
Date:   Wed, 18 Jan 2017 18:28:41 +0100

vim: remove unnecessary stuff

Diffstat:
vim/settings.vim | 3---
vim/settings/neocomplete.vim | 83-------------------------------------------------------------------------------
vim/settings/nerdtree.vim | 8--------
vim/settings/ultisnips.vim | 3---
vimrc | 22++++++----------------
5 files changed, 6 insertions(+), 113 deletions(-)

diff --git a/vim/settings.vim b/vim/settings.vim @@ -1,3 +0,0 @@ -for fpath in split(globpath('~/.vim/settings', '*.vim'), '\n') - exe 'source' fpath -endfor diff --git a/vim/settings/neocomplete.vim b/vim/settings/neocomplete.vim @@ -1,83 +0,0 @@ -"Note: This option must set it in .vimrc(_vimrc). NOT IN .gvimrc(_gvimrc)! -" Disable AutoComplPop. -let g:acp_enableAtStartup = 0 -" Use neocomplete. -let g:neocomplete#enable_at_startup = 1 -" Use smartcase. -let g:neocomplete#enable_smart_case = 1 -" Set minimum syntax keyword length. -let g:neocomplete#sources#syntax#min_keyword_length = 3 -let g:neocomplete#lock_buffer_name_pattern = '\*ku\*' - -" Define dictionary. -let g:neocomplete#sources#dictionary#dictionaries = { - \ 'default' : '', - \ 'vimshell' : $HOME.'/.vimshell_hist', - \ 'scheme' : $HOME.'/.gosh_completions' - \ } - -" Define keyword. -if !exists('g:neocomplete#keyword_patterns') - let g:neocomplete#keyword_patterns = {} -endif -let g:neocomplete#keyword_patterns['default'] = '\h\w*' - -" Plugin key-mappings. -inoremap <expr><C-g> neocomplete#undo_completion() -inoremap <expr><C-l> neocomplete#complete_common_string() - -" Recommended key-mappings. -" <CR>: close popup and save indent. -inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR> -function! s:my_cr_function() - return neocomplete#close_popup() . "\<CR>" - " For no inserting <CR> key. - "return pumvisible() ? neocomplete#close_popup() : "\<CR>" -endfunction -" <TAB>: completion. -inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>" -" <C-h>, <BS>: close popup and delete backword char. -inoremap <expr><C-h> neocomplete#smart_close_popup()."\<C-h>" -inoremap <expr><BS> neocomplete#smart_close_popup()."\<C-h>" -inoremap <expr><C-y> neocomplete#close_popup() -inoremap <expr><C-e> neocomplete#cancel_popup() -" Close popup by <Space>. -"inoremap <expr><Space> pumvisible() ? neocomplete#close_popup() : "\<Space>" - -" For cursor moving in insert mode(Not recommended) -"inoremap <expr><Left> neocomplete#close_popup() . "\<Left>" -"inoremap <expr><Right> neocomplete#close_popup() . "\<Right>" -"inoremap <expr><Up> neocomplete#close_popup() . "\<Up>" -"inoremap <expr><Down> neocomplete#close_popup() . "\<Down>" -" Or set this. -"let g:neocomplete#enable_cursor_hold_i = 1 -" Or set this. -"let g:neocomplete#enable_insert_char_pre = 1 - -" AutoComplPop like behavior. -"let g:neocomplete#enable_auto_select = 1 - -" Shell like behavior(not recommended). -"set completeopt+=longest -"let g:neocomplete#enable_auto_select = 1 -"let g:neocomplete#disable_auto_complete = 1 -"inoremap <expr><TAB> pumvisible() ? "\<Down>" : "\<C-x>\<C-u>" - -" Enable omni completion. -autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS -autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags -autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS -autocmd FileType python setlocal omnifunc=pythoncomplete#Complete -autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags - -" Enable heavy omni completion. -if !exists('g:neocomplete#sources#omni#input_patterns') - let g:neocomplete#sources#omni#input_patterns = {} -endif -"let g:neocomplete#sources#omni#input_patterns.php = '[^. \t]->\h\w*\|\h\w*::' -"let g:neocomplete#sources#omni#input_patterns.c = '[^.[:digit:] *\t]\%(\.\|->\)' -"let g:neocomplete#sources#omni#input_patterns.cpp = '[^.[:digit:] *\t]\%(\.\|->\)\|\h\w*::' - -" For perlomni.vim setting. -" https://github.com/c9s/perlomni.vim -let g:neocomplete#sources#omni#input_patterns.perl = '\h\w*->\h\w*\|\h\w*::' diff --git a/vim/settings/nerdtree.vim b/vim/settings/nerdtree.vim @@ -1,8 +0,0 @@ -let NERDTreeShowBookmarks=1 -let NERDTreeIgnore=['\.py[cd]$', '\~$', '\.swo$', '\.swp$', '^\.git$', '^\.hg$', '^\.svn$', '\.bzr$'] -let NERDTreeChDirMode=0 -let NERDTreeQuitOnOpen=1 -let NERDTreeMouseMode=2 -let NERDTreeShowHidden=1 -let NERDTreeKeepTreeInNewTab=1 -let g:nerdtree_tabs_open_on_gui_startup=0 diff --git a/vim/settings/ultisnips.vim b/vim/settings/ultisnips.vim @@ -1,3 +0,0 @@ -let g:UltiSnipsExpandTrigger="<c-j>" -let g:UltiSnipsJumpForwardTrigger="<c-j>" -let g:UltiSnipsJumpBackwardTrigger="<c-k>" diff --git a/vimrc b/vimrc @@ -10,7 +10,6 @@ Plug 'tpope/vim-sensible' Plug 'airblade/vim-gitgutter' " Navigation -Plug 'majutsushi/tagbar', { 'on': 'TagbarToggle' } Plug 'ctrlpvim/ctrlp.vim' Plug 'bling/vim-bufferline' @@ -19,26 +18,18 @@ Plug 'tpope/vim-surround' Plug 'spf13/vim-autoclose' Plug 'godlygeek/tabular' Plug 'scrooloose/nerdcommenter' +Plug 'vim-scripts/AutoComplPop' " Languages if hostname() != "pi" -" Plug 'SirVer/ultisnips' -Plug 'scrooloose/syntastic', { 'for': ['python', 'javascript'] } -Plug 'fatih/vim-go' +Plug 'fatih/vim-go', { 'for': ['go'] } Plug 'python-rope/ropevim', { 'do': 'python2 setup.py install --user && python3 setup.py install --user' } endif -Plug 'Shougo/neocomplete.vim' +" Plug 'Shougo/neocomplete.vim' call plug#end() endif -" nmap < [ -" nmap > ] -" omap < [ -" omap > ] -" xmap < [ -" xmap > ] - " ============================================================================ " Basic settings " ============================================================================ @@ -63,6 +54,8 @@ set hlsearch " hightligt search results set smartcase " search casesensitive if pattern contains uppercase chars set ignorecase " +set completeopt=longest,menuone + " ignore set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.db @@ -229,7 +222,4 @@ nmap <Leader>s :source $MYVIMRC<cr> nnoremap <tab> <c-w>w nnoremap <S-tab> <c-w>W -" ---------------------------------------------------------------------------- -" Load plugin settings -" ---------------------------------------------------------------------------- -silent! so ~/.vim/settings.vim +let g:acp_behaviorKeywordLength=3