diff options
35 files changed, 79 insertions, 113 deletions
@@ -6,4 +6,5 @@ /files/.vim/.netrwhist /files/.vim/doc/tags /files/.vim/spell +/files/.vim/bundle /files/.zsh/cache diff --git a/.gitmodules b/.gitmodules index 4e09bd2..b149a92 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,106 +8,6 @@ [submodule "mutt-colors-solarized"] path = files/.mutt/mutt-colors-solarized url = https://github.com/altercation/mutt-colors-solarized -# Vim bundles -[submodule "vim-pathogen"] - path = files/.vim/bundle/vim-pathogen - url = https://github.com/tpope/vim-pathogen -[submodule "surround"] - path = files/.vim/bundle/surround - url = https://github.com/tpope/vim-surround.git -[submodule "repeat"] - path = files/.vim/bundle/repeat - url = https://github.com/tpope/vim-repeat.git -[submodule "nerdcommenter"] - path = files/.vim/bundle/nerdcommenter - url = https://github.com/scrooloose/nerdcommenter.git -[submodule "nerdtree"] - path = files/.vim/bundle/nerdtree - url = https://github.com/scrooloose/nerdtree -[submodule "vim-template"] - path = files/.vim/bundle/vim-template - url = https://github.com/aperezdc/vim-template -[submodule "vim-markdown"] - path = files/.vim/bundle/vim-markdown - url = https://github.com/plasticboy/vim-markdown.git - ignore = untracked -[submodule "vim-jade"] - path = files/.vim/bundle/vim-jade - url = https://github.com/digitaltoad/vim-jade.git -[submodule "xml.vim"] - path = files/.vim/bundle/xml.vim - url = https://github.com/othree/xml.vim - ignore = untracked -[submodule "nginx-vim-syntax"] - path = files/.vim/bundle/nginx-vim-syntax - url = https://github.com/evanmiller/nginx-vim-syntax.git -[submodule "snipmate.vim"] - path = files/.vim/bundle/snipmate.vim - url = https://github.com/msanders/snipmate.vim - ignore = untracked -[submodule "git-vim"] - path = files/.vim/bundle/git-vim - url = https://github.com/motemen/git-vim -[submodule "taglist.vim"] - path = files/.vim/bundle/taglist.vim - url = https://github.com/vim-scripts/taglist.vim - ignore = untracked -[submodule "vim-ledger"] - path = files/.vim/bundle/vim-ledger - url = https://github.com/ledger/vim-ledger -[submodule "tabular"] - path = files/.vim/bundle/tabular - url = https://github.com/godlygeek/tabular -;[submodule "syntastic"] - ;path = files/.vim/bundle/syntastic - ;url = https://github.com/scrooloose/syntastic.git -[submodule "FuzzyFinder"] - path = files/.vim/bundle/FuzzyFinder - url = https://github.com/vim-scripts/FuzzyFinder.git - ignore = untracked -[submodule "L9"] - path = files/.vim/bundle/L9 - url = https://github.com/vim-scripts/L9.git - ignore = untracked -[submodule "files/.vim/bundle/syntastic"] - path = files/.vim/bundle/syntastic - url = https://github.com/scrooloose/syntastic.git -[submodule "files/.vim/bundle/vim-fugitive"] - path = files/.vim/bundle/vim-fugitive - url = https://github.com/tpope/vim-fugitive.git -[submodule "files/.vim/bundle/vim-colors-solarized"] - path = files/.vim/bundle/vim-colors-solarized - url = git://github.com/altercation/vim-colors-solarized.git -[submodule "files/.vim/bundle/ag"] - path = files/.vim/bundle/ag - url = https://github.com/rking/ag.vim -[submodule "files/.vim/bundle/vim-bracketed-paste"] - path = files/.vim/bundle/vim-bracketed-paste - url = https://github.com/ConradIrwin/vim-bracketed-paste -[submodule "vim/ctrlp"] - path = files/.vim/bundle/ctrlp.vim - url = https://github.com/ctrlpvim/ctrlp.vim -[submodule "vim/emmet"] - path = files/.vim/bundle/emmet-vim - url = https://github.com/mattn/emmet-vim.git -[submodule "vim/vim-css-color"] - path = files/.vim/bundle/vim-css-color - url = https://github.com/ap/vim-css-color -[submodule "vim/vim-multiple-cursors"] - path = files/.vim/bundle/vim-multiple-cursors - url = https://github.com/terryma/vim-multiple-cursors -[submodule "vim/yats.vim"] - path = files/.vim/bundle/yats.vim - url = https://github.com/HerringtonDarkholme/yats.vim -[submodule "vim/vim-addon-local-vimrc"] - path = files/.vim/bundle/vim-addon-local-vimrc - url = https://github.com/MarcWeber/vim-addon-local-vimrc -[submodule "vim/delimitmate"] - path = files/.vim/bundle/delimitmate - url = https://github.com/raimondi/delimitmate -[submodule "vim/vim-orgmode"] - path = files/.vim/bundle/vim-orgmode - url = https://github.com/jceb/vim-orgmode -[submodule "vim/vim-speeddating"] - path = files/.vim/bundle/vim-speeddating - url = https://github.com/tpope/vim-speeddating +[submodule "vim/Vundle.vim"] + path = files/.vim/bundle/Vundle.vim + url = https://github.com/VundleVim/Vundle.vim diff --git a/files/.vim/bundle/FuzzyFinder b/files/.vim/bundle/FuzzyFinder deleted file mode 160000 -Subproject b9f165970346df55862853dd83c8a4f2b2b7026 diff --git a/files/.vim/bundle/L9 b/files/.vim/bundle/L9 deleted file mode 160000 -Subproject c822b05ee0886f9a9703227dc85a6d47612c4bf diff --git a/files/.vim/bundle/Vundle.vim b/files/.vim/bundle/Vundle.vim new file mode 160000 +Subproject fef1c2f31862c44cf5295ef86c086efba4af20a diff --git a/files/.vim/bundle/ag b/files/.vim/bundle/ag deleted file mode 160000 -Subproject 6600953fc7c85ca43216abf4765118994bf0cc5 diff --git a/files/.vim/bundle/ctrlp.vim b/files/.vim/bundle/ctrlp.vim deleted file mode 160000 -Subproject 08b40e1394d60aef213fa423bcd45db0ef6bcbc diff --git a/files/.vim/bundle/delimitmate b/files/.vim/bundle/delimitmate deleted file mode 160000 -Subproject b5719054beebe0135c94f4711a06dc7588041f0 diff --git a/files/.vim/bundle/emmet-vim b/files/.vim/bundle/emmet-vim deleted file mode 160000 -Subproject 26899b9981d8ede8d01ad9d64a3a102c762694d diff --git a/files/.vim/bundle/git-vim b/files/.vim/bundle/git-vim deleted file mode 160000 -Subproject 19b88ad4f00ac570118111b1bc9544f35aae6a4 diff --git a/files/.vim/bundle/nerdcommenter b/files/.vim/bundle/nerdcommenter deleted file mode 160000 -Subproject 1f4bfd59920c101a30a74a07b824608a6e65f3f diff --git a/files/.vim/bundle/nerdtree b/files/.vim/bundle/nerdtree deleted file mode 160000 -Subproject 2e2b649232d6ae4d02d74793e5da0ee08480ad8 diff --git a/files/.vim/bundle/nginx-vim-syntax b/files/.vim/bundle/nginx-vim-syntax deleted file mode 160000 -Subproject 4c271c948f5487d45a1735654da98ffa7e1936a diff --git a/files/.vim/bundle/repeat b/files/.vim/bundle/repeat deleted file mode 160000 -Subproject 7a6675f092842c8f81e71d5345bd7cdbf375941 diff --git a/files/.vim/bundle/snipmate.vim b/files/.vim/bundle/snipmate.vim deleted file mode 160000 -Subproject f5a75d075d3c005ebe69e3f5e56cf99516e8aa3 diff --git a/files/.vim/bundle/surround b/files/.vim/bundle/surround deleted file mode 160000 -Subproject 2d05440ad23f97a7874ebd9b5de3a0e65d25d85 diff --git a/files/.vim/bundle/syntastic b/files/.vim/bundle/syntastic deleted file mode 160000 -Subproject cee74e0c1af934065fd1b3046e53cda76574f70 diff --git a/files/.vim/bundle/tabular b/files/.vim/bundle/tabular deleted file mode 160000 -Subproject 60f25648814f0695eeb6c1040d97adca93c4e0b diff --git a/files/.vim/bundle/taglist.vim b/files/.vim/bundle/taglist.vim deleted file mode 160000 -Subproject 53041fbc45398a9af631a20657e109707a45533 diff --git a/files/.vim/bundle/vim-addon-local-vimrc b/files/.vim/bundle/vim-addon-local-vimrc deleted file mode 160000 -Subproject 6a27f95b35befa70cd0d049329cd0920566c764 diff --git a/files/.vim/bundle/vim-bracketed-paste b/files/.vim/bundle/vim-bracketed-paste deleted file mode 160000 -Subproject 148df8cb2621beb9d5865336ddea7caeb6f6dd7 diff --git a/files/.vim/bundle/vim-colors-solarized b/files/.vim/bundle/vim-colors-solarized deleted file mode 160000 -Subproject 528a59f26d12278698bb946f8fb82a63711eec2 diff --git a/files/.vim/bundle/vim-css-color b/files/.vim/bundle/vim-css-color deleted file mode 160000 -Subproject 86dff1b9c2a549994042c4548a47514350c25b6 diff --git a/files/.vim/bundle/vim-fugitive b/files/.vim/bundle/vim-fugitive deleted file mode 160000 -Subproject 9af975c82c99318b908c61b12e443e8ba6dea21 diff --git a/files/.vim/bundle/vim-jade b/files/.vim/bundle/vim-jade deleted file mode 160000 -Subproject fb29347a334758c47fb297a6fa1958f6480c15b diff --git a/files/.vim/bundle/vim-ledger b/files/.vim/bundle/vim-ledger deleted file mode 160000 -Subproject 726359d582adf066905e01ec0081a6d028be97a diff --git a/files/.vim/bundle/vim-markdown b/files/.vim/bundle/vim-markdown deleted file mode 160000 -Subproject 1c2cccbafbbd74407d3d2209e77143a4e820758 diff --git a/files/.vim/bundle/vim-multiple-cursors b/files/.vim/bundle/vim-multiple-cursors deleted file mode 160000 -Subproject 51d0717f63cc231f11b4b63ee5b611f589dce1b diff --git a/files/.vim/bundle/vim-orgmode b/files/.vim/bundle/vim-orgmode deleted file mode 160000 -Subproject e76c0f07e9193e08df2b8eeb95ef6240b494797 diff --git a/files/.vim/bundle/vim-pathogen b/files/.vim/bundle/vim-pathogen deleted file mode 160000 -Subproject 1270dceb1fe0ca35f8b292c7b41b45b42c5a0cc diff --git a/files/.vim/bundle/vim-speeddating b/files/.vim/bundle/vim-speeddating deleted file mode 160000 -Subproject 426c792e479f6e1650a6996c683943a09344c21 diff --git a/files/.vim/bundle/vim-template b/files/.vim/bundle/vim-template deleted file mode 160000 -Subproject 88f7a46a746d8ae28ad1241b3b107e2a44f3467 diff --git a/files/.vim/bundle/xml.vim b/files/.vim/bundle/xml.vim deleted file mode 160000 -Subproject b878689de5f2ccf2b9c2593165dc810d53cbe4e diff --git a/files/.vim/bundle/yats.vim b/files/.vim/bundle/yats.vim deleted file mode 160000 -Subproject 72b6bc7053e13ea0d84e80717e3b56891fb5e24 diff --git a/files/.vimrc b/files/.vimrc index dcd6a32..13d76ef 100644 --- a/files/.vimrc +++ b/files/.vimrc @@ -1,13 +1,83 @@ " vim: spell foldmethod=marker : -" Setup {{{ +" Setup & Plugins {{{ + +" Setup Vundle set nocompatible +filetype off +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() -filetype off " Do so to reload filetype plugins after pathogen -runtime bundle/vim-pathogen/autoload/pathogen.vim -call pathogen#infect() -syntax on +" Plugins {{{ + +Plugin 'VundleVim/Vundle.vim' + +" Library for other plugins +Plugin 'https://github.com/vim-scripts/L9.git' + +" Git inside vim +Plugin 'https://github.com/tpope/vim-fugitive.git' + +" Intelligent date inc/dec +Plugin 'https://github.com/tpope/vim-speeddating' +" Show colors in CSS format +Plugin 'https://github.com/ap/vim-css-color' +" Load project .vimrc files +Plugin 'https://github.com/MarcWeber/vim-addon-local-vimrc' +" Fuzzy finder +Plugin 'https://github.com/ctrlpvim/ctrlp.vim' +" Finder +Plugin 'https://github.com/vim-scripts/FuzzyFinder.git' +" Solarized colorscheme +Plugin 'https://github.com/altercation/vim-colors-solarized' +" Zen codding +Plugin 'https://github.com/mattn/emmet-vim.git' +" Code snippets +Plugin 'https://github.com/msanders/snipmate.vim' +" Silversearch plugin +Plugin 'https://github.com/rking/ag.vim' +" Support dot command for plugins +Plugin 'https://github.com/tpope/vim-repeat.git' +Plugin 'https://github.com/tpope/vim-surround.git' +" Files tree plugin +Plugin 'https://github.com/scrooloose/nerdtree' +" Commenting text +Plugin 'https://github.com/scrooloose/nerdcommenter.git' +Plugin 'https://github.com/raimondi/delimitmate' +" Syntax check and linting +Plugin 'https://github.com/scrooloose/syntastic.git' +" Text alignment commands +Plugin 'https://github.com/godlygeek/tabular' +" Pasting in vim +Plugin 'https://github.com/ConradIrwin/vim-bracketed-paste' +" File templates +Plugin 'https://github.com/aperezdc/vim-template' +" Code browser +Plugin 'https://github.com/vim-scripts/taglist.vim' + +" File types + +" Ledger +Plugin 'https://github.com/ledger/vim-ledger' +" Nginx +Plugin 'https://github.com/evanmiller/nginx-vim-syntax.git' +" Jade templates +Plugin 'https://github.com/digitaltoad/vim-jade.git' +" Markdown +Plugin 'https://github.com/plasticboy/vim-markdown.git' +" TypeScript +Plugin 'https://github.com/HerringtonDarkholme/yats.vim' +" Orgmode +Plugin 'https://github.com/jceb/vim-orgmode' + +"Plugin 'https://github.com/othree/xml.vim' +"Plugin 'https://github.com/terryma/vim-multiple-cursors' +"Plugin 'https://github.com/motemen/git-vim' + +" }}} +call vundle#end() filetype plugin indent on +syntax on let g:template_dir=$HOME . "/.vim/templates" " }}} @@ -395,11 +465,6 @@ let NERDTreeAutoDeleteBuffer=1 let NERDTreeIgnore = [ '\.pyc$' ] " }}} -" Sparkup {{{ - -let g:sparkupNextMapping = '<c-s>' - -" }}} " Scratch {{{ function! ScratchToggle() |