From 1f018167a4ea13b3704f978e821ead62a27985ab Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Fri, 27 Oct 2017 09:06:39 -0700 Subject: reorganize --- .gitmodules | 34 ++++++++++++++++----------------- vim/ftplugin/terraform.vim | 1 + vim/pack/filetype/start/ft-bzl | 1 + vim/pack/filetype/start/git | 1 + vim/pack/filetype/start/go | 1 + vim/pack/filetype/start/ledger | 1 + vim/pack/filetype/start/perl | 1 + vim/pack/filetype/start/puppet | 1 + vim/pack/filetype/start/rust | 1 + vim/pack/filetype/start/terraform | 1 + vim/pack/local/start/airline | 1 - vim/pack/local/start/ale | 1 - vim/pack/local/start/commentary | 1 - vim/pack/local/start/denite | 1 - vim/pack/local/start/ft-bzl | 1 - vim/pack/local/start/git | 1 - vim/pack/local/start/go | 1 - vim/pack/local/start/gundo | 1 - vim/pack/local/start/ledger | 1 - vim/pack/local/start/multiple-cursors | 1 - vim/pack/local/start/neosnippet | 1 - vim/pack/local/start/perl | 1 - vim/pack/local/start/puppet | 1 - vim/pack/local/start/rust | 1 - vim/pack/local/start/startify | 1 - vim/pack/local/start/terraform | 1 - vim/pack/local/start/textobj | 1 - vim/pack/plugins/start/airline | 1 + vim/pack/plugins/start/ale | 1 + vim/pack/plugins/start/commentary | 1 + vim/pack/plugins/start/denite | 1 + vim/pack/plugins/start/gundo | 1 + vim/pack/plugins/start/multiple-cursors | 1 + vim/pack/plugins/start/neosnippet | 1 + vim/pack/plugins/start/startify | 1 + vim/pack/plugins/start/textobj | 1 + vimrc | 10 ---------- 37 files changed, 35 insertions(+), 44 deletions(-) create mode 160000 vim/pack/filetype/start/ft-bzl create mode 160000 vim/pack/filetype/start/git create mode 160000 vim/pack/filetype/start/go create mode 160000 vim/pack/filetype/start/ledger create mode 160000 vim/pack/filetype/start/perl create mode 160000 vim/pack/filetype/start/puppet create mode 160000 vim/pack/filetype/start/rust create mode 160000 vim/pack/filetype/start/terraform delete mode 160000 vim/pack/local/start/airline delete mode 160000 vim/pack/local/start/ale delete mode 160000 vim/pack/local/start/commentary delete mode 160000 vim/pack/local/start/denite delete mode 160000 vim/pack/local/start/ft-bzl delete mode 160000 vim/pack/local/start/git delete mode 160000 vim/pack/local/start/go delete mode 160000 vim/pack/local/start/gundo delete mode 160000 vim/pack/local/start/ledger delete mode 160000 vim/pack/local/start/multiple-cursors delete mode 160000 vim/pack/local/start/neosnippet delete mode 160000 vim/pack/local/start/perl delete mode 160000 vim/pack/local/start/puppet delete mode 160000 vim/pack/local/start/rust delete mode 160000 vim/pack/local/start/startify delete mode 160000 vim/pack/local/start/terraform delete mode 160000 vim/pack/local/start/textobj create mode 160000 vim/pack/plugins/start/airline create mode 160000 vim/pack/plugins/start/ale create mode 160000 vim/pack/plugins/start/commentary create mode 160000 vim/pack/plugins/start/denite create mode 160000 vim/pack/plugins/start/gundo create mode 160000 vim/pack/plugins/start/multiple-cursors create mode 160000 vim/pack/plugins/start/neosnippet create mode 160000 vim/pack/plugins/start/startify create mode 160000 vim/pack/plugins/start/textobj diff --git a/.gitmodules b/.gitmodules index 99c6dba..6f5cd94 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,16 +2,16 @@ path = vim/bundle/fuzzyfinder url = git://github.com/vim-scripts/FuzzyFinder [submodule "vim/bundle/git"] - path = vim/pack/local/start/git + path = vim/pack/filetype/start/git url = git://github.com/tpope/vim-git [submodule "vim/bundle/gundo"] - path = vim/pack/local/start/gundo + path = vim/pack/plugins/start/gundo url = git://github.com/sjl/gundo.vim [submodule "vim/bundle/l9"] path = vim/bundle/l9 url = git://github.com/vim-scripts/L9 [submodule "vim/bundle/perl"] - path = vim/pack/local/start/perl + path = vim/pack/filetype/start/perl url = git://github.com/vim-perl/vim-perl [submodule "vim/bundle/snipmate"] path = vim/bundle/snipmate @@ -20,7 +20,7 @@ path = vim/bundle/supertab url = git://github.com/ervandew/supertab [submodule "vim/bundle/textobj"] - path = vim/pack/local/start/textobj + path = vim/pack/plugins/start/textobj url = git://github.com/doy/vim-textobj [submodule "zsh/zsh-syntax-highlighting"] path = zsh/zsh-syntax-highlighting @@ -32,16 +32,16 @@ path = vim/bundle/addon-mw-utils url = git://github.com/MarcWeber/vim-addon-mw-utils [submodule "vim/bundle/startify"] - path = vim/pack/local/start/startify + path = vim/pack/plugins/start/startify url = git://github.com/mhinz/vim-startify [submodule "vim/bundle/airline"] - path = vim/pack/local/start/airline + path = vim/pack/plugins/start/airline url = git://github.com/bling/vim-airline [submodule "vim/bundle/neocomplete"] path = vim/bundle/neocomplete url = git://github.com/Shougo/neocomplete.vim [submodule "vim/bundle/neosnippet"] - path = vim/pack/local/start/neosnippet + path = vim/pack/plugins/start/neosnippet url = git://github.com/Shougo/neosnippet.vim [submodule "zsh/opp"] path = zsh/opp @@ -53,16 +53,16 @@ path = vim/bundle/julia url = git://github.com/JuliaLang/julia-vim [submodule "vim/bundle/puppet"] - path = vim/pack/local/start/puppet + path = vim/pack/filetype/start/puppet url = git://github.com/rodjek/vim-puppet [submodule "vim/bundle/go"] - path = vim/pack/local/start/go + path = vim/pack/filetype/start/go url = git://github.com/fatih/vim-go [submodule "vim/bundle/rust"] - path = vim/pack/local/start/rust + path = vim/pack/filetype/start/rust url = git://github.com/rust-lang/rust.vim [submodule "vim/bundle/ft-bzl"] - path = vim/pack/local/start/ft-bzl + path = vim/pack/filetype/start/ft-bzl url = git://github.com/google/vim-ft-bzl [submodule "zsh/zsh-autosuggestions"] path = zsh/zsh-autosuggestions @@ -77,20 +77,20 @@ path = zsh/anyframe url = git://github.com/mollifier/anyframe [submodule "vim/bundle/ledger"] - path = vim/pack/local/start/ledger + path = vim/pack/filetype/start/ledger url = git://github.com/ledger/vim-ledger [submodule "vim/pack/local/start/denite"] - path = vim/pack/local/start/denite + path = vim/pack/plugins/start/denite url = git://github.com/Shougo/denite.nvim [submodule "vim/pack/local/start/ale"] - path = vim/pack/local/start/ale + path = vim/pack/plugins/start/ale url = git://github.com/w0rp/ale [submodule "vim/pack/local/start/multiple-cursors"] - path = vim/pack/local/start/multiple-cursors + path = vim/pack/plugins/start/multiple-cursors url = git://github.com/terryma/vim-multiple-cursors [submodule "vim/pack/local/start/terraform"] - path = vim/pack/local/start/terraform + path = vim/pack/filetype/start/terraform url = git://github.com/hashivim/vim-terraform [submodule "vim/pack/local/start/commentary"] - path = vim/pack/local/start/commentary + path = vim/pack/plugins/start/commentary url = git://github.com/tpope/vim-commentary diff --git a/vim/ftplugin/terraform.vim b/vim/ftplugin/terraform.vim index 463eea9..b296111 100644 --- a/vim/ftplugin/terraform.vim +++ b/vim/ftplugin/terraform.vim @@ -1 +1,2 @@ setlocal commentstring=#\ %s +let g:terraform_fmt_on_save = 1 diff --git a/vim/pack/filetype/start/ft-bzl b/vim/pack/filetype/start/ft-bzl new file mode 160000 index 0000000..d7cfe1c --- /dev/null +++ b/vim/pack/filetype/start/ft-bzl @@ -0,0 +1 @@ +Subproject commit d7cfe1c770e0c21f6341ba62c77af9f47258294f diff --git a/vim/pack/filetype/start/git b/vim/pack/filetype/start/git new file mode 160000 index 0000000..04c9a9d --- /dev/null +++ b/vim/pack/filetype/start/git @@ -0,0 +1 @@ +Subproject commit 04c9a9d1ce06ce8438e55db6c581e94344da3aa1 diff --git a/vim/pack/filetype/start/go b/vim/pack/filetype/start/go new file mode 160000 index 0000000..011dcad --- /dev/null +++ b/vim/pack/filetype/start/go @@ -0,0 +1 @@ +Subproject commit 011dcadc02358724ec9f675349b6d9065de8e2db diff --git a/vim/pack/filetype/start/ledger b/vim/pack/filetype/start/ledger new file mode 160000 index 0000000..0bce2fd --- /dev/null +++ b/vim/pack/filetype/start/ledger @@ -0,0 +1 @@ +Subproject commit 0bce2fd70da351c65d20cb5a1fec20ad3a2ab904 diff --git a/vim/pack/filetype/start/perl b/vim/pack/filetype/start/perl new file mode 160000 index 0000000..91163b5 --- /dev/null +++ b/vim/pack/filetype/start/perl @@ -0,0 +1 @@ +Subproject commit 91163b59af9702d11895d5944efc0cbbadcbeeae diff --git a/vim/pack/filetype/start/puppet b/vim/pack/filetype/start/puppet new file mode 160000 index 0000000..0d8ddd0 --- /dev/null +++ b/vim/pack/filetype/start/puppet @@ -0,0 +1 @@ +Subproject commit 0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e3 diff --git a/vim/pack/filetype/start/rust b/vim/pack/filetype/start/rust new file mode 160000 index 0000000..b6d88ad --- /dev/null +++ b/vim/pack/filetype/start/rust @@ -0,0 +1 @@ +Subproject commit b6d88adcf9867aa69f4d20d45d49bb54979842a4 diff --git a/vim/pack/filetype/start/terraform b/vim/pack/filetype/start/terraform new file mode 160000 index 0000000..2d9343c --- /dev/null +++ b/vim/pack/filetype/start/terraform @@ -0,0 +1 @@ +Subproject commit 2d9343c7165acbb6225017a9da8baf63bbd27a26 diff --git a/vim/pack/local/start/airline b/vim/pack/local/start/airline deleted file mode 160000 index a5d9a4b..0000000 --- a/vim/pack/local/start/airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a5d9a4bcb2a6e7c729bc460645b345b9bc7d4f5a diff --git a/vim/pack/local/start/ale b/vim/pack/local/start/ale deleted file mode 160000 index 81d9930..0000000 --- a/vim/pack/local/start/ale +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 81d993086eae20cd8d2871b62e8889e54cfa9187 diff --git a/vim/pack/local/start/commentary b/vim/pack/local/start/commentary deleted file mode 160000 index 89f43af..0000000 --- a/vim/pack/local/start/commentary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 89f43af18692d22ed999c3097e449f12fdd8b299 diff --git a/vim/pack/local/start/denite b/vim/pack/local/start/denite deleted file mode 160000 index 85e4eb7..0000000 --- a/vim/pack/local/start/denite +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 85e4eb72cc4cbbc73b1291c6ce8714503d890fa4 diff --git a/vim/pack/local/start/ft-bzl b/vim/pack/local/start/ft-bzl deleted file mode 160000 index d7cfe1c..0000000 --- a/vim/pack/local/start/ft-bzl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d7cfe1c770e0c21f6341ba62c77af9f47258294f diff --git a/vim/pack/local/start/git b/vim/pack/local/start/git deleted file mode 160000 index 04c9a9d..0000000 --- a/vim/pack/local/start/git +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 04c9a9d1ce06ce8438e55db6c581e94344da3aa1 diff --git a/vim/pack/local/start/go b/vim/pack/local/start/go deleted file mode 160000 index 011dcad..0000000 --- a/vim/pack/local/start/go +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 011dcadc02358724ec9f675349b6d9065de8e2db diff --git a/vim/pack/local/start/gundo b/vim/pack/local/start/gundo deleted file mode 160000 index 46c443e..0000000 --- a/vim/pack/local/start/gundo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 46c443ee9d5854320eb965a1fdee781ba83a070e diff --git a/vim/pack/local/start/ledger b/vim/pack/local/start/ledger deleted file mode 160000 index 0bce2fd..0000000 --- a/vim/pack/local/start/ledger +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0bce2fd70da351c65d20cb5a1fec20ad3a2ab904 diff --git a/vim/pack/local/start/multiple-cursors b/vim/pack/local/start/multiple-cursors deleted file mode 160000 index a97dab5..0000000 --- a/vim/pack/local/start/multiple-cursors +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a97dab5bc440bf0a7b62bb2de4479963a888f4ff diff --git a/vim/pack/local/start/neosnippet b/vim/pack/local/start/neosnippet deleted file mode 160000 index ddd01d0..0000000 --- a/vim/pack/local/start/neosnippet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ddd01d0ee3d965d9a30051f2e12b14234c83b3ae diff --git a/vim/pack/local/start/perl b/vim/pack/local/start/perl deleted file mode 160000 index 91163b5..0000000 --- a/vim/pack/local/start/perl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 91163b59af9702d11895d5944efc0cbbadcbeeae diff --git a/vim/pack/local/start/puppet b/vim/pack/local/start/puppet deleted file mode 160000 index 0d8ddd0..0000000 --- a/vim/pack/local/start/puppet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e3 diff --git a/vim/pack/local/start/rust b/vim/pack/local/start/rust deleted file mode 160000 index b6d88ad..0000000 --- a/vim/pack/local/start/rust +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b6d88adcf9867aa69f4d20d45d49bb54979842a4 diff --git a/vim/pack/local/start/startify b/vim/pack/local/start/startify deleted file mode 160000 index 7f910ed..0000000 --- a/vim/pack/local/start/startify +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7f910ed4367de96310fedc98d5a12b97173a405f diff --git a/vim/pack/local/start/terraform b/vim/pack/local/start/terraform deleted file mode 160000 index 2d9343c..0000000 --- a/vim/pack/local/start/terraform +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2d9343c7165acbb6225017a9da8baf63bbd27a26 diff --git a/vim/pack/local/start/textobj b/vim/pack/local/start/textobj deleted file mode 160000 index ede742d..0000000 --- a/vim/pack/local/start/textobj +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ede742dca0477d08edaaa14cc178bd80bd181126 diff --git a/vim/pack/plugins/start/airline b/vim/pack/plugins/start/airline new file mode 160000 index 0000000..a5d9a4b --- /dev/null +++ b/vim/pack/plugins/start/airline @@ -0,0 +1 @@ +Subproject commit a5d9a4bcb2a6e7c729bc460645b345b9bc7d4f5a diff --git a/vim/pack/plugins/start/ale b/vim/pack/plugins/start/ale new file mode 160000 index 0000000..81d9930 --- /dev/null +++ b/vim/pack/plugins/start/ale @@ -0,0 +1 @@ +Subproject commit 81d993086eae20cd8d2871b62e8889e54cfa9187 diff --git a/vim/pack/plugins/start/commentary b/vim/pack/plugins/start/commentary new file mode 160000 index 0000000..89f43af --- /dev/null +++ b/vim/pack/plugins/start/commentary @@ -0,0 +1 @@ +Subproject commit 89f43af18692d22ed999c3097e449f12fdd8b299 diff --git a/vim/pack/plugins/start/denite b/vim/pack/plugins/start/denite new file mode 160000 index 0000000..85e4eb7 --- /dev/null +++ b/vim/pack/plugins/start/denite @@ -0,0 +1 @@ +Subproject commit 85e4eb72cc4cbbc73b1291c6ce8714503d890fa4 diff --git a/vim/pack/plugins/start/gundo b/vim/pack/plugins/start/gundo new file mode 160000 index 0000000..46c443e --- /dev/null +++ b/vim/pack/plugins/start/gundo @@ -0,0 +1 @@ +Subproject commit 46c443ee9d5854320eb965a1fdee781ba83a070e diff --git a/vim/pack/plugins/start/multiple-cursors b/vim/pack/plugins/start/multiple-cursors new file mode 160000 index 0000000..a97dab5 --- /dev/null +++ b/vim/pack/plugins/start/multiple-cursors @@ -0,0 +1 @@ +Subproject commit a97dab5bc440bf0a7b62bb2de4479963a888f4ff diff --git a/vim/pack/plugins/start/neosnippet b/vim/pack/plugins/start/neosnippet new file mode 160000 index 0000000..ddd01d0 --- /dev/null +++ b/vim/pack/plugins/start/neosnippet @@ -0,0 +1 @@ +Subproject commit ddd01d0ee3d965d9a30051f2e12b14234c83b3ae diff --git a/vim/pack/plugins/start/startify b/vim/pack/plugins/start/startify new file mode 160000 index 0000000..7f910ed --- /dev/null +++ b/vim/pack/plugins/start/startify @@ -0,0 +1 @@ +Subproject commit 7f910ed4367de96310fedc98d5a12b97173a405f diff --git a/vim/pack/plugins/start/textobj b/vim/pack/plugins/start/textobj new file mode 160000 index 0000000..ede742d --- /dev/null +++ b/vim/pack/plugins/start/textobj @@ -0,0 +1 @@ +Subproject commit ede742dca0477d08edaaa14cc178bd80bd181126 diff --git a/vimrc b/vimrc index 52c3b23..5bb491f 100644 --- a/vimrc +++ b/vimrc @@ -219,9 +219,6 @@ nnoremap fh :Denite -direction=dynamictop help nnoremap ft :Denite -direction=dynamictop filetype nnoremap f/ :Denite -direction=dynamictop line " }}} -" ft-bzl -" git -" go " gundo {{{ if has("python") nnoremap U :silent GundoToggle @@ -231,7 +228,6 @@ else let g:gundo_disable = 1 endif " }}} -" ledger " multiple-cursors " neosnippet {{{ let g:neosnippet#snippets_directory = '~/.vim/snippets' @@ -253,14 +249,11 @@ smap \ "\(neosnippet_expand_or_jump)" : \ g:s_tab["expr"] ? eval(g:s_tab["rhs"]) : g:s_tab["rhs"] " }}} -" perl -" puppet " rainbow {{{ let g:rainbow = 1 let g:rainbow_paren = 1 let g:rainbow_brace = 1 " }}} -" rust " startify {{{ let g:startify_list_order = ['dir', 'bookmarks', 'commands'] let g:startify_files_number = 7 @@ -292,9 +285,6 @@ for s:file in [ '.gitignore', expand('~/.gitignore') ] endif endfor " }}} -" terraform {{{ -let g:terraform_fmt_on_save = 1 -" }}} " textobj {{{ let g:Textobj_defs = [ \['/', 'Textobj_paired', '/'], -- cgit v1.2.3-54-g00ecf