reorganize

20 files changed, 18 insertions, 27 deletions

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/local/start/ft-bzl b/vim/pack/filetype/start/ft-bzl
-Subproject d7cfe1c770e0c21f6341ba62c77af9f47258294
+Subproject d7cfe1c770e0c21f6341ba62c77af9f47258294
diff --git a/vim/pack/local/start/git b/vim/pack/filetype/start/git
-Subproject 04c9a9d1ce06ce8438e55db6c581e94344da3aa
+Subproject 04c9a9d1ce06ce8438e55db6c581e94344da3aa
diff --git a/vim/pack/local/start/go b/vim/pack/filetype/start/go
-Subproject 011dcadc02358724ec9f675349b6d9065de8e2d
+Subproject 011dcadc02358724ec9f675349b6d9065de8e2d
diff --git a/vim/pack/local/start/ledger b/vim/pack/filetype/start/ledger
-Subproject 0bce2fd70da351c65d20cb5a1fec20ad3a2ab90
+Subproject 0bce2fd70da351c65d20cb5a1fec20ad3a2ab90
diff --git a/vim/pack/local/start/perl b/vim/pack/filetype/start/perl
-Subproject 91163b59af9702d11895d5944efc0cbbadcbeea
+Subproject 91163b59af9702d11895d5944efc0cbbadcbeea
diff --git a/vim/pack/local/start/puppet b/vim/pack/filetype/start/puppet
-Subproject 0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e
+Subproject 0d8ddd0dc3b7c908a82a6f16fa61aade766cc7e
diff --git a/vim/pack/local/start/rust b/vim/pack/filetype/start/rust
-Subproject b6d88adcf9867aa69f4d20d45d49bb54979842a
+Subproject b6d88adcf9867aa69f4d20d45d49bb54979842a
diff --git a/vim/pack/local/start/terraform b/vim/pack/filetype/start/terraform
-Subproject 2d9343c7165acbb6225017a9da8baf63bbd27a2
+Subproject 2d9343c7165acbb6225017a9da8baf63bbd27a2
diff --git a/vim/pack/local/start/airline b/vim/pack/plugins/start/airline
-Subproject a5d9a4bcb2a6e7c729bc460645b345b9bc7d4f5
+Subproject a5d9a4bcb2a6e7c729bc460645b345b9bc7d4f5
diff --git a/vim/pack/local/start/ale b/vim/pack/plugins/start/ale
-Subproject 81d993086eae20cd8d2871b62e8889e54cfa918
+Subproject 81d993086eae20cd8d2871b62e8889e54cfa918
diff --git a/vim/pack/local/start/commentary b/vim/pack/plugins/start/commentary
-Subproject 89f43af18692d22ed999c3097e449f12fdd8b29
+Subproject 89f43af18692d22ed999c3097e449f12fdd8b29
diff --git a/vim/pack/local/start/denite b/vim/pack/plugins/start/denite
-Subproject 85e4eb72cc4cbbc73b1291c6ce8714503d890fa
+Subproject 85e4eb72cc4cbbc73b1291c6ce8714503d890fa
diff --git a/vim/pack/local/start/gundo b/vim/pack/plugins/start/gundo
-Subproject 46c443ee9d5854320eb965a1fdee781ba83a070
+Subproject 46c443ee9d5854320eb965a1fdee781ba83a070
diff --git a/vim/pack/local/start/multiple-cursors b/vim/pack/plugins/start/multiple-cursors
-Subproject a97dab5bc440bf0a7b62bb2de4479963a888f4f
+Subproject a97dab5bc440bf0a7b62bb2de4479963a888f4f
diff --git a/vim/pack/local/start/neosnippet b/vim/pack/plugins/start/neosnippet
-Subproject ddd01d0ee3d965d9a30051f2e12b14234c83b3a
+Subproject ddd01d0ee3d965d9a30051f2e12b14234c83b3a
diff --git a/vim/pack/local/start/startify b/vim/pack/plugins/start/startify
-Subproject 7f910ed4367de96310fedc98d5a12b97173a405
+Subproject 7f910ed4367de96310fedc98d5a12b97173a405
diff --git a/vim/pack/local/start/textobj b/vim/pack/plugins/start/textobj
-Subproject ede742dca0477d08edaaa14cc178bd80bd18112
+Subproject ede742dca0477d08edaaa14cc178bd80bd18112
diff --git a/vimrc b/vimrc
index 52c3b23..5bb491f 100644
--- a/vimrc
+++ b/vimrc
@@ -219,9 +219,6 @@ nnoremap <silent>fh :Denite -direction=dynamictop help<CR>
 nnoremap <silent>ft :Denite -direction=dynamictop filetype<CR>
 nnoremap <silent>f/ :Denite -direction=dynamictop line<CR>
 " }}}
-" ft-bzl
-" git
-" go
 " gundo {{{
 if has("python")
     nnoremap <silent>U :silent GundoToggle<CR>
@@ -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 <expr><Tab>
                 \ "\<Plug>(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', '/'],