From 455afba83b176f87802f2a62358ff7f23553cd4e Mon Sep 17 00:00:00 2001 From: michi Date: Mon, 8 Sep 2014 20:30:04 +0200 Subject: [PATCH] vim Vundle added, vim-arline added --- .gitmodules | 60 +----------------------------- README.md | 3 +- gvimrc | 4 +- vim/bundle/Vundle.vim | 1 + vim/bundle/ack.vim | 2 +- vim/bundle/delimitMate | 2 +- vim/bundle/nerdcommenter | 2 +- vim/bundle/nerdtree | 2 +- vim/bundle/supertab | 2 +- vim/bundle/vim-airline | 1 + vim/bundle/vim-cucumber | 2 +- vim/bundle/vim-endwise | 2 +- vim/bundle/vim-fugitive | 2 +- vim/bundle/vim-haml | 2 +- vim/bundle/vim-javascript | 2 +- vim/bundle/vim-mustache-handlebars | 2 +- vim/bundle/vim-pathogen | 1 - vim/bundle/vim-rails | 2 +- vim/bundle/vim-ruby | 2 +- vim/bundle/vim-surround | 2 +- vim/bundle/vimwiki | 2 +- vim/bundle/yaml-vim | 2 +- vimrc | 52 +++++++++++++++++++++++--- 23 files changed, 69 insertions(+), 85 deletions(-) create mode 160000 vim/bundle/Vundle.vim create mode 160000 vim/bundle/vim-airline delete mode 160000 vim/bundle/vim-pathogen diff --git a/.gitmodules b/.gitmodules index d3f9b05..f407dca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,2 @@ -[submodule "vim/bundle/vim-pathogen"] - path = vim/bundle/vim-pathogen - url = https://github.com/tpope/vim-pathogen.git -[submodule "vim/bundle/ctrlp.vim"] - path = vim/bundle/ctrlp.vim - url = https://github.com/kien/ctrlp.vim.git -[submodule "vim/bundle/ack.vim"] - path = vim/bundle/ack.vim - url = https://github.com/mileszs/ack.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/supertab"] - path = vim/bundle/supertab - url = https://github.com/ervandew/supertab.git -[submodule "vim/bundle/vim-fugitive"] - path = vim/bundle/vim-fugitive - url = https://github.com/tpope/vim-fugitive.git -[submodule "vim/bundle/gundo.vim"] - path = vim/bundle/gundo.vim - url = https://github.com/sjl/gundo.vim.git -[submodule "vim/bundle/vim-endwise"] - path = vim/bundle/vim-endwise - url = https://github.com/tpope/vim-endwise.git -[submodule "vim/bundle/vim-ruby"] - path = vim/bundle/vim-ruby - url = https://github.com/vim-ruby/vim-ruby.git -[submodule "vim/bundle/vim-rails"] - path = vim/bundle/vim-rails - url = https://github.com/tpope/vim-rails.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/vim-coffee-script"] - path = vim/bundle/vim-coffee-script - url = https://github.com/kchmck/vim-coffee-script.git -[submodule "vim/bundle/vim-cucumber"] - path = vim/bundle/vim-cucumber - url = https://github.com/tpope/vim-cucumber.git -[submodule "vim/bundle/vim-haml"] - path = vim/bundle/vim-haml - url = https://github.com/tpope/vim-haml.git -[submodule "vim/bundle/vim-mustache-handlebars"] - path = vim/bundle/vim-mustache-handlebars - url = https://github.com/mustache/vim-mustache-handlebars.git -[submodule "vim/bundle/vim-javascript"] - path = vim/bundle/vim-javascript - url = https://github.com/pangloss/vim-javascript.git -[submodule "vim/bundle/yaml-vim"] - path = vim/bundle/yaml-vim - url = https://github.com/ingydotnet/yaml-vim.git -[submodule "vim/bundle/delimitMate"] - path = vim/bundle/delimitMate - url = https://github.com/Raimondi/delimitMate.git + fetchRecurseSubmodules = false diff --git a/README.md b/README.md index e74acef..1da3956 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,5 @@ zlorfi's dotfiles * copy to your ~ ($HOME) * create symlinks via the `make_my_dotfiles.sh` script -* run ```git submodule init && git submodule update``` before starting vim +* install patched `Source Code Pro` font for the `vim-airline` plugin +* launch `vim` and run `:PluginInstall` diff --git a/gvimrc b/gvimrc index e80228c..edc30f5 100644 --- a/gvimrc +++ b/gvimrc @@ -1,7 +1,7 @@ " Copy to ~/.gvimrc or ~/_gvimrc. -"set guifont=Menlo\ Regular:h14 -set guifont=Source\ Code\ Pro:h14 +set guifont=Source\ Code\ Pro\ for\ Powerline:h14 "make sure to escape the spaces in the name properly +" set guifont=Source\ Code\ Pro:h16 set antialias " MacVim: smooth fonts. set encoding=utf-8 " Use UTF-8 everywhere. set guioptions-=T " Hide toolbar. diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim new file mode 160000 index 0000000..0b28e33 --- /dev/null +++ b/vim/bundle/Vundle.vim @@ -0,0 +1 @@ +Subproject commit 0b28e334e65b6628b0a61c412fcb45204a2f2bab diff --git a/vim/bundle/ack.vim b/vim/bundle/ack.vim index f183a34..303bcef 160000 --- a/vim/bundle/ack.vim +++ b/vim/bundle/ack.vim @@ -1 +1 @@ -Subproject commit f183a345a0c10caed7684d07dabae33e007c7590 +Subproject commit 303bceff1c8ab1145d114083582b1aeac9de7a85 diff --git a/vim/bundle/delimitMate b/vim/bundle/delimitMate index a1f21e8..38487bb 160000 --- a/vim/bundle/delimitMate +++ b/vim/bundle/delimitMate @@ -1 +1 @@ -Subproject commit a1f21e8ef5cb7027c158d374c279c56655eaa805 +Subproject commit 38487bbec8ba50834e257940b357de03991fa8f9 diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter index 0b3d928..6549cfd 160000 --- a/vim/bundle/nerdcommenter +++ b/vim/bundle/nerdcommenter @@ -1 +1 @@ -Subproject commit 0b3d928dce8262dedfc2f83b9aeb59a94e4f0ae4 +Subproject commit 6549cfde45339bd4f711504196ff3e8b766ef5e6 diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree index b0bb781..4f1e6ec 160000 --- a/vim/bundle/nerdtree +++ b/vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit b0bb781fc73ef40365e4c996a16f04368d64fc9d +Subproject commit 4f1e6ecb057fc0bac189171c1430d71ef25f6bb1 diff --git a/vim/bundle/supertab b/vim/bundle/supertab index 7a32e08..4e2376a 160000 --- a/vim/bundle/supertab +++ b/vim/bundle/supertab @@ -1 +1 @@ -Subproject commit 7a32e0866bfea26cf7781935289df131d1d0c0e0 +Subproject commit 4e2376a5b4fe3a1f71eb5ec2deb745d98fabde19 diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline new file mode 160000 index 0000000..3f3ae44 --- /dev/null +++ b/vim/bundle/vim-airline @@ -0,0 +1 @@ +Subproject commit 3f3ae446e1eb7164b5767bed6c63e63c50eb8ecc diff --git a/vim/bundle/vim-cucumber b/vim/bundle/vim-cucumber index 9e686ad..e1728c9 160000 --- a/vim/bundle/vim-cucumber +++ b/vim/bundle/vim-cucumber @@ -1 +1 @@ -Subproject commit 9e686ad36da43eae7462612fb8123bd47ea16171 +Subproject commit e1728c91413825baff257fef564c026f8a434186 diff --git a/vim/bundle/vim-endwise b/vim/bundle/vim-endwise index 1e651aa..ab5f7f9 160000 --- a/vim/bundle/vim-endwise +++ b/vim/bundle/vim-endwise @@ -1 +1 @@ -Subproject commit 1e651aafc72571bcbd2fc534ec936cdd927af260 +Subproject commit ab5f7f99f49ee26a16563df00a79fbc3bf1090af diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive index 8f0b8ed..0374322 160000 --- a/vim/bundle/vim-fugitive +++ b/vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 8f0b8edfbd246c0026b7a2388e1d883d579ac7f6 +Subproject commit 0374322ba5d85ae44dd9dc44ef31ca015a59097e diff --git a/vim/bundle/vim-haml b/vim/bundle/vim-haml index 3327947..204e327 160000 --- a/vim/bundle/vim-haml +++ b/vim/bundle/vim-haml @@ -1 +1 @@ -Subproject commit 33279476a63276cf5858a568283407dd98d7eb74 +Subproject commit 204e32721154766e03e99ff857bc798aa5b741dc diff --git a/vim/bundle/vim-javascript b/vim/bundle/vim-javascript index 7e28dbd..f8122fd 160000 --- a/vim/bundle/vim-javascript +++ b/vim/bundle/vim-javascript @@ -1 +1 @@ -Subproject commit 7e28dbd4e06fafb023ac8934d3937be1afbb222e +Subproject commit f8122fd1caca68b2592553e43dad45b3dc445a06 diff --git a/vim/bundle/vim-mustache-handlebars b/vim/bundle/vim-mustache-handlebars index b914a22..71bd9af 160000 --- a/vim/bundle/vim-mustache-handlebars +++ b/vim/bundle/vim-mustache-handlebars @@ -1 +1 @@ -Subproject commit b914a22331bbcf755417843ba3ed475ed4ca6bcd +Subproject commit 71bd9aff4938c2f40e2470003430d8a28f4edaa3 diff --git a/vim/bundle/vim-pathogen b/vim/bundle/vim-pathogen deleted file mode 160000 index 1270dce..0000000 --- a/vim/bundle/vim-pathogen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1270dceb1fe0ca35f8b292c7b41b45b42c5a0cc1 diff --git a/vim/bundle/vim-rails b/vim/bundle/vim-rails index ec52270..c406fb7 160000 --- a/vim/bundle/vim-rails +++ b/vim/bundle/vim-rails @@ -1 +1 @@ -Subproject commit ec5227052353a8bbb91f2f378fe8b8bc4e6e16d4 +Subproject commit c406fb76c863c751a403b45ecf2212f6d6a9a8a5 diff --git a/vim/bundle/vim-ruby b/vim/bundle/vim-ruby index d1f7471..5bc55be 160000 --- a/vim/bundle/vim-ruby +++ b/vim/bundle/vim-ruby @@ -1 +1 @@ -Subproject commit d1f747115acba340de6671a4e9fd626555cedfb3 +Subproject commit 5bc55bec639836ff5c35f58dc62988d6d1e74bd9 diff --git a/vim/bundle/vim-surround b/vim/bundle/vim-surround index 42e9b46..fa433e0 160000 --- a/vim/bundle/vim-surround +++ b/vim/bundle/vim-surround @@ -1 +1 @@ -Subproject commit 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a +Subproject commit fa433e0b7330753688f715f3be5d10dc480f20e5 diff --git a/vim/bundle/vimwiki b/vim/bundle/vimwiki index 5faf884..2c03d82 160000 --- a/vim/bundle/vimwiki +++ b/vim/bundle/vimwiki @@ -1 +1 @@ -Subproject commit 5faf884dc60c3ebd27734fe5f649acfb92025af8 +Subproject commit 2c03d82a0e4662adf1e347487d73a9bf4bf6fdac diff --git a/vim/bundle/yaml-vim b/vim/bundle/yaml-vim index 963d135..033d904 160000 --- a/vim/bundle/yaml-vim +++ b/vim/bundle/yaml-vim @@ -1 +1 @@ -Subproject commit 963d1351b5df8b6bd221606f2accb3a67157bc94 +Subproject commit 033d904b1633c202a0ef5fbe6cb327e32bce3b91 diff --git a/vimrc b/vimrc index c9b597b..38b645b 100644 --- a/vimrc +++ b/vimrc @@ -6,12 +6,47 @@ set nocompatible set history=1000 " Initialize Pathogen -runtime bundle/vim-pathogen/autoload/pathogen.vim -execute pathogen#infect() +" runtime bundle/vim-pathogen/autoload/pathogen.vim +" execute pathogen#infect() + +" filetype plugin indent on +filetype off + + +" set the runtime path to include Vundle and initialize +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() + +" let Vundle manage Vundle, required +Plugin 'gmarik/Vundle.vim' + +Plugin 'bling/vim-airline' +Plugin 'mileszs/ack.vim' +Plugin 'kien/ctrlp.vim' +Plugin 'Raimondi/delimitMate' +Plugin 'sjl/gundo.vim' +Plugin 'scrooloose/nerdcommenter' +Plugin 'scrooloose/nerdtree' +Plugin 'ervandew/supertab' +Plugin 'kchmck/vim-coffee-script' +Plugin 'tpope/vim-cucumber' +Plugin 'tpope/vim-endwise' +Plugin 'tpope/vim-fugitive' +Plugin 'tpope/vim-haml' +Plugin 'pangloss/vim-javascript' +Plugin 'mustache/vim-mustache-handlebars' +Plugin 'tpope/vim-rails' +Plugin 'vim-ruby/vim-ruby' +Plugin 'tpope/vim-surround' +Plugin 'vimwiki/vimwiki' +Plugin 'ingydotnet/yaml-vim' + +" All of your Plugins must be added before the following line +call vundle#end() " required +filetype plugin indent on " required " Enable syntax highlighting syntax on -filetype plugin indent on " Colorscheme let g:molokai_original = 1 @@ -46,7 +81,8 @@ set softtabstop=2 set expandtab " SET Font -set guifont=Menlo\ Regular:h14 +" set guifont=Menlo\ Regular:h14 +set guifont=Source\ Code\ Pro\ for\ Powerline:h14 "make sure to escape the spaces in the name properly " Show trailing spaces and highlight hard tabs set list listchars=tab:»·,trail:· @@ -87,11 +123,15 @@ set nowritebackup " And again. set directory=$HOME/.vim/tmp//,. " Keep swap files in one location -set laststatus=2 " Show the status line all the time +" set laststatus=2 " Show the status line all the time " Useful status information at bottom of screen -set statusline=[%n]\ %<%.99f\ %h%w%m%r%y%{fugitive#statusline()}\ %=%-16(\ Line:\ %l\ of\ %L\ %)\ %=%-30(%{strftime(\"\%c\",getftime(expand(\"\%\%\")))}\ %)%P +" set statusline=[%n]\ %<%.99f\ %h%w%m%r%y%{fugitive#statusline()}\ %=%-16(\ Line:\ %l\ of\ %L\ %)\ %=%-30(%{strftime(\"\%c\",getftime(expand(\"\%\%\")))}\ %)%P " set statusline=[%n]\ %<%.99f\ %h%w%m%r%y\ %=%-16(\ Line:\ %l\ of\ %L\ %)\ %=%-30(%{strftime(\"\%c\",getftime(expand(\"\%\%\")))}\ %)%P +" airline Smarter tab line +let g:airline#extensions#tabline#enabled = 1 +let g:airline_powerline_fonts = 1 + " NERDTreee show hidden files by default let g:NERDTreeShowHidden = 1 let g:NERDTreeChDirMode = 2