From 80f3157c46f6808def37ac93d3fb4c4c8263c014 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 14 Jan 2012 19:46:03 -0500 Subject: Initial commit --- .gitmodules | 24 +++++++++++ .vimrc | 101 ++++++++++++++++++++++++++++++++++++++++++++++ bundle/Vim-Tomorrow-Theme | 1 + bundle/ctrlp.vim | 1 + bundle/nerdcommenter | 1 + bundle/nerdtree | 1 + bundle/vim-buffergator | 1 + bundle/vim-fugitive | 1 + bundle/vim-pasta | 1 + bundle/vim-pathogen | 1 + 10 files changed, 133 insertions(+) create mode 100644 .gitmodules create mode 100644 .vimrc create mode 160000 bundle/Vim-Tomorrow-Theme create mode 160000 bundle/ctrlp.vim create mode 160000 bundle/nerdcommenter create mode 160000 bundle/nerdtree create mode 160000 bundle/vim-buffergator create mode 160000 bundle/vim-fugitive create mode 160000 bundle/vim-pasta create mode 160000 bundle/vim-pathogen diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..87514d90 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,24 @@ +[submodule "bundle/vim-pathogen"] + path = bundle/vim-pathogen + url = https://github.com/tpope/vim-pathogen.git +[submodule "bundle/ctrlp.vim"] + path = bundle/ctrlp.vim + url = https://github.com/kien/ctrlp.vim.git +[submodule "bundle/Vim-Tomorrow-Theme"] + path = bundle/Vim-Tomorrow-Theme + url = git://github.com/programble/Vim-Tomorrow-Theme.git +[submodule "bundle/vim-pasta"] + path = bundle/vim-pasta + url = https://github.com/sickill/vim-pasta.git +[submodule "bundle/vim-fugitive"] + path = bundle/vim-fugitive + url = https://github.com/tpope/vim-fugitive.git +[submodule "bundle/nerdcommenter"] + path = bundle/nerdcommenter + url = https://github.com/ddollar/nerdcommenter.git +[submodule "bundle/nerdtree"] + path = bundle/nerdtree + url = https://github.com/scrooloose/nerdtree.git +[submodule "bundle/vim-buffergator"] + path = bundle/vim-buffergator + url = https://github.com/jeetsukumaran/vim-buffergator.git diff --git a/.vimrc b/.vimrc new file mode 100644 index 00000000..8d962cc3 --- /dev/null +++ b/.vimrc @@ -0,0 +1,101 @@ +" Load pathogen +runtime bundle/vim-pathogen/autoload/pathogen.vim +call pathogen#infect() + +" Remap leader to , +noremap \ , +let mapleader = "," + +" General +set backspace=indent,eol,start +set hidden +set backup +set history=50 +set ruler +set showcmd +set incsearch +set ignorecase +set smartcase +set autoindent +set smartindent +set nu +set spell +set cc=80 +set title +set shortmess=atI +set visualbell t_vb= +set cursorline +set smarttab +set hlsearch +set list +set listchars=tab:»·,trail:· + +set laststatus=2 " Always show statusline +set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P + +syntax on +colorscheme Tomorrow-Night + +" Enable mouse in terminals +if has('mouse') + set mouse=a +endif + +" GUI options +set guioptions-=tT " Disable tear-off menus and toolbar +set guifont=Monospace\ 9 +set browsedir=buffer " Open dialog starts in working directory + +" Jump to the last cursor position when opening +autocmd BufReadPost * + \ if line("'\"") > 1 && line("'\"") <= line("$") | + \ exe "normal! g`\"" | + \ endif + +" Default to 2-space indents, 4-character tabs +set expandtab +set shiftwidth=2 +set tabstop=4 +filetype plugin indent on + +" Indentation exceptions +autocmd FileType c setlocal sw=4 +autocmd FileType cpp setlocal sw=4 + +" Better tab-complete when opening +set wildmenu +set wildmode=list:longest +set wildignore=*.o,*.d,*~ + +" Smarter % +runtime macros/matchit.vim + +" Disable visible whitespace in insert mode +autocmd InsertEnter * setlocal nolist +autocmd InsertLeave * setlocal list + +" Custom maps +let g:buffergator_suppress_keymaps=1 + +nnoremap ' ` +nnoremap ` ' + +nmap n :silent :nohlsearch " Clear search highlights +nmap s :set list! " Toggle visible whitespace + +nmap p "+p +nmap P "+P +nmap y "+y +nmap Y "+Y +nmap d "+d +nmap D "+D + +imap " Insert hard tab + +nmap Q gq + +nmap t :NERDTreeToggle +nmap b :BuffergatorToggle + +" Custom commands +command! W :w diff --git a/bundle/Vim-Tomorrow-Theme b/bundle/Vim-Tomorrow-Theme new file mode 160000 index 00000000..ae8edac5 --- /dev/null +++ b/bundle/Vim-Tomorrow-Theme @@ -0,0 +1 @@ +Subproject commit ae8edac57291e3e9ac9dd59e1dda6e961836df28 diff --git a/bundle/ctrlp.vim b/bundle/ctrlp.vim new file mode 160000 index 00000000..420174fc --- /dev/null +++ b/bundle/ctrlp.vim @@ -0,0 +1 @@ +Subproject commit 420174fc537ba986a716964db7af0bd189252944 diff --git a/bundle/nerdcommenter b/bundle/nerdcommenter new file mode 160000 index 00000000..093e6b3f --- /dev/null +++ b/bundle/nerdcommenter @@ -0,0 +1 @@ +Subproject commit 093e6b3f765b728c129a4271f1f34bb70e671f08 diff --git a/bundle/nerdtree b/bundle/nerdtree new file mode 160000 index 00000000..eced5f98 --- /dev/null +++ b/bundle/nerdtree @@ -0,0 +1 @@ +Subproject commit eced5f98a0724cd6498b70024b3edec1e7b29b2e diff --git a/bundle/vim-buffergator b/bundle/vim-buffergator new file mode 160000 index 00000000..c6f56eac --- /dev/null +++ b/bundle/vim-buffergator @@ -0,0 +1 @@ +Subproject commit c6f56eac74c9ae9301b640e9f5bb0389a8ffd4fa diff --git a/bundle/vim-fugitive b/bundle/vim-fugitive new file mode 160000 index 00000000..b4b75ef6 --- /dev/null +++ b/bundle/vim-fugitive @@ -0,0 +1 @@ +Subproject commit b4b75ef682da3e946c648d3634ade39d0af49aba diff --git a/bundle/vim-pasta b/bundle/vim-pasta new file mode 160000 index 00000000..ada8a5cf --- /dev/null +++ b/bundle/vim-pasta @@ -0,0 +1 @@ +Subproject commit ada8a5cf9a826db57cf98bde808384d351fd2897 diff --git a/bundle/vim-pathogen b/bundle/vim-pathogen new file mode 160000 index 00000000..ab64b4dd --- /dev/null +++ b/bundle/vim-pathogen @@ -0,0 +1 @@ +Subproject commit ab64b4ddd0c184a528780b498a0b0a5b40248f7c -- cgit 1.4.1 From 017148734c606de5025a68f0181419303991677c Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 14 Jan 2012 19:49:58 -0500 Subject: Added maps for some Fugitive commands --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 8d962cc3..bd1fc066 100644 --- a/.vimrc +++ b/.vimrc @@ -97,5 +97,8 @@ nmap Q gq nmap t :NERDTreeToggle nmap b :BuffergatorToggle +nmap gs :Gstatus +nmap gc :Gcommit + " Custom commands command! W :w -- cgit 1.4.1 From 7cb4aee1de416fd490c623af2a8d0d0751b216e2 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 14 Jan 2012 19:57:48 -0500 Subject: Added gist-vim --- .gitmodules | 3 +++ bundle/gist-vim | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/gist-vim diff --git a/.gitmodules b/.gitmodules index 87514d90..752e0632 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "bundle/vim-buffergator"] path = bundle/vim-buffergator url = https://github.com/jeetsukumaran/vim-buffergator.git +[submodule "bundle/gist-vim"] + path = bundle/gist-vim + url = https://github.com/mattn/gist-vim.git diff --git a/bundle/gist-vim b/bundle/gist-vim new file mode 160000 index 00000000..948266a5 --- /dev/null +++ b/bundle/gist-vim @@ -0,0 +1 @@ +Subproject commit 948266a54fd90473d7fbbbf663d5ddfa6d6d1158 -- cgit 1.4.1 From 51bf5a7ee4dd724cdb0781003b6fe19e961c2c8d Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 14 Jan 2012 20:02:58 -0500 Subject: Added ooc.vim --- .gitmodules | 3 +++ bundle/ooc.vim | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/ooc.vim diff --git a/.gitmodules b/.gitmodules index 752e0632..2e3a93b9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ [submodule "bundle/gist-vim"] path = bundle/gist-vim url = https://github.com/mattn/gist-vim.git +[submodule "bundle/ooc.vim"] + path = bundle/ooc.vim + url = git://github.com/programble/ooc.vim.git diff --git a/bundle/ooc.vim b/bundle/ooc.vim new file mode 160000 index 00000000..69c9ee7c --- /dev/null +++ b/bundle/ooc.vim @@ -0,0 +1 @@ +Subproject commit 69c9ee7c366c488ee076e479b76cefbb517c210b -- cgit 1.4.1 From 1ccdf157dcb853a7cb9cecade09210028a2f202a Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 14 Jan 2012 20:04:59 -0500 Subject: Map ,gp to :Git push --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index bd1fc066..f40fad68 100644 --- a/.vimrc +++ b/.vimrc @@ -99,6 +99,7 @@ nmap b :BuffergatorToggle nmap gs :Gstatus nmap gc :Gcommit +nmap gp :Git push " Custom commands command! W :w -- cgit 1.4.1 From 01d1168c2f5155d497907edc83cb286cd5752e70 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 14 Jan 2012 20:50:45 -0500 Subject: Added a silly README --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..cc31bf06 --- /dev/null +++ b/README.md @@ -0,0 +1,14 @@ +# VIM Configuration + +My amazing VIM configuration + +## Install + +``` +cd ~ +git clone git://github.com/programble/dotvim.git .vim +ln -s .vim/.vimrc .vimrc +cd .vim +git submodule init +git submodule update +``` -- cgit 1.4.1 From 4a37abd78862a6fcf25ab7ebe56fd000c1604fd6 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 14 Jan 2012 21:04:45 -0500 Subject: Disable scrollbars --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index f40fad68..591df6c9 100644 --- a/.vimrc +++ b/.vimrc @@ -42,7 +42,7 @@ if has('mouse') endif " GUI options -set guioptions-=tT " Disable tear-off menus and toolbar +set guioptions-=rLtT " Disable tear-off menus, toolbar, scrollbars set guifont=Monospace\ 9 set browsedir=buffer " Open dialog starts in working directory -- cgit 1.4.1 From 3d99155853c40346f06cebd9c8e7257f541a8040 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 15 Jan 2012 14:38:24 -0500 Subject: Moved comments out of maps --- .vimrc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.vimrc b/.vimrc index 591df6c9..46888e3e 100644 --- a/.vimrc +++ b/.vimrc @@ -80,8 +80,10 @@ let g:buffergator_suppress_keymaps=1 nnoremap ' ` nnoremap ` ' -nmap n :silent :nohlsearch " Clear search highlights -nmap s :set list! " Toggle visible whitespace +" Clear search highlights +nmap n :silent :nohlsearch +" Toggle visible whitespace +nmap s :set list! nmap p "+p nmap P "+P @@ -90,7 +92,8 @@ nmap Y "+Y nmap d "+d nmap D "+D -imap " Insert hard tab +" Insert hard tab +imap nmap Q gq -- cgit 1.4.1 From 8a4c4e79b1fdbd1b7175d07997973cd379fd4be8 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 21 Jan 2012 22:43:41 -0500 Subject: Add quicktask --- .gitmodules | 3 +++ .vimrc | 2 +- bundle/quicktask | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 bundle/quicktask diff --git a/.gitmodules b/.gitmodules index 2e3a93b9..293bb8f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "bundle/ooc.vim"] path = bundle/ooc.vim url = git://github.com/programble/ooc.vim.git +[submodule "bundle/quicktask"] + path = bundle/quicktask + url = https://github.com/aaronbieber/quicktask.git diff --git a/.vimrc b/.vimrc index 46888e3e..f711d337 100644 --- a/.vimrc +++ b/.vimrc @@ -97,7 +97,7 @@ imap nmap Q gq -nmap t :NERDTreeToggle +"nmap t :NERDTreeToggle nmap b :BuffergatorToggle nmap gs :Gstatus diff --git a/bundle/quicktask b/bundle/quicktask new file mode 160000 index 00000000..8bc7603f --- /dev/null +++ b/bundle/quicktask @@ -0,0 +1 @@ +Subproject commit 8bc7603fe96966e1389868774d0f3448c655db26 -- cgit 1.4.1 From 3b16eca8f5d6eef8af0bd787749f3429d14b0b6c Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 21 Jan 2012 23:11:35 -0500 Subject: Add Powerline --- .gitmodules | 3 +++ .vimrc | 1 + bundle/vim-powerline | 1 + 3 files changed, 5 insertions(+) create mode 160000 bundle/vim-powerline diff --git a/.gitmodules b/.gitmodules index 293bb8f2..19356752 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,3 +31,6 @@ [submodule "bundle/quicktask"] path = bundle/quicktask url = https://github.com/aaronbieber/quicktask.git +[submodule "bundle/vim-powerline"] + path = bundle/vim-powerline + url = https://github.com/Lokaltog/vim-powerline.git diff --git a/.vimrc b/.vimrc index f711d337..cda825a0 100644 --- a/.vimrc +++ b/.vimrc @@ -45,6 +45,7 @@ endif set guioptions-=rLtT " Disable tear-off menus, toolbar, scrollbars set guifont=Monospace\ 9 set browsedir=buffer " Open dialog starts in working directory +let g:Powerline_symbols = 'fancy' " Jump to the last cursor position when opening autocmd BufReadPost * diff --git a/bundle/vim-powerline b/bundle/vim-powerline new file mode 160000 index 00000000..23b4bbd7 --- /dev/null +++ b/bundle/vim-powerline @@ -0,0 +1 @@ +Subproject commit 23b4bbd7b555367a714de66ccde468c08464f5a3 -- cgit 1.4.1 From 64dd08a666e9e43bb4fceca17cf8f5b3d9a21fd2 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 00:05:29 -0500 Subject: Add syntastic --- .gitmodules | 3 +++ .vimrc | 5 +++++ bundle/syntastic | 1 + 3 files changed, 9 insertions(+) create mode 160000 bundle/syntastic diff --git a/.gitmodules b/.gitmodules index 19356752..45d1b35d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "bundle/vim-powerline"] path = bundle/vim-powerline url = https://github.com/Lokaltog/vim-powerline.git +[submodule "bundle/syntastic"] + path = bundle/syntastic + url = https://github.com/scrooloose/syntastic.git diff --git a/.vimrc b/.vimrc index cda825a0..b023e02f 100644 --- a/.vimrc +++ b/.vimrc @@ -75,6 +75,11 @@ runtime macros/matchit.vim autocmd InsertEnter * setlocal nolist autocmd InsertLeave * setlocal list +" Syntastic options +let g:syntastic_check_on_open=1 +let g:syntastic_enable_signs=0 +let g:syntastic_auto_loc_list=1 + " Custom maps let g:buffergator_suppress_keymaps=1 diff --git a/bundle/syntastic b/bundle/syntastic new file mode 160000 index 00000000..fe5b8989 --- /dev/null +++ b/bundle/syntastic @@ -0,0 +1 @@ +Subproject commit fe5b8989afa1859751acc34d9c0c6f8ccef44f6a -- cgit 1.4.1 From 1a3fb704015853d4c0d3d9b147d497023109e73f Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 00:35:04 -0500 Subject: Add Jellybeans colorscheme --- .gitmodules | 3 +++ bundle/jellybeans.vim | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/jellybeans.vim diff --git a/.gitmodules b/.gitmodules index 45d1b35d..7c08c5fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,3 +37,6 @@ [submodule "bundle/syntastic"] path = bundle/syntastic url = https://github.com/scrooloose/syntastic.git +[submodule "bundle/jellybeans.vim"] + path = bundle/jellybeans.vim + url = https://github.com/nanotech/jellybeans.vim.git diff --git a/bundle/jellybeans.vim b/bundle/jellybeans.vim new file mode 160000 index 00000000..e40227c0 --- /dev/null +++ b/bundle/jellybeans.vim @@ -0,0 +1 @@ +Subproject commit e40227c0c05c1de05352aabd99e76f65ae18def8 -- cgit 1.4.1 From 37f5d3a1fa86ef9114b722897b9a12ddf70d8070 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 00:39:59 -0500 Subject: Add Gundo --- .gitmodules | 3 +++ bundle/gundo.vim | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/gundo.vim diff --git a/.gitmodules b/.gitmodules index 7c08c5fa..dfd744a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ [submodule "bundle/jellybeans.vim"] path = bundle/jellybeans.vim url = https://github.com/nanotech/jellybeans.vim.git +[submodule "bundle/gundo.vim"] + path = bundle/gundo.vim + url = http://github.com/sjl/gundo.vim.git diff --git a/bundle/gundo.vim b/bundle/gundo.vim new file mode 160000 index 00000000..50092711 --- /dev/null +++ b/bundle/gundo.vim @@ -0,0 +1 @@ +Subproject commit 50092711ff831742cece76f3322674858863e3f3 -- cgit 1.4.1 From 2a6b421182cfcf34f2a6ee851da7c3c045775b66 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 00:44:04 -0500 Subject: Add binding for Gundo --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index b023e02f..94772f0c 100644 --- a/.vimrc +++ b/.vimrc @@ -110,5 +110,7 @@ nmap gs :Gstatus nmap gc :Gcommit nmap gp :Git push +nnoremap u :GundoToggle + " Custom commands command! W :w -- cgit 1.4.1 From 39cfdd62ba82f93f68a2b5fa7b5771303d8b9dee Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 01:25:09 -0500 Subject: Add AutoClose --- .gitmodules | 3 +++ bundle/AutoClose | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/AutoClose diff --git a/.gitmodules b/.gitmodules index dfd744a1..2af50670 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,3 +43,6 @@ [submodule "bundle/gundo.vim"] path = bundle/gundo.vim url = http://github.com/sjl/gundo.vim.git +[submodule "bundle/AutoClose"] + path = bundle/AutoClose + url = https://github.com/vim-scripts/AutoClose.git diff --git a/bundle/AutoClose b/bundle/AutoClose new file mode 160000 index 00000000..d50ea9a8 --- /dev/null +++ b/bundle/AutoClose @@ -0,0 +1 @@ +Subproject commit d50ea9a887e14e1af43788beaa66144bbc745cb5 -- cgit 1.4.1 From cc3f5fe9367adc5c28e1e34e5965e351d201474b Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 01:31:03 -0500 Subject: Add vim-space --- .gitmodules | 3 +++ bundle/vim-space | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/vim-space diff --git a/.gitmodules b/.gitmodules index 2af50670..ec4c7b2c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,6 @@ [submodule "bundle/AutoClose"] path = bundle/AutoClose url = https://github.com/vim-scripts/AutoClose.git +[submodule "bundle/vim-space"] + path = bundle/vim-space + url = https://github.com/spiiph/vim-space.git diff --git a/bundle/vim-space b/bundle/vim-space new file mode 160000 index 00000000..9440e388 --- /dev/null +++ b/bundle/vim-space @@ -0,0 +1 @@ +Subproject commit 9440e388cc75754ab7c58441f3ef965a70a411db -- cgit 1.4.1 From ed4fbdeb35e5fd27748352227a46efe16e65167e Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 03:17:25 -0500 Subject: Map ,e and ,b to CtrlP file and buffer respectively --- .vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vimrc b/.vimrc index 94772f0c..2dc9d72b 100644 --- a/.vimrc +++ b/.vimrc @@ -103,8 +103,8 @@ imap nmap Q gq -"nmap t :NERDTreeToggle -nmap b :BuffergatorToggle +nmap b :CtrlPBuffer +nmap e :CtrlP nmap gs :Gstatus nmap gc :Gcommit -- cgit 1.4.1 From 41cb1db33ba7b64d8af63bf55bb82f7e8a617518 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 12:40:05 -0500 Subject: Add VCS repo directories to wildignore --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 2dc9d72b..f1043d1a 100644 --- a/.vimrc +++ b/.vimrc @@ -66,7 +66,7 @@ autocmd FileType cpp setlocal sw=4 " Better tab-complete when opening set wildmenu set wildmode=list:longest -set wildignore=*.o,*.d,*~ +set wildignore=*.o,*.d,*~,*/.git/*,*/.hg/*,*/.svn/* " Smarter % runtime macros/matchit.vim -- cgit 1.4.1 From cb70bc3ebf4159ff6867a9c937c9d570590334aa Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 12:51:26 -0500 Subject: Update some plugins --- bundle/ctrlp.vim | 2 +- bundle/vim-powerline | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/ctrlp.vim b/bundle/ctrlp.vim index 420174fc..a13d90fd 160000 --- a/bundle/ctrlp.vim +++ b/bundle/ctrlp.vim @@ -1 +1 @@ -Subproject commit 420174fc537ba986a716964db7af0bd189252944 +Subproject commit a13d90fd2a62fcb91286e7237b182a2687237c60 diff --git a/bundle/vim-powerline b/bundle/vim-powerline index 23b4bbd7..f2acebb7 160000 --- a/bundle/vim-powerline +++ b/bundle/vim-powerline @@ -1 +1 @@ -Subproject commit 23b4bbd7b555367a714de66ccde468c08464f5a3 +Subproject commit f2acebb789583367c39a6c665e6caed5fc2b7b72 -- cgit 1.4.1 From fa48f5965c57272e616721d92475cd2f1e35f667 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 13:27:09 -0500 Subject: Disable powerline for now --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index f1043d1a..dcbd9082 100644 --- a/.vimrc +++ b/.vimrc @@ -114,3 +114,5 @@ nnoremap u :GundoToggle " Custom commands command! W :w + +let g:Powerline_loaded=1 -- cgit 1.4.1 From 659339db6b5d53fa8ea9f2c23de4d67aaf021766 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 13:33:12 -0500 Subject: Revert "Add VCS repo directories to wildignore" This reverts commit 41cb1db33ba7b64d8af63bf55bb82f7e8a617518. This fixes not being able to commit with vim-fugitive --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index dcbd9082..b50e63a1 100644 --- a/.vimrc +++ b/.vimrc @@ -66,7 +66,7 @@ autocmd FileType cpp setlocal sw=4 " Better tab-complete when opening set wildmenu set wildmode=list:longest -set wildignore=*.o,*.d,*~,*/.git/*,*/.hg/*,*/.svn/* +set wildignore=*.o,*.d,*~ " Smarter % runtime macros/matchit.vim -- cgit 1.4.1 From f2bf055f9bd32e5a12b381a8b6adcef465fdb34e Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 13:39:25 -0500 Subject: Revert "Disable powerline for now" This reverts commit fa48f5965c57272e616721d92475cd2f1e35f667. --- .vimrc | 2 -- 1 file changed, 2 deletions(-) diff --git a/.vimrc b/.vimrc index b50e63a1..2dc9d72b 100644 --- a/.vimrc +++ b/.vimrc @@ -114,5 +114,3 @@ nnoremap u :GundoToggle " Custom commands command! W :w - -let g:Powerline_loaded=1 -- cgit 1.4.1 From ae9c3b8a80a8c2cc2a5595b46fad91e1c2037e7c Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 13:58:19 -0500 Subject: Revert "Add AutoClose" This reverts commit 39cfdd62ba82f93f68a2b5fa7b5771303d8b9dee. This fixes the delay when leaving insert mode --- .gitmodules | 3 --- bundle/AutoClose | 1 - 2 files changed, 4 deletions(-) delete mode 160000 bundle/AutoClose diff --git a/.gitmodules b/.gitmodules index ec4c7b2c..1009237e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,9 +43,6 @@ [submodule "bundle/gundo.vim"] path = bundle/gundo.vim url = http://github.com/sjl/gundo.vim.git -[submodule "bundle/AutoClose"] - path = bundle/AutoClose - url = https://github.com/vim-scripts/AutoClose.git [submodule "bundle/vim-space"] path = bundle/vim-space url = https://github.com/spiiph/vim-space.git diff --git a/bundle/AutoClose b/bundle/AutoClose deleted file mode 160000 index d50ea9a8..00000000 --- a/bundle/AutoClose +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d50ea9a887e14e1af43788beaa66144bbc745cb5 -- cgit 1.4.1 From 6d6af861844ab4c03cef67586e0b9244c44c5b98 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 14:17:21 -0500 Subject: Update quicktask --- bundle/quicktask | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/quicktask b/bundle/quicktask index 8bc7603f..97bc5e98 160000 --- a/bundle/quicktask +++ b/bundle/quicktask @@ -1 +1 @@ -Subproject commit 8bc7603fe96966e1389868774d0f3448c655db26 +Subproject commit 97bc5e98582f23004e983d64f9f219ce7dc1af66 -- cgit 1.4.1 From 92b6272ae7d79dcb2ef9048d83cfcb89ae6b22b7 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 15:00:25 -0500 Subject: Enable syntax-based folding --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index 2dc9d72b..65b4046d 100644 --- a/.vimrc +++ b/.vimrc @@ -29,6 +29,8 @@ set smarttab set hlsearch set list set listchars=tab:»·,trail:· +set foldmethod=syntax +set foldlevel=1000 set laststatus=2 " Always show statusline set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P -- cgit 1.4.1 From 7eb96e1d07ac70b0ce3fa16f92a3f99654fdb816 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 22 Jan 2012 22:17:22 -0500 Subject: Use space-test branch of quicktask --- bundle/quicktask | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/quicktask b/bundle/quicktask index 97bc5e98..de6ef009 160000 --- a/bundle/quicktask +++ b/bundle/quicktask @@ -1 +1 @@ -Subproject commit 97bc5e98582f23004e983d64f9f219ce7dc1af66 +Subproject commit de6ef00976f0d0b3ce50cb06d0b826309c742242 -- cgit 1.4.1 From 35bad5cb30ab76705ba23a2baf8abb2b3fe8e7d2 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 28 Jan 2012 02:09:01 -0500 Subject: Update to Quicktask 1.1 --- bundle/quicktask | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/quicktask b/bundle/quicktask index de6ef009..4669e57d 160000 --- a/bundle/quicktask +++ b/bundle/quicktask @@ -1 +1 @@ -Subproject commit de6ef00976f0d0b3ce50cb06d0b826309c742242 +Subproject commit 4669e57d2b4d0d7170e0aca99c55c9c90e9f8bf6 -- cgit 1.4.1 From 29c4823373cca14a73d2d080b3c444aceb0b9611 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 29 Jan 2012 21:58:08 -0500 Subject: Don't show Syntastic errors automatically --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 65b4046d..78557059 100644 --- a/.vimrc +++ b/.vimrc @@ -80,7 +80,7 @@ autocmd InsertLeave * setlocal list " Syntastic options let g:syntastic_check_on_open=1 let g:syntastic_enable_signs=0 -let g:syntastic_auto_loc_list=1 +let g:syntastic_auto_loc_list=2 " Custom maps let g:buffergator_suppress_keymaps=1 -- cgit 1.4.1 From cd095a6f04d015c9e3167640a53a6c5bfe073df7 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Mon, 30 Jan 2012 15:18:50 -0500 Subject: Set shiftwidth to 4 for Lua --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index 78557059..911242b2 100644 --- a/.vimrc +++ b/.vimrc @@ -64,6 +64,7 @@ filetype plugin indent on " Indentation exceptions autocmd FileType c setlocal sw=4 autocmd FileType cpp setlocal sw=4 +autocmd FileType lua setlocal sw=4 " Better tab-complete when opening set wildmenu -- cgit 1.4.1 From 69024a9ce0d55e262ba64cd7c024f0c2b6c0b473 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Mon, 30 Jan 2012 15:20:44 -0500 Subject: Disable menu bar in GVim --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 911242b2..d217ac5d 100644 --- a/.vimrc +++ b/.vimrc @@ -44,7 +44,7 @@ if has('mouse') endif " GUI options -set guioptions-=rLtT " Disable tear-off menus, toolbar, scrollbars +set guioptions-=mrLtT " Disable tear-off menus, toolbar, scrollbars set guifont=Monospace\ 9 set browsedir=buffer " Open dialog starts in working directory let g:Powerline_symbols = 'fancy' -- cgit 1.4.1 From 27afe9e7bee52d880915a59028e3f6f5ff8e335a Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 1 Feb 2012 15:14:05 -0500 Subject: Update Vim-Tomorrow-Theme PS. Chris Kempson is a jerk. --- bundle/Vim-Tomorrow-Theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/Vim-Tomorrow-Theme b/bundle/Vim-Tomorrow-Theme index ae8edac5..cc6b5cb9 160000 --- a/bundle/Vim-Tomorrow-Theme +++ b/bundle/Vim-Tomorrow-Theme @@ -1 +1 @@ -Subproject commit ae8edac57291e3e9ac9dd59e1dda6e961836df28 +Subproject commit cc6b5cb9aff0ae52a8cd8076f9b7f4ecb33eacbf -- cgit 1.4.1 From 15da054d16c17823941799275567d5d03484c1d1 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 1 Feb 2012 19:24:31 -0500 Subject: Add tabular.vim --- .gitmodules | 3 +++ bundle/tabular | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/tabular diff --git a/.gitmodules b/.gitmodules index 1009237e..1764aa52 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,6 @@ [submodule "bundle/vim-space"] path = bundle/vim-space url = https://github.com/spiiph/vim-space.git +[submodule "bundle/tabular"] + path = bundle/tabular + url = https://github.com/godlygeek/tabular.git diff --git a/bundle/tabular b/bundle/tabular new file mode 160000 index 00000000..b7b4d879 --- /dev/null +++ b/bundle/tabular @@ -0,0 +1 @@ +Subproject commit b7b4d8791a50013b56c2d68b6c5708c808203b54 -- cgit 1.4.1 From 21c743095bf9f006c586a342a14dc9726765d326 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 1 Feb 2012 19:27:23 -0500 Subject: Add vim-markdown --- .gitmodules | 3 +++ bundle/vim-markdown | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/vim-markdown diff --git a/.gitmodules b/.gitmodules index 1764aa52..b0e9adb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,3 +49,6 @@ [submodule "bundle/tabular"] path = bundle/tabular url = https://github.com/godlygeek/tabular.git +[submodule "bundle/vim-markdown"] + path = bundle/vim-markdown + url = https://github.com/tpope/vim-markdown.git diff --git a/bundle/vim-markdown b/bundle/vim-markdown new file mode 160000 index 00000000..fdc0f091 --- /dev/null +++ b/bundle/vim-markdown @@ -0,0 +1 @@ +Subproject commit fdc0f091c78cd9a474ac3e3cf40ba7d6933ef9da -- cgit 1.4.1 From 61c25fd7a965a51e0c746e0132974d918f852443 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 1 Feb 2012 19:56:30 -0500 Subject: Update Vim-Tomorrow-Theme --- bundle/Vim-Tomorrow-Theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/Vim-Tomorrow-Theme b/bundle/Vim-Tomorrow-Theme index cc6b5cb9..9a9beed3 160000 --- a/bundle/Vim-Tomorrow-Theme +++ b/bundle/Vim-Tomorrow-Theme @@ -1 +1 @@ -Subproject commit cc6b5cb9aff0ae52a8cd8076f9b7f4ecb33eacbf +Subproject commit 9a9beed332923fa1275d61748270763177d46af2 -- cgit 1.4.1 From 28cf15ba0309361cb972012bb3bdad62423f401d Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 1 Feb 2012 20:00:17 -0500 Subject: Add ShowMarks plugin --- .gitmodules | 3 +++ bundle/vim-showmarks | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/vim-showmarks diff --git a/.gitmodules b/.gitmodules index b0e9adb2..386b3b83 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,3 +52,6 @@ [submodule "bundle/vim-markdown"] path = bundle/vim-markdown url = https://github.com/tpope/vim-markdown.git +[submodule "bundle/vim-showmarks"] + path = bundle/vim-showmarks + url = https://github.com/garbas/vim-showmarks.git diff --git a/bundle/vim-showmarks b/bundle/vim-showmarks new file mode 160000 index 00000000..11d9fb0e --- /dev/null +++ b/bundle/vim-showmarks @@ -0,0 +1 @@ +Subproject commit 11d9fb0e38a3894f23b9de69aa3e3990a685d73c -- cgit 1.4.1 From 106223c2915b9c585640c7b9463832c439d10f2a Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 1 Feb 2012 20:03:08 -0500 Subject: Revert "Add ShowMarks plugin" This reverts commit 28cf15ba0309361cb972012bb3bdad62423f401d. --- .gitmodules | 3 --- bundle/vim-showmarks | 1 - 2 files changed, 4 deletions(-) delete mode 160000 bundle/vim-showmarks diff --git a/.gitmodules b/.gitmodules index 386b3b83..b0e9adb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,6 +52,3 @@ [submodule "bundle/vim-markdown"] path = bundle/vim-markdown url = https://github.com/tpope/vim-markdown.git -[submodule "bundle/vim-showmarks"] - path = bundle/vim-showmarks - url = https://github.com/garbas/vim-showmarks.git diff --git a/bundle/vim-showmarks b/bundle/vim-showmarks deleted file mode 160000 index 11d9fb0e..00000000 --- a/bundle/vim-showmarks +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 11d9fb0e38a3894f23b9de69aa3e3990a685d73c -- cgit 1.4.1 From 7d4117fac5c84824ca7aeb1789cca3437d4a922a Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 2 Feb 2012 17:40:17 -0500 Subject: Add itchy.vim --- .gitmodules | 3 +++ .vimrc | 10 ++++++---- bundle/itchy.vim | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) create mode 160000 bundle/itchy.vim diff --git a/.gitmodules b/.gitmodules index b0e9adb2..eb2046aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,3 +52,6 @@ [submodule "bundle/vim-markdown"] path = bundle/vim-markdown url = https://github.com/tpope/vim-markdown.git +[submodule "bundle/itchy.vim"] + path = bundle/itchy.vim + url = git://github.com/programble/itchy.vim.git diff --git a/.vimrc b/.vimrc index d217ac5d..eb214fe1 100644 --- a/.vimrc +++ b/.vimrc @@ -50,10 +50,8 @@ set browsedir=buffer " Open dialog starts in working directory let g:Powerline_symbols = 'fancy' " Jump to the last cursor position when opening -autocmd BufReadPost * - \ if line("'\"") > 1 && line("'\"") <= line("$") | - \ exe "normal! g`\"" | - \ endif +au BufReadPost * if &filetype !~ '^git\c' && line("'\"") > 0 && line("'\"") <= line("$") + \| exe "normal! g`\"" | endif " Default to 2-space indents, 4-character tabs set expandtab @@ -83,6 +81,9 @@ let g:syntastic_check_on_open=1 let g:syntastic_enable_signs=0 let g:syntastic_auto_loc_list=2 +" Itchy options +let g:itchy_startup = 1 + " Custom maps let g:buffergator_suppress_keymaps=1 @@ -117,3 +118,4 @@ nnoremap u :GundoToggle " Custom commands command! W :w + diff --git a/bundle/itchy.vim b/bundle/itchy.vim new file mode 160000 index 00000000..94a1d0cd --- /dev/null +++ b/bundle/itchy.vim @@ -0,0 +1 @@ +Subproject commit 94a1d0cddc22b266766bc29e52841920bcd2aefc -- cgit 1.4.1 From 9ad9537052ad29893161f2e7148976f043cd6fd4 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 2 Feb 2012 22:47:30 -0500 Subject: Add mapping to toggle relative/absolute numbering --- .vimrc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.vimrc b/.vimrc index eb214fe1..5d5e517c 100644 --- a/.vimrc +++ b/.vimrc @@ -92,6 +92,7 @@ nnoremap ` ' " Clear search highlights nmap n :silent :nohlsearch + " Toggle visible whitespace nmap s :set list! @@ -116,6 +117,17 @@ nmap gp :Git push nnoremap u :GundoToggle +" Toggle relative/absolute numbers +function! NumberToggle() + if(&relativenumber == 1) + set number + else + set relativenumber + endif +endfunc + +nnoremap :call NumberToggle() + " Custom commands command! W :w -- cgit 1.4.1 From 7425f9476ef327d1ba1699557881ab4f3fed5a99 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 2 Feb 2012 22:47:59 -0500 Subject: Update itchy.vim --- bundle/itchy.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/itchy.vim b/bundle/itchy.vim index 94a1d0cd..10218ccb 160000 --- a/bundle/itchy.vim +++ b/bundle/itchy.vim @@ -1 +1 @@ -Subproject commit 94a1d0cddc22b266766bc29e52841920bcd2aefc +Subproject commit 10218ccbc687a5d0db42a29ddb6ae9ed0f89cb8e -- cgit 1.4.1 From e9cdad9e4491a15afb206d71785e4567fde3abee Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 5 Feb 2012 18:34:13 -0500 Subject: Update jellybeans --- bundle/jellybeans.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/jellybeans.vim b/bundle/jellybeans.vim index e40227c0..2c306097 160000 --- a/bundle/jellybeans.vim +++ b/bundle/jellybeans.vim @@ -1 +1 @@ -Subproject commit e40227c0c05c1de05352aabd99e76f65ae18def8 +Subproject commit 2c306097f8320286ae26fd9e45b9c0a8911ec210 -- cgit 1.4.1 From 1ef3b1e665c96e6cfb43595628f36740f0061dd9 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 7 Feb 2012 21:36:49 -0500 Subject: Add back set nocompatible, even though it seemed to end up set anyway --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index 5d5e517c..1327ef2b 100644 --- a/.vimrc +++ b/.vimrc @@ -1,3 +1,5 @@ +set nocp " No child-porn here :P + " Load pathogen runtime bundle/vim-pathogen/autoload/pathogen.vim call pathogen#infect() -- cgit 1.4.1 From 4c94d0eae4bd91f9cc6f48e21d05add502d540f1 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 7 Feb 2012 21:39:03 -0500 Subject: Add Solarized colorscheme --- .gitmodules | 3 +++ bundle/vim-colors-solarized | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/vim-colors-solarized diff --git a/.gitmodules b/.gitmodules index eb2046aa..00195c73 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,6 @@ [submodule "bundle/itchy.vim"] path = bundle/itchy.vim url = git://github.com/programble/itchy.vim.git +[submodule "bundle/vim-colors-solarized"] + path = bundle/vim-colors-solarized + url = https://github.com/altercation/vim-colors-solarized.git diff --git a/bundle/vim-colors-solarized b/bundle/vim-colors-solarized new file mode 160000 index 00000000..528a59f2 --- /dev/null +++ b/bundle/vim-colors-solarized @@ -0,0 +1 @@ +Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21 -- cgit 1.4.1 From 5ff07f7a4a7ae81b867294c4c7ae826af5f786c5 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 7 Feb 2012 21:50:04 -0500 Subject: Update Powerline to 'develop' branch --- bundle/vim-powerline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/vim-powerline b/bundle/vim-powerline index f2acebb7..ca8b897f 160000 --- a/bundle/vim-powerline +++ b/bundle/vim-powerline @@ -1 +1 @@ -Subproject commit f2acebb789583367c39a6c665e6caed5fc2b7b72 +Subproject commit ca8b897f67e8e15cf39a308ca012c5a53929d10d -- cgit 1.4.1 From fbc95a96feb80c96fc2c7f5e22afb755275f2461 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 11 Feb 2012 12:12:30 -0500 Subject: Customize C/C++ indentation --- .vimrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.vimrc b/.vimrc index 1327ef2b..d174d9f9 100644 --- a/.vimrc +++ b/.vimrc @@ -66,6 +66,12 @@ autocmd FileType c setlocal sw=4 autocmd FileType cpp setlocal sw=4 autocmd FileType lua setlocal sw=4 +" C/C++ indent options +" :0 Align case with switch +" l1 Indent case bodies with braces to case +" g0 Align "public:" and friends to class +set cinoptions=:0,l1,g0 + " Better tab-complete when opening set wildmenu set wildmode=list:longest -- cgit 1.4.1 From 6ef58966d73b56b70b4afb0d1d3207863352eafb Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Mon, 13 Feb 2012 01:44:56 -0500 Subject: Add badwolf colorscheme --- .gitmodules | 3 +++ bundle/badwolf | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/badwolf diff --git a/.gitmodules b/.gitmodules index 00195c73..e94b814b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "bundle/vim-colors-solarized"] path = bundle/vim-colors-solarized url = https://github.com/altercation/vim-colors-solarized.git +[submodule "bundle/badwolf"] + path = bundle/badwolf + url = https://github.com/sjl/badwolf.git diff --git a/bundle/badwolf b/bundle/badwolf new file mode 160000 index 00000000..4337437d --- /dev/null +++ b/bundle/badwolf @@ -0,0 +1 @@ +Subproject commit 4337437dc0a40a02be78911dc6bf6fee5129bb1f -- cgit 1.4.1 From 760343c28cf9299971d7fd74ab7e861880d02e13 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 25 Feb 2012 13:38:34 -0500 Subject: Add ,z mapping to toggle spell --- .vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index d174d9f9..ae54f43b 100644 --- a/.vimrc +++ b/.vimrc @@ -101,9 +101,10 @@ nnoremap ` ' " Clear search highlights nmap n :silent :nohlsearch -" Toggle visible whitespace nmap s :set list! +nmap z :set spell! + nmap p "+p nmap P "+P nmap y "+y -- cgit 1.4.1 From 60a5e0bf1fdf0c39ee01d0eff387a1da9dc8980f Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 29 Feb 2012 15:25:21 -0500 Subject: Add shiftround option --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index ae54f43b..4c531bc5 100644 --- a/.vimrc +++ b/.vimrc @@ -59,6 +59,7 @@ au BufReadPost * if &filetype !~ '^git\c' && line("'\"") > 0 && line("'\"") <= l set expandtab set shiftwidth=2 set tabstop=4 +set shiftround filetype plugin indent on " Indentation exceptions -- cgit 1.4.1 From 982f529efea53859a3b5eca6b68bc81f9cd2cb5c Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 29 Feb 2012 15:25:30 -0500 Subject: Update Powerline --- bundle/vim-powerline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/vim-powerline b/bundle/vim-powerline index ca8b897f..2bf4f2ff 160000 --- a/bundle/vim-powerline +++ b/bundle/vim-powerline @@ -1 +1 @@ -Subproject commit ca8b897f67e8e15cf39a308ca012c5a53929d10d +Subproject commit 2bf4f2ffca1892fe3a1be8388f0f11d59e187802 -- cgit 1.4.1 From f7bedcbc8381fb68ee8b43bb1d9f06c82f07d842 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 2 Mar 2012 14:41:15 -0500 Subject: Update Vim-Tomorrow-Theme --- bundle/Vim-Tomorrow-Theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/Vim-Tomorrow-Theme b/bundle/Vim-Tomorrow-Theme index 9a9beed3..022e15d0 160000 --- a/bundle/Vim-Tomorrow-Theme +++ b/bundle/Vim-Tomorrow-Theme @@ -1 +1 @@ -Subproject commit 9a9beed332923fa1275d61748270763177d46af2 +Subproject commit 022e15d0265d590f3da5894490dbc7b173b0c4c9 -- cgit 1.4.1 From 658ef424ed6c88ec234ac0ea8957fbde9e5e95d3 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 3 Mar 2012 23:04:30 -0500 Subject: Update Vim-Tomorrow-Theme --- bundle/Vim-Tomorrow-Theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/Vim-Tomorrow-Theme b/bundle/Vim-Tomorrow-Theme index 022e15d0..1e0c2ab5 160000 --- a/bundle/Vim-Tomorrow-Theme +++ b/bundle/Vim-Tomorrow-Theme @@ -1 +1 @@ -Subproject commit 022e15d0265d590f3da5894490dbc7b173b0c4c9 +Subproject commit 1e0c2ab5d5a82d7adecbc84f689abcf217bd1b50 -- cgit 1.4.1 From 36e4a987bb63b3b53d8e623257a6fea96dc6da5d Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 11 Mar 2012 17:24:49 -0400 Subject: Rebind Y to y$ for more consistent behaviour --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index 4c531bc5..3314dfe0 100644 --- a/.vimrc +++ b/.vimrc @@ -113,6 +113,8 @@ nmap Y "+Y nmap d "+d nmap D "+D +nmap Y y$ + " Insert hard tab imap -- cgit 1.4.1 From 225555fdf72a75686dfd2435969c6d94d26e8e92 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 30 Mar 2012 15:25:30 -0400 Subject: Add vim-smartinput --- .gitmodules | 3 +++ bundle/vim-smartinput | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/vim-smartinput diff --git a/.gitmodules b/.gitmodules index e94b814b..0c6f84fc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,3 +61,6 @@ [submodule "bundle/badwolf"] path = bundle/badwolf url = https://github.com/sjl/badwolf.git +[submodule "bundle/vim-smartinput"] + path = bundle/vim-smartinput + url = https://github.com/kana/vim-smartinput.git diff --git a/bundle/vim-smartinput b/bundle/vim-smartinput new file mode 160000 index 00000000..c01d81a6 --- /dev/null +++ b/bundle/vim-smartinput @@ -0,0 +1 @@ +Subproject commit c01d81a697de5e28452f32762a9c8fbe3eac0496 -- cgit 1.4.1 From 5534e2aff8fda984d7f3a7588888627f945964d2 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 1 Apr 2012 00:47:20 -0400 Subject: Update vim-smartinput --- bundle/vim-smartinput | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/vim-smartinput b/bundle/vim-smartinput index c01d81a6..66af777e 160000 --- a/bundle/vim-smartinput +++ b/bundle/vim-smartinput @@ -1 +1 @@ -Subproject commit c01d81a697de5e28452f32762a9c8fbe3eac0496 +Subproject commit 66af777e17383523c6b883456d4f30b355609a44 -- cgit 1.4.1 From e3a1004417a6c8442dce77018e512df7a823da5a Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 7 Apr 2012 15:01:27 -0400 Subject: Remove Itchy startup --- .vimrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/.vimrc b/.vimrc index 3314dfe0..e35db89d 100644 --- a/.vimrc +++ b/.vimrc @@ -90,9 +90,6 @@ let g:syntastic_check_on_open=1 let g:syntastic_enable_signs=0 let g:syntastic_auto_loc_list=2 -" Itchy options -let g:itchy_startup = 1 - " Custom maps let g:buffergator_suppress_keymaps=1 -- cgit 1.4.1 From 09441c763ca5a7700b0c1ba373bddfd26f555a33 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 5 May 2012 01:35:15 -0400 Subject: Update gist-vim --- bundle/gist-vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/gist-vim b/bundle/gist-vim index 948266a5..6682b11f 160000 --- a/bundle/gist-vim +++ b/bundle/gist-vim @@ -1 +1 @@ -Subproject commit 948266a54fd90473d7fbbbf663d5ddfa6d6d1158 +Subproject commit 6682b11f36d65dc4cb39f8c802922d40a5746be6 -- cgit 1.4.1 From 684e23791e70a229c479eee8649c1ad1801cf790 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 5 May 2012 01:39:15 -0400 Subject: Add webapi-vim --- .gitmodules | 3 +++ bundle/webapi-vim | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/webapi-vim diff --git a/.gitmodules b/.gitmodules index 0c6f84fc..fc44cff8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -64,3 +64,6 @@ [submodule "bundle/vim-smartinput"] path = bundle/vim-smartinput url = https://github.com/kana/vim-smartinput.git +[submodule "bundle/webapi-vim"] + path = bundle/webapi-vim + url = https://github.com/mattn/webapi-vim.git diff --git a/bundle/webapi-vim b/bundle/webapi-vim new file mode 160000 index 00000000..496032d3 --- /dev/null +++ b/bundle/webapi-vim @@ -0,0 +1 @@ +Subproject commit 496032d37f57d896b9f156df4de30a3990e7179d -- cgit 1.4.1 From 180c9b1d32bb008dca891b19b72ae73f39836aba Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 6 May 2012 15:11:39 -0400 Subject: Update ALL THE THINGS --- bundle/badwolf | 2 +- bundle/ctrlp.vim | 2 +- bundle/gist-vim | 2 +- bundle/gundo.vim | 2 +- bundle/nerdtree | 2 +- bundle/quicktask | 2 +- bundle/syntastic | 2 +- bundle/tabular | 2 +- bundle/vim-buffergator | 2 +- bundle/vim-fugitive | 2 +- bundle/vim-markdown | 2 +- bundle/vim-pasta | 2 +- bundle/vim-pathogen | 2 +- bundle/vim-powerline | 2 +- bundle/vim-smartinput | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bundle/badwolf b/bundle/badwolf index 4337437d..01f4915d 160000 --- a/bundle/badwolf +++ b/bundle/badwolf @@ -1 +1 @@ -Subproject commit 4337437dc0a40a02be78911dc6bf6fee5129bb1f +Subproject commit 01f4915dda1b09d8eaab766c685d8f8737466e19 diff --git a/bundle/ctrlp.vim b/bundle/ctrlp.vim index a13d90fd..80bc9cea 160000 --- a/bundle/ctrlp.vim +++ b/bundle/ctrlp.vim @@ -1 +1 @@ -Subproject commit a13d90fd2a62fcb91286e7237b182a2687237c60 +Subproject commit 80bc9cea8cc435c9aa9d5ad20b768bb420e4686e diff --git a/bundle/gist-vim b/bundle/gist-vim index 6682b11f..fa65a4d8 160000 --- a/bundle/gist-vim +++ b/bundle/gist-vim @@ -1 +1 @@ -Subproject commit 6682b11f36d65dc4cb39f8c802922d40a5746be6 +Subproject commit fa65a4d8d652cb0bcca5a37ac5971ea82f905769 diff --git a/bundle/gundo.vim b/bundle/gundo.vim index 50092711..7198c51b 160000 --- a/bundle/gundo.vim +++ b/bundle/gundo.vim @@ -1 +1 @@ -Subproject commit 50092711ff831742cece76f3322674858863e3f3 +Subproject commit 7198c51b5d2b145b5ca4899fda8397e7f68efa77 diff --git a/bundle/nerdtree b/bundle/nerdtree index eced5f98..2cb0fc78 160000 --- a/bundle/nerdtree +++ b/bundle/nerdtree @@ -1 +1 @@ -Subproject commit eced5f98a0724cd6498b70024b3edec1e7b29b2e +Subproject commit 2cb0fc78fb4c7a1db5f51c042a447cc50f09983d diff --git a/bundle/quicktask b/bundle/quicktask index 4669e57d..65bbdc27 160000 --- a/bundle/quicktask +++ b/bundle/quicktask @@ -1 +1 @@ -Subproject commit 4669e57d2b4d0d7170e0aca99c55c9c90e9f8bf6 +Subproject commit 65bbdc272903c3f71c55b533de2f6a2b6bf2a555 diff --git a/bundle/syntastic b/bundle/syntastic index fe5b8989..7fc5246b 160000 --- a/bundle/syntastic +++ b/bundle/syntastic @@ -1 +1 @@ -Subproject commit fe5b8989afa1859751acc34d9c0c6f8ccef44f6a +Subproject commit 7fc5246be4be9e1034e84266ae567a08e193f764 diff --git a/bundle/tabular b/bundle/tabular index b7b4d879..ad2a5a1d 160000 --- a/bundle/tabular +++ b/bundle/tabular @@ -1 +1 @@ -Subproject commit b7b4d8791a50013b56c2d68b6c5708c808203b54 +Subproject commit ad2a5a1d54443ab27f1282c5617f55b8e0819623 diff --git a/bundle/vim-buffergator b/bundle/vim-buffergator index c6f56eac..dc879d00 160000 --- a/bundle/vim-buffergator +++ b/bundle/vim-buffergator @@ -1 +1 @@ -Subproject commit c6f56eac74c9ae9301b640e9f5bb0389a8ffd4fa +Subproject commit dc879d00891af7c53242f44ec1b571ee19bd9016 diff --git a/bundle/vim-fugitive b/bundle/vim-fugitive index b4b75ef6..765c921e 160000 --- a/bundle/vim-fugitive +++ b/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit b4b75ef682da3e946c648d3634ade39d0af49aba +Subproject commit 765c921e1f0281963009b3e06a94227a8c0a2408 diff --git a/bundle/vim-markdown b/bundle/vim-markdown index fdc0f091..3a991574 160000 --- a/bundle/vim-markdown +++ b/bundle/vim-markdown @@ -1 +1 @@ -Subproject commit fdc0f091c78cd9a474ac3e3cf40ba7d6933ef9da +Subproject commit 3a99157473cb6508d1bc6f5980f928f27f52d65b diff --git a/bundle/vim-pasta b/bundle/vim-pasta index ada8a5cf..736e2df0 160000 --- a/bundle/vim-pasta +++ b/bundle/vim-pasta @@ -1 +1 @@ -Subproject commit ada8a5cf9a826db57cf98bde808384d351fd2897 +Subproject commit 736e2df09c11a623080e71150576e94fb700e8b8 diff --git a/bundle/vim-pathogen b/bundle/vim-pathogen index ab64b4dd..09f2c3b7 160000 --- a/bundle/vim-pathogen +++ b/bundle/vim-pathogen @@ -1 +1 @@ -Subproject commit ab64b4ddd0c184a528780b498a0b0a5b40248f7c +Subproject commit 09f2c3b7d3666124157de759a68afe47d0bb8d25 diff --git a/bundle/vim-powerline b/bundle/vim-powerline index 2bf4f2ff..65e54dde 160000 --- a/bundle/vim-powerline +++ b/bundle/vim-powerline @@ -1 +1 @@ -Subproject commit 2bf4f2ffca1892fe3a1be8388f0f11d59e187802 +Subproject commit 65e54dde89c73cae4cf089a83f5c26d605dda594 diff --git a/bundle/vim-smartinput b/bundle/vim-smartinput index 66af777e..78ab4b3d 160000 --- a/bundle/vim-smartinput +++ b/bundle/vim-smartinput @@ -1 +1 @@ -Subproject commit 66af777e17383523c6b883456d4f30b355609a44 +Subproject commit 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 -- cgit 1.4.1 From a96c19c8786ef89b0e4b79590fa46e97cef2153e Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 6 May 2012 15:15:28 -0400 Subject: Remove buffergator --- .gitmodules | 3 --- bundle/vim-buffergator | 1 - 2 files changed, 4 deletions(-) delete mode 160000 bundle/vim-buffergator diff --git a/.gitmodules b/.gitmodules index fc44cff8..f28f3a48 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,9 +19,6 @@ [submodule "bundle/nerdtree"] path = bundle/nerdtree url = https://github.com/scrooloose/nerdtree.git -[submodule "bundle/vim-buffergator"] - path = bundle/vim-buffergator - url = https://github.com/jeetsukumaran/vim-buffergator.git [submodule "bundle/gist-vim"] path = bundle/gist-vim url = https://github.com/mattn/gist-vim.git diff --git a/bundle/vim-buffergator b/bundle/vim-buffergator deleted file mode 160000 index dc879d00..00000000 --- a/bundle/vim-buffergator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dc879d00891af7c53242f44ec1b571ee19bd9016 -- cgit 1.4.1 From fa7631c27d50ab1c4d05e5c1491ea4ecc2f5b011 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 6 May 2012 17:07:00 -0400 Subject: Remove buffergator customization --- .vimrc | 2 -- 1 file changed, 2 deletions(-) diff --git a/.vimrc b/.vimrc index e35db89d..38671a1b 100644 --- a/.vimrc +++ b/.vimrc @@ -91,8 +91,6 @@ let g:syntastic_enable_signs=0 let g:syntastic_auto_loc_list=2 " Custom maps -let g:buffergator_suppress_keymaps=1 - nnoremap ' ` nnoremap ` ' -- cgit 1.4.1 From 826041e77954411fc3ec865fcd1bcf85a8679c0e Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 29 May 2012 22:16:44 -0400 Subject: Wrap text in Markdown files --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index 38671a1b..26ff7266 100644 --- a/.vimrc +++ b/.vimrc @@ -66,6 +66,7 @@ filetype plugin indent on autocmd FileType c setlocal sw=4 autocmd FileType cpp setlocal sw=4 autocmd FileType lua setlocal sw=4 +autocmd FileType markdown setlocal tw=72 " C/C++ indent options " :0 Align case with switch -- cgit 1.4.1 From 7dfda5f86daecd5beafb2930a20c70839af2bc57 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 22 Jun 2012 23:07:51 -0400 Subject: Remove vim-smartinput --- .gitmodules | 3 --- bundle/vim-smartinput | 1 - 2 files changed, 4 deletions(-) delete mode 160000 bundle/vim-smartinput diff --git a/.gitmodules b/.gitmodules index f28f3a48..93f68cbd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,9 +58,6 @@ [submodule "bundle/badwolf"] path = bundle/badwolf url = https://github.com/sjl/badwolf.git -[submodule "bundle/vim-smartinput"] - path = bundle/vim-smartinput - url = https://github.com/kana/vim-smartinput.git [submodule "bundle/webapi-vim"] path = bundle/webapi-vim url = https://github.com/mattn/webapi-vim.git diff --git a/bundle/vim-smartinput b/bundle/vim-smartinput deleted file mode 160000 index 78ab4b3d..00000000 --- a/bundle/vim-smartinput +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 -- cgit 1.4.1 From 46aac3adba742e737da5fafe8ac4c22489499bd9 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Mon, 2 Jul 2012 20:21:29 -0400 Subject: Update all the things --- bundle/badwolf | 2 +- bundle/ctrlp.vim | 2 +- bundle/gist-vim | 2 +- bundle/gundo.vim | 2 +- bundle/jellybeans.vim | 2 +- bundle/nerdtree | 2 +- bundle/quicktask | 2 +- bundle/syntastic | 2 +- bundle/vim-fugitive | 2 +- bundle/vim-markdown | 2 +- bundle/vim-powerline | 2 +- bundle/webapi-vim | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bundle/badwolf b/bundle/badwolf index 01f4915d..03ac89e0 160000 --- a/bundle/badwolf +++ b/bundle/badwolf @@ -1 +1 @@ -Subproject commit 01f4915dda1b09d8eaab766c685d8f8737466e19 +Subproject commit 03ac89e057224c9d3adf000960c62b3293d47ae0 diff --git a/bundle/ctrlp.vim b/bundle/ctrlp.vim index 80bc9cea..5885da54 160000 --- a/bundle/ctrlp.vim +++ b/bundle/ctrlp.vim @@ -1 +1 @@ -Subproject commit 80bc9cea8cc435c9aa9d5ad20b768bb420e4686e +Subproject commit 5885da54beba301be4f7b13f7556e97e570193e5 diff --git a/bundle/gist-vim b/bundle/gist-vim index fa65a4d8..3e02137a 160000 --- a/bundle/gist-vim +++ b/bundle/gist-vim @@ -1 +1 @@ -Subproject commit fa65a4d8d652cb0bcca5a37ac5971ea82f905769 +Subproject commit 3e02137acd8c9fd5235b9afeae8a7675296aef77 diff --git a/bundle/gundo.vim b/bundle/gundo.vim index 7198c51b..4c376a80 160000 --- a/bundle/gundo.vim +++ b/bundle/gundo.vim @@ -1 +1 @@ -Subproject commit 7198c51b5d2b145b5ca4899fda8397e7f68efa77 +Subproject commit 4c376a8061fa335228da420937ce385b847dd56a diff --git a/bundle/jellybeans.vim b/bundle/jellybeans.vim index 2c306097..2737231a 160000 --- a/bundle/jellybeans.vim +++ b/bundle/jellybeans.vim @@ -1 +1 @@ -Subproject commit 2c306097f8320286ae26fd9e45b9c0a8911ec210 +Subproject commit 2737231a45b02e54c53c1912ba06d7e77502cb46 diff --git a/bundle/nerdtree b/bundle/nerdtree index 2cb0fc78..dbeb1947 160000 --- a/bundle/nerdtree +++ b/bundle/nerdtree @@ -1 +1 @@ -Subproject commit 2cb0fc78fb4c7a1db5f51c042a447cc50f09983d +Subproject commit dbeb1947ea986d7cda460f12962cdef5196ef87d diff --git a/bundle/quicktask b/bundle/quicktask index 65bbdc27..cfcb73f8 160000 --- a/bundle/quicktask +++ b/bundle/quicktask @@ -1 +1 @@ -Subproject commit 65bbdc272903c3f71c55b533de2f6a2b6bf2a555 +Subproject commit cfcb73f8df3b7874e6da999aef3d85ba88e6395d diff --git a/bundle/syntastic b/bundle/syntastic index 7fc5246b..52992969 160000 --- a/bundle/syntastic +++ b/bundle/syntastic @@ -1 +1 @@ -Subproject commit 7fc5246be4be9e1034e84266ae567a08e193f764 +Subproject commit 529929691f88e4080548fe662ceff462ede34293 diff --git a/bundle/vim-fugitive b/bundle/vim-fugitive index 765c921e..3b278277 160000 --- a/bundle/vim-fugitive +++ b/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 765c921e1f0281963009b3e06a94227a8c0a2408 +Subproject commit 3b278277e0b46711c30a3d1a0083e527b2fb98ed diff --git a/bundle/vim-markdown b/bundle/vim-markdown index 3a991574..9a21f7a6 160000 --- a/bundle/vim-markdown +++ b/bundle/vim-markdown @@ -1 +1 @@ -Subproject commit 3a99157473cb6508d1bc6f5980f928f27f52d65b +Subproject commit 9a21f7a6bc7d5b5cd7a2e78b7893798a67526be8 diff --git a/bundle/vim-powerline b/bundle/vim-powerline index 65e54dde..7f53b5c3 160000 --- a/bundle/vim-powerline +++ b/bundle/vim-powerline @@ -1 +1 @@ -Subproject commit 65e54dde89c73cae4cf089a83f5c26d605dda594 +Subproject commit 7f53b5c3919bde9a4259d0c725d453ef2337a4ed diff --git a/bundle/webapi-vim b/bundle/webapi-vim index 496032d3..96835261 160000 --- a/bundle/webapi-vim +++ b/bundle/webapi-vim @@ -1 +1 @@ -Subproject commit 496032d37f57d896b9f156df4de30a3990e7179d +Subproject commit 968352613d3ea664d7896e7844670a2021ef2104 -- cgit 1.4.1 From 05d30890f75543d3fafe76709ab0064731099480 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 17 Jul 2012 15:18:17 -0400 Subject: Remove vim-space --- .gitmodules | 3 --- bundle/vim-space | 1 - 2 files changed, 4 deletions(-) delete mode 160000 bundle/vim-space diff --git a/.gitmodules b/.gitmodules index 93f68cbd..18fc1255 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,9 +40,6 @@ [submodule "bundle/gundo.vim"] path = bundle/gundo.vim url = http://github.com/sjl/gundo.vim.git -[submodule "bundle/vim-space"] - path = bundle/vim-space - url = https://github.com/spiiph/vim-space.git [submodule "bundle/tabular"] path = bundle/tabular url = https://github.com/godlygeek/tabular.git diff --git a/bundle/vim-space b/bundle/vim-space deleted file mode 160000 index 9440e388..00000000 --- a/bundle/vim-space +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9440e388cc75754ab7c58441f3ef965a70a411db -- cgit 1.4.1 From 1f7599cb5bf5bf81055e10e393643d2a78179228 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 11 Aug 2012 13:55:20 -0400 Subject: Condense indentation exceptions --- .vimrc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.vimrc b/.vimrc index 26ff7266..f5734333 100644 --- a/.vimrc +++ b/.vimrc @@ -63,9 +63,7 @@ set shiftround filetype plugin indent on " Indentation exceptions -autocmd FileType c setlocal sw=4 -autocmd FileType cpp setlocal sw=4 -autocmd FileType lua setlocal sw=4 +autocmd FileType c,cpp,lua setlocal sw=4 autocmd FileType markdown setlocal tw=72 " C/C++ indent options -- cgit 1.4.1 From d1630c259ee102df7d4fe78cecb3cc1058b9a74c Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 11 Aug 2012 18:39:10 -0400 Subject: Add VimClojure --- .gitmodules | 3 +++ bundle/VimClojure | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/VimClojure diff --git a/.gitmodules b/.gitmodules index 18fc1255..f7d5b240 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "bundle/webapi-vim"] path = bundle/webapi-vim url = https://github.com/mattn/webapi-vim.git +[submodule "bundle/VimClojure"] + path = bundle/VimClojure + url = https://github.com/vim-scripts/VimClojure.git diff --git a/bundle/VimClojure b/bundle/VimClojure new file mode 160000 index 00000000..da2683b9 --- /dev/null +++ b/bundle/VimClojure @@ -0,0 +1 @@ +Subproject commit da2683b9069e01c133f0c0129386fd6dc053019c -- cgit 1.4.1 From 9ca8cbced05b089f8834cc585bae38ec5d643c13 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 12 Aug 2012 16:42:35 -0400 Subject: Add refheap.vim --- .gitmodules | 3 +++ bundle/refheap.vim | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/refheap.vim diff --git a/.gitmodules b/.gitmodules index f7d5b240..92f2b4e3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,3 +61,6 @@ [submodule "bundle/VimClojure"] path = bundle/VimClojure url = https://github.com/vim-scripts/VimClojure.git +[submodule "bundle/refheap.vim"] + path = bundle/refheap.vim + url = https://github.com/Raynes/refheap.vim.git diff --git a/bundle/refheap.vim b/bundle/refheap.vim new file mode 160000 index 00000000..2da521ad --- /dev/null +++ b/bundle/refheap.vim @@ -0,0 +1 @@ +Subproject commit 2da521ad0c4b722e3064873dc19c103d6b82c16e -- cgit 1.4.1 From 0de68fab2bfcdbe4396fe060fd82efe1eb69e266 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 12 Aug 2012 16:43:24 -0400 Subject: Update itchy.vim --- bundle/itchy.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/itchy.vim b/bundle/itchy.vim index 10218ccb..48badd9c 160000 --- a/bundle/itchy.vim +++ b/bundle/itchy.vim @@ -1 +1 @@ -Subproject commit 10218ccbc687a5d0db42a29ddb6ae9ed0f89cb8e +Subproject commit 48badd9cf60664d51ee403e62ddfb6340642a803 -- cgit 1.4.1 From 636156253cfdba21a6e9b8a67adabfa98a142097 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 17 Aug 2012 14:36:15 -0400 Subject: Update itchy.vim --- bundle/itchy.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/itchy.vim b/bundle/itchy.vim index 48badd9c..13bf38ff 160000 --- a/bundle/itchy.vim +++ b/bundle/itchy.vim @@ -1 +1 @@ -Subproject commit 48badd9cf60664d51ee403e62ddfb6340642a803 +Subproject commit 13bf38ff895f7c32befb78b9505c478b77545329 -- cgit 1.4.1 From 36e14540df32903eb0d35bfb96b66d05f1a18060 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 31 Aug 2012 15:35:21 -0400 Subject: Add base16-vim --- .gitmodules | 3 +++ bundle/base16-vim | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/base16-vim diff --git a/.gitmodules b/.gitmodules index 92f2b4e3..8d1af4f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -64,3 +64,6 @@ [submodule "bundle/refheap.vim"] path = bundle/refheap.vim url = https://github.com/Raynes/refheap.vim.git +[submodule "bundle/base16-vim"] + path = bundle/base16-vim + url = https://github.com/chriskempson/base16-vim.git diff --git a/bundle/base16-vim b/bundle/base16-vim new file mode 160000 index 00000000..9fe14738 --- /dev/null +++ b/bundle/base16-vim @@ -0,0 +1 @@ +Subproject commit 9fe14738c039f7f3f93aa5301e4e574690cc560d -- cgit 1.4.1 From 4f9083a0c512d05b8dd6837c9025aeaa31070119 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 31 Aug 2012 15:35:59 -0400 Subject: Ignore .netrwhist --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..a0e76af9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.netrwhist -- cgit 1.4.1 From 7c8ec02029c83c70302ec4e017dadbd8adf3ee93 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 29 Sep 2012 11:38:28 -0400 Subject: Disable GUI dialogs --- .vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index f5734333..72b63d23 100644 --- a/.vimrc +++ b/.vimrc @@ -46,7 +46,8 @@ if has('mouse') endif " GUI options -set guioptions-=mrLtT " Disable tear-off menus, toolbar, scrollbars +set guioptions-=mrLtT " Disable menus, toolbar, scrollbars +set guioptions+=c " Disable GUI dialogs set guifont=Monospace\ 9 set browsedir=buffer " Open dialog starts in working directory let g:Powerline_symbols = 'fancy' -- cgit 1.4.1 From 4159b83c94304d1d82a4edb05ad300c5aa9cb74d Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 3 Feb 2013 23:06:41 -0500 Subject: Ignore plugin/private.vim --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a0e76af9..532147d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .netrwhist +plugin/private.vim -- cgit 1.4.1 From 0553a42e0413ba55ebd41b828af91182b9b7fdef Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 3 Feb 2013 23:08:19 -0500 Subject: Update base16 and refheap --- bundle/base16-vim | 2 +- bundle/refheap.vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/base16-vim b/bundle/base16-vim index 9fe14738..395403d9 160000 --- a/bundle/base16-vim +++ b/bundle/base16-vim @@ -1 +1 @@ -Subproject commit 9fe14738c039f7f3f93aa5301e4e574690cc560d +Subproject commit 395403d92fbf5f79a7f90d07f083ed238dc92f25 diff --git a/bundle/refheap.vim b/bundle/refheap.vim index 2da521ad..0780087c 160000 --- a/bundle/refheap.vim +++ b/bundle/refheap.vim @@ -1 +1 @@ -Subproject commit 2da521ad0c4b722e3064873dc19c103d6b82c16e +Subproject commit 0780087c5894df5cb89381dbac224c4604112b47 -- cgit 1.4.1 From f4c9177604d2f4d069d905330e79881a07153151 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 12 Mar 2013 17:40:48 -0400 Subject: Remove vim-powerline --- .gitmodules | 3 --- bundle/vim-powerline | 1 - 2 files changed, 4 deletions(-) delete mode 160000 bundle/vim-powerline diff --git a/.gitmodules b/.gitmodules index 8d1af4f1..20d70b82 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,9 +28,6 @@ [submodule "bundle/quicktask"] path = bundle/quicktask url = https://github.com/aaronbieber/quicktask.git -[submodule "bundle/vim-powerline"] - path = bundle/vim-powerline - url = https://github.com/Lokaltog/vim-powerline.git [submodule "bundle/syntastic"] path = bundle/syntastic url = https://github.com/scrooloose/syntastic.git diff --git a/bundle/vim-powerline b/bundle/vim-powerline deleted file mode 160000 index 7f53b5c3..00000000 --- a/bundle/vim-powerline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7f53b5c3919bde9a4259d0c725d453ef2337a4ed -- cgit 1.4.1 From 4ad48b2e02f084f7aa1cabbfc0aaa706125f16b2 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 12 Mar 2013 18:10:03 -0400 Subject: Switch to powerline Which I'm not going to bother configuring because it thinks it's all fancy and for other things that aren't Vim so it stores its config file in ~/.config which I keep in a different repo and I only want to use it for Vim so fuck you, Powerline. --- .gitmodules | 3 +++ .vimrc | 6 ++++-- bundle/powerline | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) create mode 160000 bundle/powerline diff --git a/.gitmodules b/.gitmodules index 20d70b82..159a24ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -64,3 +64,6 @@ [submodule "bundle/base16-vim"] path = bundle/base16-vim url = https://github.com/chriskempson/base16-vim.git +[submodule "bundle/powerline"] + path = bundle/powerline + url = https://github.com/Lokaltog/powerline.git diff --git a/.vimrc b/.vimrc index 72b63d23..7177f401 100644 --- a/.vimrc +++ b/.vimrc @@ -1,9 +1,12 @@ -set nocp " No child-porn here :P +set nocp " Load pathogen runtime bundle/vim-pathogen/autoload/pathogen.vim call pathogen#infect() +" Load powerline +set rtp+=~/.vim/bundle/powerline/powerline/bindings/vim + " Remap leader to , noremap \ , let mapleader = "," @@ -50,7 +53,6 @@ set guioptions-=mrLtT " Disable menus, toolbar, scrollbars set guioptions+=c " Disable GUI dialogs set guifont=Monospace\ 9 set browsedir=buffer " Open dialog starts in working directory -let g:Powerline_symbols = 'fancy' " Jump to the last cursor position when opening au BufReadPost * if &filetype !~ '^git\c' && line("'\"") > 0 && line("'\"") <= line("$") diff --git a/bundle/powerline b/bundle/powerline new file mode 160000 index 00000000..0a5a09db --- /dev/null +++ b/bundle/powerline @@ -0,0 +1 @@ +Subproject commit 0a5a09db122e483d4c0ea4b8a5869343a1e4955d -- cgit 1.4.1 From 155785e260f50686fe786738b4379d9c77b47f75 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 12 Mar 2013 18:22:02 -0400 Subject: Hide mode from below statusline --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index 7177f401..8673a644 100644 --- a/.vimrc +++ b/.vimrc @@ -38,6 +38,7 @@ set foldmethod=syntax set foldlevel=1000 set laststatus=2 " Always show statusline +set noshowmode set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P syntax on -- cgit 1.4.1 From ee7120c1533c3ef40f26f5ec9c3529feb013faaa Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 14 Mar 2013 00:00:05 -0400 Subject: Update base16-vim It's still crap --- bundle/base16-vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/base16-vim b/bundle/base16-vim index 395403d9..88144b62 160000 --- a/bundle/base16-vim +++ b/bundle/base16-vim @@ -1 +1 @@ -Subproject commit 395403d92fbf5f79a7f90d07f083ed238dc92f25 +Subproject commit 88144b6205969158dfb4802e3050979b35bccdb2 -- cgit 1.4.1 From 5a23d2dcb6e421cfe553c91e1db96f43a871c4c0 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 24 Mar 2013 14:08:11 -0400 Subject: Add paredit.vim --- .gitmodules | 3 +++ bundle/paredit.vim | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/paredit.vim diff --git a/.gitmodules b/.gitmodules index 159a24ab..526c0e20 100644 --- a/.gitmodules +++ b/.gitmodules @@ -67,3 +67,6 @@ [submodule "bundle/powerline"] path = bundle/powerline url = https://github.com/Lokaltog/powerline.git +[submodule "bundle/paredit.vim"] + path = bundle/paredit.vim + url = https://github.com/vim-scripts/paredit.vim.git diff --git a/bundle/paredit.vim b/bundle/paredit.vim new file mode 160000 index 00000000..a8b5c979 --- /dev/null +++ b/bundle/paredit.vim @@ -0,0 +1 @@ +Subproject commit a8b5c979653931ef28794ce6978a185fc263bdb5 -- cgit 1.4.1 From 6a41f4a720d8799c995dc4ffc7bcc7c4067c1244 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 26 Mar 2013 20:39:37 -0400 Subject: Replace nerdcommenter with vim-commentary --- .gitmodules | 6 +++--- bundle/nerdcommenter | 1 - bundle/vim-commentary | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 160000 bundle/nerdcommenter create mode 160000 bundle/vim-commentary diff --git a/.gitmodules b/.gitmodules index 526c0e20..912ff471 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,9 +13,6 @@ [submodule "bundle/vim-fugitive"] path = bundle/vim-fugitive url = https://github.com/tpope/vim-fugitive.git -[submodule "bundle/nerdcommenter"] - path = bundle/nerdcommenter - url = https://github.com/ddollar/nerdcommenter.git [submodule "bundle/nerdtree"] path = bundle/nerdtree url = https://github.com/scrooloose/nerdtree.git @@ -70,3 +67,6 @@ [submodule "bundle/paredit.vim"] path = bundle/paredit.vim url = https://github.com/vim-scripts/paredit.vim.git +[submodule "bundle/vim-commentary"] + path = bundle/vim-commentary + url = https://github.com/tpope/vim-commentary.git diff --git a/bundle/nerdcommenter b/bundle/nerdcommenter deleted file mode 160000 index 093e6b3f..00000000 --- a/bundle/nerdcommenter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 093e6b3f765b728c129a4271f1f34bb70e671f08 diff --git a/bundle/vim-commentary b/bundle/vim-commentary new file mode 160000 index 00000000..a3ae0df1 --- /dev/null +++ b/bundle/vim-commentary @@ -0,0 +1 @@ +Subproject commit a3ae0df1d9e13941e9e8086637055841ce93f7bd -- cgit 1.4.1 From 817705efdf2224531e3ec848e09ca6e460098cef Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 23 Apr 2013 17:52:57 -0400 Subject: Switch to base16-default colorscheme --- .vimrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 8673a644..653459f0 100644 --- a/.vimrc +++ b/.vimrc @@ -42,7 +42,9 @@ set noshowmode set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P syntax on -colorscheme Tomorrow-Night +set background=dark +"let base16colorspace=256 +colorscheme base16-default " Enable mouse in terminals if has('mouse') -- cgit 1.4.1 From a323be60359bf2dc3ade7d2e52556306f0c5eb1f Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Tue, 23 Apr 2013 18:03:06 -0400 Subject: Remove unused plugins --- .gitmodules | 15 --------------- bundle/badwolf | 1 - bundle/jellybeans.vim | 1 - bundle/paredit.vim | 1 - bundle/quicktask | 1 - bundle/vim-colors-solarized | 1 - 6 files changed, 20 deletions(-) delete mode 160000 bundle/badwolf delete mode 160000 bundle/jellybeans.vim delete mode 160000 bundle/paredit.vim delete mode 160000 bundle/quicktask delete mode 160000 bundle/vim-colors-solarized diff --git a/.gitmodules b/.gitmodules index 912ff471..87873438 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,15 +22,9 @@ [submodule "bundle/ooc.vim"] path = bundle/ooc.vim url = git://github.com/programble/ooc.vim.git -[submodule "bundle/quicktask"] - path = bundle/quicktask - url = https://github.com/aaronbieber/quicktask.git [submodule "bundle/syntastic"] path = bundle/syntastic url = https://github.com/scrooloose/syntastic.git -[submodule "bundle/jellybeans.vim"] - path = bundle/jellybeans.vim - url = https://github.com/nanotech/jellybeans.vim.git [submodule "bundle/gundo.vim"] path = bundle/gundo.vim url = http://github.com/sjl/gundo.vim.git @@ -43,12 +37,6 @@ [submodule "bundle/itchy.vim"] path = bundle/itchy.vim url = git://github.com/programble/itchy.vim.git -[submodule "bundle/vim-colors-solarized"] - path = bundle/vim-colors-solarized - url = https://github.com/altercation/vim-colors-solarized.git -[submodule "bundle/badwolf"] - path = bundle/badwolf - url = https://github.com/sjl/badwolf.git [submodule "bundle/webapi-vim"] path = bundle/webapi-vim url = https://github.com/mattn/webapi-vim.git @@ -64,9 +52,6 @@ [submodule "bundle/powerline"] path = bundle/powerline url = https://github.com/Lokaltog/powerline.git -[submodule "bundle/paredit.vim"] - path = bundle/paredit.vim - url = https://github.com/vim-scripts/paredit.vim.git [submodule "bundle/vim-commentary"] path = bundle/vim-commentary url = https://github.com/tpope/vim-commentary.git diff --git a/bundle/badwolf b/bundle/badwolf deleted file mode 160000 index 03ac89e0..00000000 --- a/bundle/badwolf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 03ac89e057224c9d3adf000960c62b3293d47ae0 diff --git a/bundle/jellybeans.vim b/bundle/jellybeans.vim deleted file mode 160000 index 2737231a..00000000 --- a/bundle/jellybeans.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2737231a45b02e54c53c1912ba06d7e77502cb46 diff --git a/bundle/paredit.vim b/bundle/paredit.vim deleted file mode 160000 index a8b5c979..00000000 --- a/bundle/paredit.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a8b5c979653931ef28794ce6978a185fc263bdb5 diff --git a/bundle/quicktask b/bundle/quicktask deleted file mode 160000 index cfcb73f8..00000000 --- a/bundle/quicktask +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cfcb73f8df3b7874e6da999aef3d85ba88e6395d diff --git a/bundle/vim-colors-solarized b/bundle/vim-colors-solarized deleted file mode 160000 index 528a59f2..00000000 --- a/bundle/vim-colors-solarized +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21 -- cgit 1.4.1 From a961e6642de516003cba782c1db75ec9bfca31bb Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 15 May 2013 16:23:17 -0400 Subject: Add vim-gitgutter --- .gitmodules | 3 +++ .vimrc | 27 +++++++++++++++------------ bundle/vim-gitgutter | 1 + 3 files changed, 19 insertions(+), 12 deletions(-) create mode 160000 bundle/vim-gitgutter diff --git a/.gitmodules b/.gitmodules index 87873438..e7e9439c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,6 @@ [submodule "bundle/vim-commentary"] path = bundle/vim-commentary url = https://github.com/tpope/vim-commentary.git +[submodule "bundle/vim-gitgutter"] + path = bundle/vim-gitgutter + url = https://github.com/airblade/vim-gitgutter.git diff --git a/.vimrc b/.vimrc index 653459f0..efda8070 100644 --- a/.vimrc +++ b/.vimrc @@ -99,12 +99,11 @@ let g:syntastic_auto_loc_list=2 nnoremap ' ` nnoremap ` ' -" Clear search highlights -nmap n :silent :nohlsearch +nmap n :nohlsearch -nmap s :set list! +nmap s :set list! -nmap z :set spell! +nmap z :set spell! nmap p "+p nmap P "+P @@ -116,18 +115,22 @@ nmap D "+D nmap Y y$ " Insert hard tab -imap +imap nmap Q gq -nmap b :CtrlPBuffer -nmap e :CtrlP +nmap b :CtrlPBuffer +nmap e :CtrlP -nmap gs :Gstatus -nmap gc :Gcommit -nmap gp :Git push +nmap gs :Gstatus +nmap gc :Gcommit +nmap gp :Git push -nnoremap u :GundoToggle +nmap gg :GitGutterToggle +nmap gh GitGutterNextHunk +nmap gH GitGutterPrevHunk + +nmap u :GundoToggle " Toggle relative/absolute numbers function! NumberToggle() @@ -138,7 +141,7 @@ function! NumberToggle() endif endfunc -nnoremap :call NumberToggle() +nmap :call NumberToggle() " Custom commands command! W :w diff --git a/bundle/vim-gitgutter b/bundle/vim-gitgutter new file mode 160000 index 00000000..ff031d02 --- /dev/null +++ b/bundle/vim-gitgutter @@ -0,0 +1 @@ +Subproject commit ff031d022f2123353bc93a3aa97290287c10a287 -- cgit 1.4.1 From 32c01b54a7deb7570ebe2d2266fc040b88fb8c9d Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 15 May 2013 16:42:20 -0400 Subject: Use long names for all settings --- .vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vimrc b/.vimrc index efda8070..d06533cf 100644 --- a/.vimrc +++ b/.vimrc @@ -23,9 +23,9 @@ set ignorecase set smartcase set autoindent set smartindent -set nu +set number set spell -set cc=80 +set colorcolumn=80 set title set shortmess=atI set visualbell t_vb= -- cgit 1.4.1 From cf58cda9ff4972e700ad2d3c114d4d17f57360cc Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Wed, 15 May 2013 16:55:37 -0400 Subject: Remove tabular --- .gitmodules | 3 --- bundle/tabular | 1 - 2 files changed, 4 deletions(-) delete mode 160000 bundle/tabular diff --git a/.gitmodules b/.gitmodules index e7e9439c..0904cec5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,9 +28,6 @@ [submodule "bundle/gundo.vim"] path = bundle/gundo.vim url = http://github.com/sjl/gundo.vim.git -[submodule "bundle/tabular"] - path = bundle/tabular - url = https://github.com/godlygeek/tabular.git [submodule "bundle/vim-markdown"] path = bundle/vim-markdown url = https://github.com/tpope/vim-markdown.git diff --git a/bundle/tabular b/bundle/tabular deleted file mode 160000 index ad2a5a1d..00000000 --- a/bundle/tabular +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ad2a5a1d54443ab27f1282c5617f55b8e0819623 -- cgit 1.4.1 From 73e1c8db12da192815355010d74407c0e1738419 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 18 May 2013 14:30:59 -0400 Subject: Do not run gitgutter eagerly --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index d06533cf..f0ea487f 100644 --- a/.vimrc +++ b/.vimrc @@ -95,6 +95,8 @@ let g:syntastic_check_on_open=1 let g:syntastic_enable_signs=0 let g:syntastic_auto_loc_list=2 +let g:gitgutter_eager = 0 + " Custom maps nnoremap ' ` nnoremap ` ' -- cgit 1.4.1 From 1d08a6a6a3a4860702a5a14489242120b6703211 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 23 May 2013 15:36:29 -0400 Subject: Replace VimClojure with vim-clojure-static --- .gitmodules | 6 +++--- bundle/VimClojure | 1 - bundle/vim-clojure-static | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 160000 bundle/VimClojure create mode 160000 bundle/vim-clojure-static diff --git a/.gitmodules b/.gitmodules index 0904cec5..9324cb0b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,9 +37,6 @@ [submodule "bundle/webapi-vim"] path = bundle/webapi-vim url = https://github.com/mattn/webapi-vim.git -[submodule "bundle/VimClojure"] - path = bundle/VimClojure - url = https://github.com/vim-scripts/VimClojure.git [submodule "bundle/refheap.vim"] path = bundle/refheap.vim url = https://github.com/Raynes/refheap.vim.git @@ -55,3 +52,6 @@ [submodule "bundle/vim-gitgutter"] path = bundle/vim-gitgutter url = https://github.com/airblade/vim-gitgutter.git +[submodule "bundle/vim-clojure-static"] + path = bundle/vim-clojure-static + url = https://github.com/guns/vim-clojure-static.git diff --git a/bundle/VimClojure b/bundle/VimClojure deleted file mode 160000 index da2683b9..00000000 --- a/bundle/VimClojure +++ /dev/null @@ -1 +0,0 @@ -Subproject commit da2683b9069e01c133f0c0129386fd6dc053019c diff --git a/bundle/vim-clojure-static b/bundle/vim-clojure-static new file mode 160000 index 00000000..949adf73 --- /dev/null +++ b/bundle/vim-clojure-static @@ -0,0 +1 @@ +Subproject commit 949adf73ae1a82c48cd951677c055bd38a30af99 -- cgit 1.4.1 From d11bad11322a2bfde6b9379174acf02abcb64c21 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 23 May 2013 15:38:10 -0400 Subject: Remove vim-clojure-static --- .gitmodules | 3 --- bundle/vim-clojure-static | 1 - 2 files changed, 4 deletions(-) delete mode 160000 bundle/vim-clojure-static diff --git a/.gitmodules b/.gitmodules index 9324cb0b..96657fcc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,6 +52,3 @@ [submodule "bundle/vim-gitgutter"] path = bundle/vim-gitgutter url = https://github.com/airblade/vim-gitgutter.git -[submodule "bundle/vim-clojure-static"] - path = bundle/vim-clojure-static - url = https://github.com/guns/vim-clojure-static.git diff --git a/bundle/vim-clojure-static b/bundle/vim-clojure-static deleted file mode 160000 index 949adf73..00000000 --- a/bundle/vim-clojure-static +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 949adf73ae1a82c48cd951677c055bd38a30af99 -- cgit 1.4.1 From 29efa9194055a8851fa68870d2406db3d9af5820 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 24 May 2013 20:24:10 -0400 Subject: Indent compojure correctly --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index f0ea487f..b0983a87 100644 --- a/.vimrc +++ b/.vimrc @@ -78,6 +78,9 @@ autocmd FileType markdown setlocal tw=72 " g0 Align "public:" and friends to class set cinoptions=:0,l1,g0 +" Indent Compojure correctly +autocmd FileType clojure set lispwords+=GET,POST,PUT,DELETE + " Better tab-complete when opening set wildmenu set wildmode=list:longest -- cgit 1.4.1 From 18da04c220d18ad567c642ceee00a216c27de225 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 7 Jun 2013 23:52:19 -0400 Subject: Switch to my own fork of base16-vim --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 96657fcc..54db0945 100644 --- a/.gitmodules +++ b/.gitmodules @@ -42,7 +42,7 @@ url = https://github.com/Raynes/refheap.vim.git [submodule "bundle/base16-vim"] path = bundle/base16-vim - url = https://github.com/chriskempson/base16-vim.git + url = https://github.com/programble/base16-vim.git [submodule "bundle/powerline"] path = bundle/powerline url = https://github.com/Lokaltog/powerline.git -- cgit 1.4.1 From 5f998c945197c869d2811db43bd62e2a95572dee Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 8 Jun 2013 15:07:45 -0400 Subject: Update base16-vim --- bundle/base16-vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/base16-vim b/bundle/base16-vim index 88144b62..6db489a7 160000 --- a/bundle/base16-vim +++ b/bundle/base16-vim @@ -1 +1 @@ -Subproject commit 88144b6205969158dfb4802e3050979b35bccdb2 +Subproject commit 6db489a71dc0f588d21fbe5e40a257a307bac108 -- cgit 1.4.1 From 2fedb4a6eec8454f9e2833d3d6586349c3466bfe Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 17 Aug 2013 19:44:16 -0400 Subject: Add vim-ragtag --- .gitmodules | 3 +++ bundle/vim-ragtag | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/vim-ragtag diff --git a/.gitmodules b/.gitmodules index 54db0945..275ccfef 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,3 +52,6 @@ [submodule "bundle/vim-gitgutter"] path = bundle/vim-gitgutter url = https://github.com/airblade/vim-gitgutter.git +[submodule "bundle/vim-ragtag"] + path = bundle/vim-ragtag + url = https://github.com/tpope/vim-ragtag.git diff --git a/bundle/vim-ragtag b/bundle/vim-ragtag new file mode 160000 index 00000000..1a93cbb1 --- /dev/null +++ b/bundle/vim-ragtag @@ -0,0 +1 @@ +Subproject commit 1a93cbb14f537c001a52a43b94309d6c625b5953 -- cgit 1.4.1 From b3271ef78a7526569c52547c65ecde153846c686 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 5 Sep 2013 16:55:05 -0400 Subject: Only set colorscheme for gvim --- .vimrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.vimrc b/.vimrc index b0983a87..82cec4e3 100644 --- a/.vimrc +++ b/.vimrc @@ -43,8 +43,9 @@ set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P syntax on set background=dark -"let base16colorspace=256 -colorscheme base16-default +if has('gui_running') + colorscheme base16-default +endif " Enable mouse in terminals if has('mouse') -- cgit 1.4.1 From f89b6ce1db3c2410d9b062cbce64e614dde3c7b1 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 6 Sep 2013 18:01:06 -0400 Subject: Disable some options in terminals --- .vimrc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.vimrc b/.vimrc index 82cec4e3..eb2ca10a 100644 --- a/.vimrc +++ b/.vimrc @@ -52,6 +52,13 @@ if has('mouse') set mouse=a endif +" Less clutter in terminals +if !has('gui_running') + set nospell + set nocursorline + set colorcolumn= +endif + " GUI options set guioptions-=mrLtT " Disable menus, toolbar, scrollbars set guioptions+=c " Disable GUI dialogs -- cgit 1.4.1 From 95e202a8d3927a38f54edd36934bdf461280515e Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 2 Nov 2013 16:53:26 -0400 Subject: Remove powerline --- .gitmodules | 3 --- .vimrc | 3 --- bundle/powerline | 1 - 3 files changed, 7 deletions(-) delete mode 160000 bundle/powerline diff --git a/.gitmodules b/.gitmodules index 275ccfef..f55ad511 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,9 +43,6 @@ [submodule "bundle/base16-vim"] path = bundle/base16-vim url = https://github.com/programble/base16-vim.git -[submodule "bundle/powerline"] - path = bundle/powerline - url = https://github.com/Lokaltog/powerline.git [submodule "bundle/vim-commentary"] path = bundle/vim-commentary url = https://github.com/tpope/vim-commentary.git diff --git a/.vimrc b/.vimrc index eb2ca10a..c6b9ab1d 100644 --- a/.vimrc +++ b/.vimrc @@ -4,9 +4,6 @@ set nocp runtime bundle/vim-pathogen/autoload/pathogen.vim call pathogen#infect() -" Load powerline -set rtp+=~/.vim/bundle/powerline/powerline/bindings/vim - " Remap leader to , noremap \ , let mapleader = "," diff --git a/bundle/powerline b/bundle/powerline deleted file mode 160000 index 0a5a09db..00000000 --- a/bundle/powerline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0a5a09db122e483d4c0ea4b8a5869343a1e4955d -- cgit 1.4.1 From b23f41fcdac2904361964da6c4a909305f647fbd Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 2 Nov 2013 17:33:26 -0400 Subject: Add Airline --- .gitmodules | 3 +++ .vimrc | 4 ++++ bundle/vim-airline | 1 + 3 files changed, 8 insertions(+) create mode 160000 bundle/vim-airline diff --git a/.gitmodules b/.gitmodules index f55ad511..39e4d905 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,3 +52,6 @@ [submodule "bundle/vim-ragtag"] path = bundle/vim-ragtag url = https://github.com/tpope/vim-ragtag.git +[submodule "bundle/vim-airline"] + path = bundle/vim-airline + url = https://github.com/bling/vim-airline.git diff --git a/.vimrc b/.vimrc index c6b9ab1d..86d2c328 100644 --- a/.vimrc +++ b/.vimrc @@ -38,6 +38,10 @@ set laststatus=2 " Always show statusline set noshowmode set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P +" Airline config +let g:airline_left_sep = '' +let g:airline_right_sep = '' + syntax on set background=dark if has('gui_running') diff --git a/bundle/vim-airline b/bundle/vim-airline new file mode 160000 index 00000000..99b7cdf3 --- /dev/null +++ b/bundle/vim-airline @@ -0,0 +1 @@ +Subproject commit 99b7cdf334c7e60498b037f45273cc02f85ab6fe -- cgit 1.4.1 From 2f678b0a7f02ba2d0d2a3cfb9c35ca1f85b7f63e Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 2 Nov 2013 17:43:04 -0400 Subject: Add tagbar --- .gitmodules | 3 +++ bundle/tagbar | 1 + 2 files changed, 4 insertions(+) create mode 160000 bundle/tagbar diff --git a/.gitmodules b/.gitmodules index 39e4d905..05474c0d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,6 @@ [submodule "bundle/vim-airline"] path = bundle/vim-airline url = https://github.com/bling/vim-airline.git +[submodule "bundle/tagbar"] + path = bundle/tagbar + url = https://github.com/majutsushi/tagbar.git diff --git a/bundle/tagbar b/bundle/tagbar new file mode 160000 index 00000000..2e2ba2ea --- /dev/null +++ b/bundle/tagbar @@ -0,0 +1 @@ +Subproject commit 2e2ba2eab252b05051d4ca7cd87b2fcb23a411d6 -- cgit 1.4.1 From b399220b80f50dd1a86c5912b27afb925d9499d6 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 2 Nov 2013 18:26:20 -0400 Subject: Replace vim-gitgutter with vim-signify --- .gitmodules | 6 +++--- .vimrc | 15 ++++++++++----- bundle/vim-gitgutter | 1 - bundle/vim-signify | 1 + 4 files changed, 14 insertions(+), 9 deletions(-) delete mode 160000 bundle/vim-gitgutter create mode 160000 bundle/vim-signify diff --git a/.gitmodules b/.gitmodules index 05474c0d..c7c86511 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,9 +46,6 @@ [submodule "bundle/vim-commentary"] path = bundle/vim-commentary url = https://github.com/tpope/vim-commentary.git -[submodule "bundle/vim-gitgutter"] - path = bundle/vim-gitgutter - url = https://github.com/airblade/vim-gitgutter.git [submodule "bundle/vim-ragtag"] path = bundle/vim-ragtag url = https://github.com/tpope/vim-ragtag.git @@ -58,3 +55,6 @@ [submodule "bundle/tagbar"] path = bundle/tagbar url = https://github.com/majutsushi/tagbar.git +[submodule "bundle/vim-signify"] + path = bundle/vim-signify + url = https://github.com/mhinz/vim-signify.git diff --git a/.vimrc b/.vimrc index 86d2c328..ad031ff7 100644 --- a/.vimrc +++ b/.vimrc @@ -38,10 +38,6 @@ set laststatus=2 " Always show statusline set noshowmode set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P -" Airline config -let g:airline_left_sep = '' -let g:airline_right_sep = '' - syntax on set background=dark if has('gui_running') @@ -102,12 +98,21 @@ runtime macros/matchit.vim autocmd InsertEnter * setlocal nolist autocmd InsertLeave * setlocal list +" Airline config +let g:airline_left_sep = '' +let g:airline_right_sep = '' + " Syntastic options let g:syntastic_check_on_open=1 let g:syntastic_enable_signs=0 let g:syntastic_auto_loc_list=2 -let g:gitgutter_eager = 0 +" Signify +let g:signify_vcs_list = ['git'] +let g:signify_sign_overwrite = 1 +let g:signify_sign_change = '~' + +let g:airline#extensions#hunks#non_zero_only = 1 " Custom maps nnoremap ' ` diff --git a/bundle/vim-gitgutter b/bundle/vim-gitgutter deleted file mode 160000 index ff031d02..00000000 --- a/bundle/vim-gitgutter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ff031d022f2123353bc93a3aa97290287c10a287 diff --git a/bundle/vim-signify b/bundle/vim-signify new file mode 160000 index 00000000..ec4d88eb --- /dev/null +++ b/bundle/vim-signify @@ -0,0 +1 @@ +Subproject commit ec4d88eb1c5dda97db0fc9e4ddbf33e11faacc39 -- cgit 1.4.1 From 2fd178552c36870717b2126d19d51db980f6e4f9 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 3 Nov 2013 00:32:35 -0400 Subject: Disable Airline whitespace extension --- .gitmodules | 3 +++ .vimrc | 2 ++ bundle/jellybeans.vim | 1 + 3 files changed, 6 insertions(+) create mode 160000 bundle/jellybeans.vim diff --git a/.gitmodules b/.gitmodules index c7c86511..f8ce5bf2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +58,6 @@ [submodule "bundle/vim-signify"] path = bundle/vim-signify url = https://github.com/mhinz/vim-signify.git +[submodule "bundle/jellybeans.vim"] + path = bundle/jellybeans.vim + url = https://github.com/programble/jellybeans.vim diff --git a/.vimrc b/.vimrc index ad031ff7..27f9114c 100644 --- a/.vimrc +++ b/.vimrc @@ -114,6 +114,8 @@ let g:signify_sign_change = '~' let g:airline#extensions#hunks#non_zero_only = 1 +let g:airline#extensions#whitespace#enabled = 0 + " Custom maps nnoremap ' ` nnoremap ` ' diff --git a/bundle/jellybeans.vim b/bundle/jellybeans.vim new file mode 160000 index 00000000..c173b85f --- /dev/null +++ b/bundle/jellybeans.vim @@ -0,0 +1 @@ +Subproject commit c173b85f7a99f3ccc1956040957dc279aa523a8c -- cgit 1.4.1 From f48b9e217326f0c731c3201e1967f2c0875cc0e5 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 3 Nov 2013 01:11:28 -0500 Subject: Switch to (customized) jellybeans colorscheme --- .vimrc | 7 +------ bundle/jellybeans.vim | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.vimrc b/.vimrc index 27f9114c..ea546d9d 100644 --- a/.vimrc +++ b/.vimrc @@ -39,10 +39,7 @@ set noshowmode set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P syntax on -set background=dark -if has('gui_running') - colorscheme base16-default -endif +colorscheme jellybeans " Enable mouse in terminals if has('mouse') @@ -52,8 +49,6 @@ endif " Less clutter in terminals if !has('gui_running') set nospell - set nocursorline - set colorcolumn= endif " GUI options diff --git a/bundle/jellybeans.vim b/bundle/jellybeans.vim index c173b85f..d0497c92 160000 --- a/bundle/jellybeans.vim +++ b/bundle/jellybeans.vim @@ -1 +1 @@ -Subproject commit c173b85f7a99f3ccc1956040957dc279aa523a8c +Subproject commit d0497c929ddee0b999caf355195a8eb2af54547a -- cgit 1.4.1 From 58aee81c10de41e1b442300b93421a584067b295 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 3 Nov 2013 01:40:57 -0500 Subject: Update jellybeans --- bundle/jellybeans.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/jellybeans.vim b/bundle/jellybeans.vim index d0497c92..d49aa7dc 160000 --- a/bundle/jellybeans.vim +++ b/bundle/jellybeans.vim @@ -1 +1 @@ -Subproject commit d0497c929ddee0b999caf355195a8eb2af54547a +Subproject commit d49aa7dc7b5b48b712e44c91a3bd89160acd30fe -- cgit 1.4.1 From 1c44da644a07af728c6f5991bc807061582d9077 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 3 Nov 2013 02:12:54 -0500 Subject: Remove unused plugins --- .gitmodules | 9 --------- bundle/gundo.vim | 1 - bundle/nerdtree | 1 - bundle/ooc.vim | 1 - 4 files changed, 12 deletions(-) delete mode 160000 bundle/gundo.vim delete mode 160000 bundle/nerdtree delete mode 160000 bundle/ooc.vim diff --git a/.gitmodules b/.gitmodules index f8ce5bf2..090231f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,21 +13,12 @@ [submodule "bundle/vim-fugitive"] path = bundle/vim-fugitive url = https://github.com/tpope/vim-fugitive.git -[submodule "bundle/nerdtree"] - path = bundle/nerdtree - url = https://github.com/scrooloose/nerdtree.git [submodule "bundle/gist-vim"] path = bundle/gist-vim url = https://github.com/mattn/gist-vim.git -[submodule "bundle/ooc.vim"] - path = bundle/ooc.vim - url = git://github.com/programble/ooc.vim.git [submodule "bundle/syntastic"] path = bundle/syntastic url = https://github.com/scrooloose/syntastic.git -[submodule "bundle/gundo.vim"] - path = bundle/gundo.vim - url = http://github.com/sjl/gundo.vim.git [submodule "bundle/vim-markdown"] path = bundle/vim-markdown url = https://github.com/tpope/vim-markdown.git diff --git a/bundle/gundo.vim b/bundle/gundo.vim deleted file mode 160000 index 4c376a80..00000000 --- a/bundle/gundo.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4c376a8061fa335228da420937ce385b847dd56a diff --git a/bundle/nerdtree b/bundle/nerdtree deleted file mode 160000 index dbeb1947..00000000 --- a/bundle/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dbeb1947ea986d7cda460f12962cdef5196ef87d diff --git a/bundle/ooc.vim b/bundle/ooc.vim deleted file mode 160000 index 69c9ee7c..00000000 --- a/bundle/ooc.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 69c9ee7c366c488ee076e479b76cefbb517c210b -- cgit 1.4.1 From 7ffe33a12cdc90d96b5e3d08ad5fef03b5cb300c Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 3 Nov 2013 02:14:45 -0500 Subject: Update plugins --- bundle/ctrlp.vim | 2 +- bundle/gist-vim | 2 +- bundle/refheap.vim | 2 +- bundle/syntastic | 2 +- bundle/vim-fugitive | 2 +- bundle/vim-markdown | 2 +- bundle/vim-pasta | 2 +- bundle/vim-pathogen | 2 +- bundle/webapi-vim | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bundle/ctrlp.vim b/bundle/ctrlp.vim index 5885da54..b5d3fe66 160000 --- a/bundle/ctrlp.vim +++ b/bundle/ctrlp.vim @@ -1 +1 @@ -Subproject commit 5885da54beba301be4f7b13f7556e97e570193e5 +Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f diff --git a/bundle/gist-vim b/bundle/gist-vim index 3e02137a..bd941d05 160000 --- a/bundle/gist-vim +++ b/bundle/gist-vim @@ -1 +1 @@ -Subproject commit 3e02137acd8c9fd5235b9afeae8a7675296aef77 +Subproject commit bd941d058b319e2b7bfc07de584e975a51782cc9 diff --git a/bundle/refheap.vim b/bundle/refheap.vim index 0780087c..d6d10a4e 160000 --- a/bundle/refheap.vim +++ b/bundle/refheap.vim @@ -1 +1 @@ -Subproject commit 0780087c5894df5cb89381dbac224c4604112b47 +Subproject commit d6d10a4e1aa8dec536275a3ba6f11fbebbea306b diff --git a/bundle/syntastic b/bundle/syntastic index 52992969..14cb3064 160000 --- a/bundle/syntastic +++ b/bundle/syntastic @@ -1 +1 @@ -Subproject commit 529929691f88e4080548fe662ceff462ede34293 +Subproject commit 14cb306414dda411b1809a088e18eb2796030095 diff --git a/bundle/vim-fugitive b/bundle/vim-fugitive index 3b278277..34e2d253 160000 --- a/bundle/vim-fugitive +++ b/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 3b278277e0b46711c30a3d1a0083e527b2fb98ed +Subproject commit 34e2d2538a634a0a820a56994333ffa1fec1bc58 diff --git a/bundle/vim-markdown b/bundle/vim-markdown index 9a21f7a6..fccf76f6 160000 --- a/bundle/vim-markdown +++ b/bundle/vim-markdown @@ -1 +1 @@ -Subproject commit 9a21f7a6bc7d5b5cd7a2e78b7893798a67526be8 +Subproject commit fccf76f68fa819629e9dac50a20f3369983e2a38 diff --git a/bundle/vim-pasta b/bundle/vim-pasta index 736e2df0..50ac52a3 160000 --- a/bundle/vim-pasta +++ b/bundle/vim-pasta @@ -1 +1 @@ -Subproject commit 736e2df09c11a623080e71150576e94fb700e8b8 +Subproject commit 50ac52a3cc3377395ceb160e3360923d84d0b916 diff --git a/bundle/vim-pathogen b/bundle/vim-pathogen index 09f2c3b7..1270dceb 160000 --- a/bundle/vim-pathogen +++ b/bundle/vim-pathogen @@ -1 +1 @@ -Subproject commit 09f2c3b7d3666124157de759a68afe47d0bb8d25 +Subproject commit 1270dceb1fe0ca35f8b292c7b41b45b42c5a0cc1 diff --git a/bundle/webapi-vim b/bundle/webapi-vim index 96835261..a043444a 160000 --- a/bundle/webapi-vim +++ b/bundle/webapi-vim @@ -1 +1 @@ -Subproject commit 968352613d3ea664d7896e7844670a2021ef2104 +Subproject commit a043444a5b7cbcc865e4cee61c118de09ea2cbdc -- cgit 1.4.1 From 92e05d8a17d590175c4bf2ccdb61198e1e3aea0b Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 3 Nov 2013 15:07:57 -0500 Subject: Add bindings for CtrlPBufTag and CtrlPLine --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index ea546d9d..0bf38298 100644 --- a/.vimrc +++ b/.vimrc @@ -137,6 +137,8 @@ nmap Q gq nmap b :CtrlPBuffer nmap e :CtrlP +nmap t :CtrlPBufTag +nmap l :CtrlPLine nmap gs :Gstatus nmap gc :Gcommit -- cgit 1.4.1 From 36a89fdc0b1933812fb2d3b049b3178fb67438cf Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sun, 3 Nov 2013 15:08:18 -0500 Subject: Update jellybeans --- bundle/jellybeans.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/jellybeans.vim b/bundle/jellybeans.vim index d49aa7dc..0f081269 160000 --- a/bundle/jellybeans.vim +++ b/bundle/jellybeans.vim @@ -1 +1 @@ -Subproject commit d49aa7dc7b5b48b712e44c91a3bd89160acd30fe +Subproject commit 0f08126929bce42c5bd9ef6b44008fb338295142 -- cgit 1.4.1 From a14264da86c530decd30b75983c0fad776fa6e0c Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 9 Nov 2013 14:34:25 -0500 Subject: Remove unused plugin configurations --- .vimrc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.vimrc b/.vimrc index 0bf38298..75458795 100644 --- a/.vimrc +++ b/.vimrc @@ -144,12 +144,6 @@ nmap gs :Gstatus nmap gc :Gcommit nmap gp :Git push -nmap gg :GitGutterToggle -nmap gh GitGutterNextHunk -nmap gH GitGutterPrevHunk - -nmap u :GundoToggle - " Toggle relative/absolute numbers function! NumberToggle() if(&relativenumber == 1) -- cgit 1.4.1 From a0725b80b7299022f269b84098ded5230854859c Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 9 Nov 2013 14:36:16 -0500 Subject: Add vim-easy-align --- .gitmodules | 3 +++ .vimrc | 2 ++ bundle/vim-easy-align | 1 + 3 files changed, 6 insertions(+) create mode 160000 bundle/vim-easy-align diff --git a/.gitmodules b/.gitmodules index 090231f7..8836f4ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,3 +52,6 @@ [submodule "bundle/jellybeans.vim"] path = bundle/jellybeans.vim url = https://github.com/programble/jellybeans.vim +[submodule "bundle/vim-easy-align"] + path = bundle/vim-easy-align + url = https://github.com/junegunn/vim-easy-align.git diff --git a/.vimrc b/.vimrc index 75458795..65fb988b 100644 --- a/.vimrc +++ b/.vimrc @@ -144,6 +144,8 @@ nmap gs :Gstatus nmap gc :Gcommit nmap gp :Git push +vnoremap :EasyAlign + " Toggle relative/absolute numbers function! NumberToggle() if(&relativenumber == 1) diff --git a/bundle/vim-easy-align b/bundle/vim-easy-align new file mode 160000 index 00000000..2daae46a --- /dev/null +++ b/bundle/vim-easy-align @@ -0,0 +1 @@ +Subproject commit 2daae46a43f6e7b9022cbde1dd451d4f798f5f72 -- cgit 1.4.1 From d4f04dbaebb97520ab57166ee85c0137c4bc7cd9 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 9 Nov 2013 15:24:41 -0500 Subject: Switch to vim-plug --- .gitignore | 5 ++- .gitmodules | 57 ---------------------------- .vimrc | 96 +++++++++++++++++++++++++---------------------- bundle/Vim-Tomorrow-Theme | 1 - bundle/base16-vim | 1 - bundle/ctrlp.vim | 1 - bundle/gist-vim | 1 - bundle/itchy.vim | 1 - bundle/jellybeans.vim | 1 - bundle/refheap.vim | 1 - bundle/syntastic | 1 - bundle/tagbar | 1 - bundle/vim-airline | 1 - bundle/vim-commentary | 1 - bundle/vim-easy-align | 1 - bundle/vim-fugitive | 1 - bundle/vim-markdown | 1 - bundle/vim-pasta | 1 - bundle/vim-pathogen | 1 - bundle/vim-ragtag | 1 - bundle/vim-signify | 1 - bundle/webapi-vim | 1 - vim-plug.sh | 2 + 23 files changed, 57 insertions(+), 122 deletions(-) delete mode 100644 .gitmodules delete mode 160000 bundle/Vim-Tomorrow-Theme delete mode 160000 bundle/base16-vim delete mode 160000 bundle/ctrlp.vim delete mode 160000 bundle/gist-vim delete mode 160000 bundle/itchy.vim delete mode 160000 bundle/jellybeans.vim delete mode 160000 bundle/refheap.vim delete mode 160000 bundle/syntastic delete mode 160000 bundle/tagbar delete mode 160000 bundle/vim-airline delete mode 160000 bundle/vim-commentary delete mode 160000 bundle/vim-easy-align delete mode 160000 bundle/vim-fugitive delete mode 160000 bundle/vim-markdown delete mode 160000 bundle/vim-pasta delete mode 160000 bundle/vim-pathogen delete mode 160000 bundle/vim-ragtag delete mode 160000 bundle/vim-signify delete mode 160000 bundle/webapi-vim create mode 100755 vim-plug.sh diff --git a/.gitignore b/.gitignore index 532147d2..28bda465 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -.netrwhist -plugin/private.vim +autoload +plugin +plugged diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 8836f4ae..00000000 --- a/.gitmodules +++ /dev/null @@ -1,57 +0,0 @@ -[submodule "bundle/vim-pathogen"] - path = bundle/vim-pathogen - url = https://github.com/tpope/vim-pathogen.git -[submodule "bundle/ctrlp.vim"] - path = bundle/ctrlp.vim - url = https://github.com/kien/ctrlp.vim.git -[submodule "bundle/Vim-Tomorrow-Theme"] - path = bundle/Vim-Tomorrow-Theme - url = git://github.com/programble/Vim-Tomorrow-Theme.git -[submodule "bundle/vim-pasta"] - path = bundle/vim-pasta - url = https://github.com/sickill/vim-pasta.git -[submodule "bundle/vim-fugitive"] - path = bundle/vim-fugitive - url = https://github.com/tpope/vim-fugitive.git -[submodule "bundle/gist-vim"] - path = bundle/gist-vim - url = https://github.com/mattn/gist-vim.git -[submodule "bundle/syntastic"] - path = bundle/syntastic - url = https://github.com/scrooloose/syntastic.git -[submodule "bundle/vim-markdown"] - path = bundle/vim-markdown - url = https://github.com/tpope/vim-markdown.git -[submodule "bundle/itchy.vim"] - path = bundle/itchy.vim - url = git://github.com/programble/itchy.vim.git -[submodule "bundle/webapi-vim"] - path = bundle/webapi-vim - url = https://github.com/mattn/webapi-vim.git -[submodule "bundle/refheap.vim"] - path = bundle/refheap.vim - url = https://github.com/Raynes/refheap.vim.git -[submodule "bundle/base16-vim"] - path = bundle/base16-vim - url = https://github.com/programble/base16-vim.git -[submodule "bundle/vim-commentary"] - path = bundle/vim-commentary - url = https://github.com/tpope/vim-commentary.git -[submodule "bundle/vim-ragtag"] - path = bundle/vim-ragtag - url = https://github.com/tpope/vim-ragtag.git -[submodule "bundle/vim-airline"] - path = bundle/vim-airline - url = https://github.com/bling/vim-airline.git -[submodule "bundle/tagbar"] - path = bundle/tagbar - url = https://github.com/majutsushi/tagbar.git -[submodule "bundle/vim-signify"] - path = bundle/vim-signify - url = https://github.com/mhinz/vim-signify.git -[submodule "bundle/jellybeans.vim"] - path = bundle/jellybeans.vim - url = https://github.com/programble/jellybeans.vim -[submodule "bundle/vim-easy-align"] - path = bundle/vim-easy-align - url = https://github.com/junegunn/vim-easy-align.git diff --git a/.vimrc b/.vimrc index 65fb988b..e481b1c5 100644 --- a/.vimrc +++ b/.vimrc @@ -1,14 +1,5 @@ -set nocp +set nocompatible -" Load pathogen -runtime bundle/vim-pathogen/autoload/pathogen.vim -call pathogen#infect() - -" Remap leader to , -noremap \ , -let mapleader = "," - -" General set backspace=indent,eol,start set hidden set backup @@ -33,13 +24,8 @@ set list set listchars=tab:»·,trail:· set foldmethod=syntax set foldlevel=1000 - -set laststatus=2 " Always show statusline -set noshowmode -set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P - +set laststatus=2 syntax on -colorscheme jellybeans " Enable mouse in terminals if has('mouse') @@ -93,23 +79,9 @@ runtime macros/matchit.vim autocmd InsertEnter * setlocal nolist autocmd InsertLeave * setlocal list -" Airline config -let g:airline_left_sep = '' -let g:airline_right_sep = '' - -" Syntastic options -let g:syntastic_check_on_open=1 -let g:syntastic_enable_signs=0 -let g:syntastic_auto_loc_list=2 - -" Signify -let g:signify_vcs_list = ['git'] -let g:signify_sign_overwrite = 1 -let g:signify_sign_change = '~' - -let g:airline#extensions#hunks#non_zero_only = 1 - -let g:airline#extensions#whitespace#enabled = 0 +" Remap leader to , +noremap \ , +let mapleader = "," " Custom maps nnoremap ' ` @@ -135,17 +107,6 @@ imap nmap Q gq -nmap b :CtrlPBuffer -nmap e :CtrlP -nmap t :CtrlPBufTag -nmap l :CtrlPLine - -nmap gs :Gstatus -nmap gc :Gcommit -nmap gp :Git push - -vnoremap :EasyAlign - " Toggle relative/absolute numbers function! NumberToggle() if(&relativenumber == 1) @@ -160,3 +121,50 @@ nmap :call NumberToggle() " Custom commands command! W :w +call plug#begin('~/.vim/plugged') + +Plug 'bling/vim-airline' +set noshowmode +let g:airline_left_sep = '' +let g:airline_right_sep = '' +let g:airline#extensions#hunks#non_zero_only = 1 +let g:airline#extensions#whitespace#enabled = 0 + +Plug 'scrooloose/syntastic' +let g:syntastic_check_on_open=1 +let g:syntastic_enable_signs=0 +let g:syntastic_auto_loc_list=2 + +Plug 'mhinz/vim-signify' +let g:signify_vcs_list = ['git'] +let g:signify_sign_overwrite = 1 +let g:signify_sign_change = '~' + +Plug 'kien/ctrlp.vim' +nmap b :CtrlPBuffer +nmap e :CtrlP +nmap t :CtrlPBufTag +nmap l :CtrlPLine + +Plug 'tpope/vim-fugitive' +nmap gs :Gstatus +nmap gc :Gcommit +nmap gp :Git push + +Plug 'junegunn/vim-easy-align' +vnoremap :EasyAlign + +Plug 'Raynes/refheap.vim' +Plug 'majutsushi/tagbar' +Plug 'mattn/gist-vim' +Plug 'mattn/webapi-vim' +Plug 'programble/itchy.vim' +Plug 'programble/jellybeans.vim' +Plug 'sickill/vim-pasta' +Plug 'tpope/vim-commentary' +Plug 'tpope/vim-markdown' +Plug 'tpope/vim-ragtag' + +call plug#end() + +colorscheme jellybeans diff --git a/bundle/Vim-Tomorrow-Theme b/bundle/Vim-Tomorrow-Theme deleted file mode 160000 index 1e0c2ab5..00000000 --- a/bundle/Vim-Tomorrow-Theme +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1e0c2ab5d5a82d7adecbc84f689abcf217bd1b50 diff --git a/bundle/base16-vim b/bundle/base16-vim deleted file mode 160000 index 6db489a7..00000000 --- a/bundle/base16-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6db489a71dc0f588d21fbe5e40a257a307bac108 diff --git a/bundle/ctrlp.vim b/bundle/ctrlp.vim deleted file mode 160000 index b5d3fe66..00000000 --- a/bundle/ctrlp.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f diff --git a/bundle/gist-vim b/bundle/gist-vim deleted file mode 160000 index bd941d05..00000000 --- a/bundle/gist-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd941d058b319e2b7bfc07de584e975a51782cc9 diff --git a/bundle/itchy.vim b/bundle/itchy.vim deleted file mode 160000 index 13bf38ff..00000000 --- a/bundle/itchy.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 13bf38ff895f7c32befb78b9505c478b77545329 diff --git a/bundle/jellybeans.vim b/bundle/jellybeans.vim deleted file mode 160000 index 0f081269..00000000 --- a/bundle/jellybeans.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0f08126929bce42c5bd9ef6b44008fb338295142 diff --git a/bundle/refheap.vim b/bundle/refheap.vim deleted file mode 160000 index d6d10a4e..00000000 --- a/bundle/refheap.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d6d10a4e1aa8dec536275a3ba6f11fbebbea306b diff --git a/bundle/syntastic b/bundle/syntastic deleted file mode 160000 index 14cb3064..00000000 --- a/bundle/syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 14cb306414dda411b1809a088e18eb2796030095 diff --git a/bundle/tagbar b/bundle/tagbar deleted file mode 160000 index 2e2ba2ea..00000000 --- a/bundle/tagbar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2e2ba2eab252b05051d4ca7cd87b2fcb23a411d6 diff --git a/bundle/vim-airline b/bundle/vim-airline deleted file mode 160000 index 99b7cdf3..00000000 --- a/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99b7cdf334c7e60498b037f45273cc02f85ab6fe diff --git a/bundle/vim-commentary b/bundle/vim-commentary deleted file mode 160000 index a3ae0df1..00000000 --- a/bundle/vim-commentary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a3ae0df1d9e13941e9e8086637055841ce93f7bd diff --git a/bundle/vim-easy-align b/bundle/vim-easy-align deleted file mode 160000 index 2daae46a..00000000 --- a/bundle/vim-easy-align +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2daae46a43f6e7b9022cbde1dd451d4f798f5f72 diff --git a/bundle/vim-fugitive b/bundle/vim-fugitive deleted file mode 160000 index 34e2d253..00000000 --- a/bundle/vim-fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 34e2d2538a634a0a820a56994333ffa1fec1bc58 diff --git a/bundle/vim-markdown b/bundle/vim-markdown deleted file mode 160000 index fccf76f6..00000000 --- a/bundle/vim-markdown +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fccf76f68fa819629e9dac50a20f3369983e2a38 diff --git a/bundle/vim-pasta b/bundle/vim-pasta deleted file mode 160000 index 50ac52a3..00000000 --- a/bundle/vim-pasta +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 50ac52a3cc3377395ceb160e3360923d84d0b916 diff --git a/bundle/vim-pathogen b/bundle/vim-pathogen deleted file mode 160000 index 1270dceb..00000000 --- a/bundle/vim-pathogen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1270dceb1fe0ca35f8b292c7b41b45b42c5a0cc1 diff --git a/bundle/vim-ragtag b/bundle/vim-ragtag deleted file mode 160000 index 1a93cbb1..00000000 --- a/bundle/vim-ragtag +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1a93cbb14f537c001a52a43b94309d6c625b5953 diff --git a/bundle/vim-signify b/bundle/vim-signify deleted file mode 160000 index ec4d88eb..00000000 --- a/bundle/vim-signify +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ec4d88eb1c5dda97db0fc9e4ddbf33e11faacc39 diff --git a/bundle/webapi-vim b/bundle/webapi-vim deleted file mode 160000 index a043444a..00000000 --- a/bundle/webapi-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a043444a5b7cbcc865e4cee61c118de09ea2cbdc diff --git a/vim-plug.sh b/vim-plug.sh new file mode 100755 index 00000000..0fc9a28c --- /dev/null +++ b/vim-plug.sh @@ -0,0 +1,2 @@ +mkdir -p ~/.vim/autoload +curl -fLo ~/.vim/autoload/plug.vim https://raw.github.com/junegunn/vim-plug/master/plug.vim -- cgit 1.4.1 From d4a984a6709e11730be89a9b98e6caf72deaff5e Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 9 Nov 2013 15:33:18 -0500 Subject: Add Plugins comment --- .vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index e481b1c5..4538a951 100644 --- a/.vimrc +++ b/.vimrc @@ -118,9 +118,10 @@ endfunc nmap :call NumberToggle() -" Custom commands command! W :w +" Plugins + call plug#begin('~/.vim/plugged') Plug 'bling/vim-airline' -- cgit 1.4.1 From 82155cb5537dbb591612513c32a6a94ee6b2c5c5 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 9 Nov 2013 15:36:23 -0500 Subject: Fix NumberToggle --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 4538a951..89798357 100644 --- a/.vimrc +++ b/.vimrc @@ -110,7 +110,7 @@ nmap Q gq " Toggle relative/absolute numbers function! NumberToggle() if(&relativenumber == 1) - set number + set norelativenumber else set relativenumber endif -- cgit 1.4.1 From b21e548bf2a386acfd54670610b18c0d87dd265f Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 9 Nov 2013 15:49:52 -0500 Subject: Remove instructions from README --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index cc31bf06..360b2b72 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,3 @@ # VIM Configuration My amazing VIM configuration - -## Install - -``` -cd ~ -git clone git://github.com/programble/dotvim.git .vim -ln -s .vim/.vimrc .vimrc -cd .vim -git submodule init -git submodule update -``` -- cgit 1.4.1