From 80f3157c46f6808def37ac93d3fb4c4c8263c014 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 14 Jan 2012 19:46:03 -0500 Subject: Initial commit --- .vimrc | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 .vimrc (limited to '.vimrc') 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 -- 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(+) (limited to '.vimrc') 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 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(+) (limited to '.vimrc') 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 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(-) (limited to '.vimrc') 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(-) (limited to '.vimrc') 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 (limited to '.vimrc') 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 (limited to '.vimrc') 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 (limited to '.vimrc') 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 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(+) (limited to '.vimrc') 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 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(-) (limited to '.vimrc') 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(-) (limited to '.vimrc') 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 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(+) (limited to '.vimrc') 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(-) (limited to '.vimrc') 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(-) (limited to '.vimrc') 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 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(+) (limited to '.vimrc') 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 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(-) (limited to '.vimrc') 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(+) (limited to '.vimrc') 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(-) (limited to '.vimrc') 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 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 (limited to '.vimrc') 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(+) (limited to '.vimrc') 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 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(+) (limited to '.vimrc') 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 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(+) (limited to '.vimrc') 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 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(-) (limited to '.vimrc') 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(+) (limited to '.vimrc') 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 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(+) (limited to '.vimrc') 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 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(-) (limited to '.vimrc') 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 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(-) (limited to '.vimrc') 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(+) (limited to '.vimrc') 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 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(-) (limited to '.vimrc') 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 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(-) (limited to '.vimrc') 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 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 (limited to '.vimrc') 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(+) (limited to '.vimrc') 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 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(-) (limited to '.vimrc') 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 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 (limited to '.vimrc') 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(-) (limited to '.vimrc') 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 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(+) (limited to '.vimrc') 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 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(+) (limited to '.vimrc') 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 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(-) (limited to '.vimrc') 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(+) (limited to '.vimrc') 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 (limited to '.vimrc') 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 (limited to '.vimrc') 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 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 (limited to '.vimrc') 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 (limited to '.vimrc') 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(-) (limited to '.vimrc') 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 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(+) (limited to '.vimrc') 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 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(-) (limited to '.vimrc') 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 (limited to '.vimrc') 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 (limited to '.vimrc') 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(-) (limited to '.vimrc') 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(-) (limited to '.vimrc') 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