From 9eef1c202e6a3a93fb644655ba28d9e0c81bdc7c Mon Sep 17 00:00:00 2001 From: Patrick Simianer Date: Sat, 30 Aug 2014 18:24:53 +0100 Subject: a more minimal approach to vim --- .gitmodules | 51 +++++-------------------- .mplayer/config | 5 --- .mpv/config | 3 ++ .vim/bundle/YouCompleteMe | 1 - .vim/bundle/airline | 1 + .vim/bundle/closetag | 1 + .vim/bundle/closetag.vim | 1 - .vim/bundle/endwise | 1 + .vim/bundle/jedi | 1 - .vim/bundle/nerdtree | 1 - .vim/bundle/pathogen | 1 + .vim/bundle/requests | 1 - .vim/bundle/requests-futures | 1 - .vim/bundle/supertab | 1 + .vim/bundle/syntastic | 1 - .vim/bundle/tagbar | 1 - .vim/bundle/ultisnips | 1 - .vim/bundle/vim-airline | 1 - .vim/bundle/vim-endwise | 1 - .vim/bundle/vim-fugitive | 1 - .vim/bundle/vim-ruby | 1 - .vim/bundle/vim-surround | 1 - .vim/bundle/vundle | 1 - .vim/bundle/ycmd | 1 - .vim/colors/pks256.vim | 86 +++++++++++++++++++++---------------------- .vimrc | 88 +++++++++++++++----------------------------- .zshrc | 2 + 27 files changed, 91 insertions(+), 165 deletions(-) delete mode 100644 .mplayer/config create mode 100644 .mpv/config delete mode 160000 .vim/bundle/YouCompleteMe create mode 160000 .vim/bundle/airline create mode 160000 .vim/bundle/closetag delete mode 160000 .vim/bundle/closetag.vim create mode 160000 .vim/bundle/endwise delete mode 160000 .vim/bundle/jedi delete mode 160000 .vim/bundle/nerdtree create mode 160000 .vim/bundle/pathogen delete mode 160000 .vim/bundle/requests delete mode 160000 .vim/bundle/requests-futures create mode 160000 .vim/bundle/supertab delete mode 160000 .vim/bundle/syntastic delete mode 160000 .vim/bundle/tagbar delete mode 160000 .vim/bundle/ultisnips delete mode 160000 .vim/bundle/vim-airline delete mode 160000 .vim/bundle/vim-endwise delete mode 160000 .vim/bundle/vim-fugitive delete mode 160000 .vim/bundle/vim-ruby delete mode 160000 .vim/bundle/vim-surround delete mode 160000 .vim/bundle/vundle delete mode 160000 .vim/bundle/ycmd diff --git a/.gitmodules b/.gitmodules index 56cb7ee..213c767 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,54 +1,21 @@ [submodule ".vim/bundle/closetag.vim"] - path = .vim/bundle/closetag.vim + path = .vim/bundle/closetag url = https://github.com/docunext/closetag.vim.git [submodule ".vim/bundle/nerdcommenter"] path = .vim/bundle/nerdcommenter url = https://github.com/scrooloose/nerdcommenter.git -[submodule ".vim/bundle/nerdtree"] - path = .vim/bundle/nerdtree - url = https://github.com/scrooloose/nerdtree.git -[submodule ".vim/bundle/syntastic"] - path = .vim/bundle/syntastic - url = https://github.com/scrooloose/syntastic.git -[submodule ".vim/bundle/tagbar"] - path = .vim/bundle/tagbar - url = https://github.com/majutsushi/tagbar.git -[submodule ".vim/bundle/ultisnips"] - path = .vim/bundle/ultisnips - url = https://github.com/SirVer/ultisnips.git [submodule ".vim/bundle/vim-airline"] - path = .vim/bundle/vim-airline + path = .vim/bundle/airline url = https://github.com/bling/vim-airline.git [submodule ".vim/bundle/vim-endwise"] - path = .vim/bundle/vim-endwise + path = .vim/bundle/endwise url = https://github.com/tpope/vim-endwise.git -[submodule ".vim/bundle/vim-fugitive"] - path = .vim/bundle/vim-fugitive - url = https://github.com/tpope/vim-fugitive.git -[submodule ".vim/bundle/vim-ruby"] - path = .vim/bundle/vim-ruby - url = https://github.com/vim-ruby/vim-ruby.git -[submodule ".vim/bundle/vim-surround"] - path = .vim/bundle/vim-surround - url = https://github.com/tpope/vim-surround.git [submodule ".vim/bundle/vimwiki"] path = .vim/bundle/vimwiki url = https://github.com/vimwiki/vimwiki.git -[submodule ".vim/bundle/vundle"] - path = .vim/bundle/vundle - url = https://github.com/gmarik/vundle.git -[submodule ".vim/bundle/YouCompleteMe"] - path = .vim/bundle/YouCompleteMe - url = https://github.com/Valloric/YouCompleteMe.git -[submodule ".vim/bundle/jedi"] - path = .vim/bundle/jedi - url = https://github.com/davidhalter/jedi.git -[submodule ".vim/bundle/requests"] - path = .vim/bundle/requests - url = https://github.com/kennethreitz/requests -[submodule ".vim/bundle/requests-futures"] - path = .vim/bundle/requests-futures - url = https://github.com/ross/requests-futures -[submodule ".vim/bundle/ycmd"] - path = .vim/bundle/ycmd - url = https://github.com/Valloric/ycmd +[submodule ".vim/bundle/pathogen"] + path = .vim/bundle/pathogen + url = https://github.com/tpope/vim-pathogen.git +[submodule ".vim/bundle/supertab"] + path = .vim/bundle/supertab + url = https://github.com/ervandew/supertab.git diff --git a/.mplayer/config b/.mplayer/config deleted file mode 100644 index 55cf56a..0000000 --- a/.mplayer/config +++ /dev/null @@ -1,5 +0,0 @@ -# Write your default config options here! -[extension.mp4] -fps=23.976 - - diff --git a/.mpv/config b/.mpv/config new file mode 100644 index 0000000..21cf775 --- /dev/null +++ b/.mpv/config @@ -0,0 +1,3 @@ +# Write your default config options here! + + diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe deleted file mode 160000 index 92084bf..0000000 --- a/.vim/bundle/YouCompleteMe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 92084bf91a238979c4bfd3e63db6d877e0ec9522 diff --git a/.vim/bundle/airline b/.vim/bundle/airline new file mode 160000 index 0000000..00e4b68 --- /dev/null +++ b/.vim/bundle/airline @@ -0,0 +1 @@ +Subproject commit 00e4b68ee6eba08559a868d08b2a4b642a6bc106 diff --git a/.vim/bundle/closetag b/.vim/bundle/closetag new file mode 160000 index 0000000..0601093 --- /dev/null +++ b/.vim/bundle/closetag @@ -0,0 +1 @@ +Subproject commit 060109359b81b53dfad7206e23f86007d895996f diff --git a/.vim/bundle/closetag.vim b/.vim/bundle/closetag.vim deleted file mode 160000 index 0601093..0000000 --- a/.vim/bundle/closetag.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 060109359b81b53dfad7206e23f86007d895996f diff --git a/.vim/bundle/endwise b/.vim/bundle/endwise new file mode 160000 index 0000000..ab5f7f9 --- /dev/null +++ b/.vim/bundle/endwise @@ -0,0 +1 @@ +Subproject commit ab5f7f99f49ee26a16563df00a79fbc3bf1090af diff --git a/.vim/bundle/jedi b/.vim/bundle/jedi deleted file mode 160000 index cd648e9..0000000 --- a/.vim/bundle/jedi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cd648e933bfa89adcb2a92d856abe0b1900c0d90 diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree deleted file mode 160000 index 4f1e6ec..0000000 --- a/.vim/bundle/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f1e6ecb057fc0bac189171c1430d71ef25f6bb1 diff --git a/.vim/bundle/pathogen b/.vim/bundle/pathogen new file mode 160000 index 0000000..91e6378 --- /dev/null +++ b/.vim/bundle/pathogen @@ -0,0 +1 @@ +Subproject commit 91e6378908721d20514bbe5d18d292a0a15faf0c diff --git a/.vim/bundle/requests b/.vim/bundle/requests deleted file mode 160000 index 35d083e..0000000 --- a/.vim/bundle/requests +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 35d083e1665beff39aabe47a79cd1f867b897b0c diff --git a/.vim/bundle/requests-futures b/.vim/bundle/requests-futures deleted file mode 160000 index 98712e7..0000000 --- a/.vim/bundle/requests-futures +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 98712e7d0f6be2a090b6fda2a925f85e63656b58 diff --git a/.vim/bundle/supertab b/.vim/bundle/supertab new file mode 160000 index 0000000..4e2376a --- /dev/null +++ b/.vim/bundle/supertab @@ -0,0 +1 @@ +Subproject commit 4e2376a5b4fe3a1f71eb5ec2deb745d98fabde19 diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic deleted file mode 160000 index a27b435..0000000 --- a/.vim/bundle/syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a27b435a1316123b7d13696871b103c7f024f91a diff --git a/.vim/bundle/tagbar b/.vim/bundle/tagbar deleted file mode 160000 index 59c9b7c..0000000 --- a/.vim/bundle/tagbar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 59c9b7ce1cc70ac2c7bd3c858e80c89f17b42cc9 diff --git a/.vim/bundle/ultisnips b/.vim/bundle/ultisnips deleted file mode 160000 index 279d6e6..0000000 --- a/.vim/bundle/ultisnips +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 279d6e63c9a8dbaa20ffc43c3c5f057dfc8f1121 diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline deleted file mode 160000 index 00e4b68..0000000 --- a/.vim/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 00e4b68ee6eba08559a868d08b2a4b642a6bc106 diff --git a/.vim/bundle/vim-endwise b/.vim/bundle/vim-endwise deleted file mode 160000 index ab5f7f9..0000000 --- a/.vim/bundle/vim-endwise +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ab5f7f99f49ee26a16563df00a79fbc3bf1090af diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive deleted file mode 160000 index 90ee6fb..0000000 --- a/.vim/bundle/vim-fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 90ee6fb5d255d14d9f12f2469f92ee50149f5b44 diff --git a/.vim/bundle/vim-ruby b/.vim/bundle/vim-ruby deleted file mode 160000 index 5bc55be..0000000 --- a/.vim/bundle/vim-ruby +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5bc55bec639836ff5c35f58dc62988d6d1e74bd9 diff --git a/.vim/bundle/vim-surround b/.vim/bundle/vim-surround deleted file mode 160000 index fa433e0..0000000 --- a/.vim/bundle/vim-surround +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fa433e0b7330753688f715f3be5d10dc480f20e5 diff --git a/.vim/bundle/vundle b/.vim/bundle/vundle deleted file mode 160000 index 0b28e33..0000000 --- a/.vim/bundle/vundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b28e334e65b6628b0a61c412fcb45204a2f2bab diff --git a/.vim/bundle/ycmd b/.vim/bundle/ycmd deleted file mode 160000 index 50e6f5b..0000000 --- a/.vim/bundle/ycmd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 50e6f5b16e3692edc2fd02dfa89a460b9a1f3a69 diff --git a/.vim/colors/pks256.vim b/.vim/colors/pks256.vim index 324cf23..ad7a34d 100644 --- a/.vim/colors/pks256.vim +++ b/.vim/colors/pks256.vim @@ -1,5 +1,5 @@ " Vim color file: pks256.vim -" Last Change: 2014-06-13 +" Last Change: 2014-08-30 " " Color numbers (0-255) see: " http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html @@ -9,46 +9,46 @@ set background=light hi clear let g:colors_name = "pks256" - highlight Normal cterm=none ctermfg=0 ctermbg=231 - highlight Special cterm=bold ctermfg=197 ctermbg=231 - highlight Comment cterm=bold ctermfg=201 ctermbg=231 - highlight Constant cterm=bold ctermfg=12 ctermbg=231 - highlight LineNr cterm=none ctermfg=242 ctermbg=159 - highlight Number cterm=none ctermfg=197 ctermbg=231 - highlight PreProc cterm=bold ctermfg=9 ctermbg=231 - highlight Statement cterm=bold ctermfg=197 ctermbg=231 - highlight Type cterm=bold ctermfg=12 ctermbg=231 - highlight Error cterm=bold ctermfg=231 ctermbg=9 - highlight Identifier cterm=none ctermfg=207 ctermbg=231 - highlight SpecialKey cterm=none ctermfg=48 ctermbg=231 - highlight NonText cterm=none ctermfg=164 ctermbg=231 - highlight Directory cterm=none ctermfg=12 ctermbg=231 - highlight ErrorMsg cterm=bold ctermfg=9 ctermbg=231 - highlight MoreMsg cterm=none ctermfg=10 ctermbg=231 - highlight Title cterm=none ctermfg=199 ctermbg=231 - highlight WarningMsg cterm=none ctermfg=9 ctermbg=231 - highlight DiffDelete cterm=none ctermfg=207 ctermbg=231 - highlight Search cterm=none ctermfg=15 ctermbg=231 - highlight Visual cterm=none ctermfg=16 ctermbg=50 - highlight Cursor cterm=none ctermfg=201 ctermbg=201 - highlight CursorLine cterm=none ctermfg=0 ctermbg=252 - highlight StatusLine cterm=none ctermfg=0 ctermbg=231 - highlight Question cterm=none ctermfg=16 ctermbg=226 - highlight Todo cterm=bold ctermfg=231 ctermbg=201 - highlight Folded cterm=none ctermfg=0 ctermbg=255 - highlight ModeMsg cterm=none ctermfg=16 ctermbg=46 - highlight VisualNOS cterm=none ctermfg=16 ctermbg=28 - highlight WildMenu cterm=none ctermfg=16 ctermbg=226 - highlight FoldColumn cterm=none ctermfg=15 ctermbg=58 - highlight SignColumn cterm=none ctermfg=16 ctermbg=28 - highlight DiffText cterm=none ctermfg=16 ctermbg=34 - highlight StatusLineNC cterm=none ctermfg=0 ctermbg=231 - highlight VertSplit cterm=none ctermfg=231 ctermbg=231 - highlight User1 cterm=none ctermbg=20 ctermfg=15 - highlight User2 cterm=none ctermbg=20 ctermfg=46 - highlight User3 cterm=none ctermbg=20 ctermfg=46 - highlight User4 cterm=none ctermbg=20 ctermfg=50 - highlight User5 cterm=none ctermbg=20 ctermfg=46 - highlight Pmenu cterm=none ctermbg=228 ctermfg=0 - highlight PmenuSel cterm=bold ctermbg=228 ctermfg=0 +highlight Normal cterm=none ctermfg=0 ctermbg=231 +highlight Special cterm=bold ctermfg=197 ctermbg=231 +highlight Comment cterm=bold ctermfg=201 ctermbg=231 +highlight Constant cterm=bold ctermfg=12 ctermbg=231 +highlight LineNr cterm=none ctermfg=242 ctermbg=159 +highlight Number cterm=none ctermfg=197 ctermbg=231 +highlight PreProc cterm=bold ctermfg=9 ctermbg=231 +highlight Statement cterm=bold ctermfg=197 ctermbg=231 +highlight Type cterm=bold ctermfg=12 ctermbg=231 +highlight Error cterm=bold ctermfg=231 ctermbg=9 +highlight Identifier cterm=none ctermfg=207 ctermbg=231 +highlight SpecialKey cterm=none ctermfg=48 ctermbg=231 +highlight NonText cterm=none ctermfg=164 ctermbg=231 +highlight Directory cterm=none ctermfg=12 ctermbg=231 +highlight ErrorMsg cterm=bold ctermfg=9 ctermbg=231 +highlight MoreMsg cterm=none ctermfg=10 ctermbg=231 +highlight Title cterm=none ctermfg=199 ctermbg=231 +highlight WarningMsg cterm=none ctermfg=9 ctermbg=231 +highlight DiffDelete cterm=none ctermfg=207 ctermbg=231 +highlight Search cterm=none ctermfg=15 ctermbg=231 +highlight Visual cterm=none ctermfg=16 ctermbg=50 +highlight Cursor cterm=none ctermfg=201 ctermbg=201 +highlight CursorLine cterm=none ctermfg=0 ctermbg=252 +highlight Question cterm=none ctermfg=16 ctermbg=226 +highlight Todo cterm=bold ctermfg=231 ctermbg=201 +highlight Folded cterm=none ctermfg=0 ctermbg=255 +highlight ModeMsg cterm=none ctermfg=16 ctermbg=46 +highlight VisualNOS cterm=none ctermfg=16 ctermbg=28 +highlight WildMenu cterm=none ctermfg=16 ctermbg=226 +highlight FoldColumn cterm=none ctermfg=15 ctermbg=58 +highlight SignColumn cterm=none ctermfg=16 ctermbg=28 +highlight DiffText cterm=none ctermfg=16 ctermbg=34 +highlight VertSplit cterm=none ctermfg=231 ctermbg=231 +highlight User1 cterm=none ctermbg=20 ctermfg=15 +highlight User2 cterm=none ctermbg=20 ctermfg=46 +highlight User3 cterm=none ctermbg=20 ctermfg=46 +highlight User4 cterm=none ctermbg=20 ctermfg=50 +highlight User5 cterm=none ctermbg=20 ctermfg=46 +highlight Pmenu cterm=none ctermbg=228 ctermfg=0 +highlight PmenuSel cterm=bold ctermbg=228 ctermfg=0 +"highlight StatusLine cterm=none ctermfg=0 ctermbg=231 +"highlight StatusLineNC cterm=none ctermfg=0 ctermbg=231 diff --git a/.vimrc b/.vimrc index 284ca84..f8864bf 100644 --- a/.vimrc +++ b/.vimrc @@ -1,3 +1,7 @@ +" pathogen +execute pathogen#infect() + +" settings set nocompatible set nu set noet @@ -18,10 +22,15 @@ set mouse=r set bs=2 set ignorecase set smartcase +set laststatus=2 +set ttyfast +set lazyredraw syntax on +filetype plugin indent on + +" spelling setlocal spell spelllang=en_us set nospell -set laststatus=2 " color if $TERM =~ "^rxvt" || $TERM =~ "256color$" @@ -32,70 +41,31 @@ else endif " bindings -nmap :tabnew -nmap :tabprevious -nmap :tabnext -map -map -map -map +nmap :tabnew +nmap :tabprevious +nmap :tabnext +map +map +map +map +inoremap :wa +nnoremap :w +nmap :TagbarToggle " cursorline autocmd InsertEnter * setlocal nocursorline autocmd InsertLeave * setlocal cursorline -" relative numbers -function! NumberToggle() - if(&relativenumber == 1) - set number - else - set relativenumber - endif -endfunc -nnoremap :call NumberToggle() - -" vundle -filetype off " required! -set rtp+=~/.vim/bundle/vundle/ -call vundle#rc() -Bundle 'gmarik/vundle' -Bundle 'SirVer/ultisnips' -Bundle 'Valloric/YouCompleteMe' -Bundle 'tpope/vim-fugitive' -Bundle 'docunext/closetag.vim' -Bundle 'vimwiki/vimwiki' -Bundle 'scrooloose/nerdcommenter' -Bundle 'scrooloose/nerdtree' -Bundle 'majutsushi/tagbar' -Bundle 'scrooloose/syntastic' -Bundle 'tpope/vim-surround' -Plugin 'tpope/vim-endwise' -Plugin 'vim-ruby/vim-ruby' -Plugin 'bling/vim-airline' -filetype plugin indent on " required! - -" UltiSnips -let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger="" -let g:UltiSnipsJumpBackwardTrigger="" - -" syntastic -let g:syntastic_auto_loc_list=1 -let g:syntastic_enable_signs=1 - " airline -let g:airline_theme = 'pks256' -let g:airline_powerline_fonts = 1 -"let g:airline_enable_branch = 1 -"let g:airline_enable_syntastic = 1 -"let g:airline_left_sep = '' -"let g:airline_left_alt_sep = '' -"let g:airline_right_sep = '' -"let g:airline_right_alt_sep = '' -"let g:airline_branch_prefix = '' -"let g:airline_readonly_symbol = '' -"let g:airline_linecolumn_prefix = '' +let g:airline_theme = 'pks256' +let g:airline_powerline_fonts = 1 +let g:airline_enable_branch = 0 +let g:airline_symbols = {} +let g:airline_symbols.whitespace = 'Ξ' + +" tagbar +let g:tagbar_compact = 1 " vimwiki -let g:vimwiki_list = [{'path':'~/var/wiki', 'path_html':'~/var/wiki/html/'}] +let g:vimwiki_list = [{'path':'~/var/wiki'}] diff --git a/.zshrc b/.zshrc index a913923..ecf57ab 100644 --- a/.zshrc +++ b/.zshrc @@ -190,3 +190,5 @@ case `whoami` in ;; esac +stty -ixon # enable mapping of C-s in vim.. + -- cgit v1.2.3