Remove submodules

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644 (file)
index 692b38d..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,105 +0,0 @@
-[submodule "tpope/start/vim-commentary"]
-       path = pack/tpope/start/vim-commentary
-       url = https://github.com/tpope/vim-commentary.git
-[submodule "tpope/start/vim-repeat"]
-       path = pack/tpope/start/vim-repeat
-       url = https://github.com/tpope/vim-repeat.git
-[submodule "tpope/start/vim-surround"]
-       path = pack/tpope/start/vim-surround
-       url = https://github.com/tpope/vim-surround.git
-[submodule "tpope/start/vim-unimpaired"]
-       path = pack/tpope/start/vim-unimpaired
-       url = https://github.com/tpope/vim-unimpaired.git
-[submodule "tpope/start/vim-fugitive"]
-       path = pack/tpope/start/vim-fugitive
-       url = https://github.com/tpope/vim-fugitive.git
-[submodule "pack/snipmate/opt/vim-snipmate"]
-       path = pack/snippets/opt/vim-snipmate
-       url = https://github.com/garbas/vim-snipmate.git
-[submodule "pack/snipmate/opt/vim-addon-mw-utils"]
-       path = pack/snippets/opt/vim-addon-mw-utils
-       url = https://github.com/MarcWeber/vim-addon-mw-utils.git
-[submodule "pack/snipmate/opt/tlib_vim"]
-       path = pack/snippets/opt/tlib_vim
-       url = https://github.com/tomtom/tlib_vim.git
-[submodule "pack/snipmate/opt/vim-snippets"]
-       path = pack/snippets/opt/vim-snippets
-       url = https://github.com/honza/vim-snippets.git
-[submodule "pack/github/opt/vim-airline"]
-       path = pack/github/opt/vim-airline
-       url = https://github.com/vim-airline/vim-airline.git
-[submodule "pack/github/opt/tagbar"]
-       path = pack/github/opt/tagbar
-       url = https://github.com/majutsushi/tagbar.git
-[submodule "pack/github/opt/errormarker.vim"]
-       path = pack/async/opt/errormarker.vim
-       url = https://github.com/mh21/errormarker.vim.git
-[submodule "pack/github/opt/asyncrun.vim"]
-       path = pack/async/opt/asyncrun.vim
-       url = https://github.com/skywind3000/asyncrun.vim.git
-[submodule "pack/github/opt/incsearch.vim"]
-       path = pack/github/opt/incsearch.vim
-       url = https://github.com/haya14busa/incsearch.vim.git
-[submodule "pack/github/opt/ale"]
-       path = pack/async/opt/ale
-       url = https://github.com/w0rp/ale.git
-[submodule "pack/markdown/opt/vim-javascript"]
-       path = pack/markdown/opt/vim-javascript
-       url = https://github.com/pangloss/vim-javascript
-[submodule "pack/markdown/opt/vim-pandoc"]
-       path = pack/markdown/opt/vim-pandoc
-       url = https://github.com/vim-pandoc/vim-pandoc.git
-[submodule "pack/markdown/opt/vim-pandoc-syntax"]
-       path = pack/markdown/opt/vim-pandoc-syntax
-       url = https://github.com/vim-pandoc/vim-pandoc-syntax.git
-[submodule "pack/async/opt/completor.vim"]
-       path = pack/async/opt/completor.vim
-       url = https://github.com/maralla/completor.vim.git
-[submodule "pack/async/opt/validator.vim"]
-       path = pack/async/opt/validator.vim
-       url = https://github.com/maralla/validator.vim.git
-[submodule "pack/syntax/opt/vim-syntax-extra"]
-       path = pack/markdown/opt/vim-syntax-extra
-       url = https://github.com/justinmk/vim-syntax-extra.git
-[submodule "pack/github/opt/supertab"]
-       path = pack/github/opt/supertab
-       url = https://github.com/ervandew/supertab.git
-[submodule "pack/github/opt/pick.vim"]
-       path = pack/github/opt/pick.vim
-       url = https://github.com/calleerlandsson/pick.vim.git
-[submodule "pack/github/opt/Tortoise-Typing"]
-       path = pack/github/opt/Tortoise-Typing
-       url = https://github.com/thanthese/Tortoise-Typing.git
-[submodule "pack/async/opt/mesonic"]
-       path = pack/async/opt/mesonic
-       url = https://github.com/igankevich/mesonic.git
-[submodule "pack/shougo/nvim-yarp"]
-       path = pack/shougo/opt/nvim-yarp
-       url = https://github.com/roxma/nvim-yarp.git
-[submodule "pack/shougo/start/deoplete.nvim"]
-       path = pack/shougo/opt/deoplete.nvim
-       url = https://github.com/Shougo/deoplete.nvim.git
-[submodule "pack/shougo/start/vim-hug-neovim-rpc"]
-       path = pack/shougo/opt/vim-hug-neovim-rpc
-       url = https://github.com/roxma/vim-hug-neovim-rpc.git
-[submodule "pack/async/start/gen_tags.vim"]
-       path = pack/async/opt/gen_tags.vim
-       url = https://github.com/jsfaint/gen_tags.vim.git
-[submodule "pack/markdown/start/open-browser.vim"]
-       path = pack/markdown/start/open-browser.vim
-       url = https://github.com/tyru/open-browser.vim.git
-[submodule "pack/markdown/start/vim-markdown"]
-       path = pack/markdown/start/vim-markdown
-       url = https://github.com/plasticboy/vim-markdown.git
-[submodule "pack/markdown/start/previm"]
-       path = pack/markdown/start/previm
-       url = https://github.com/previm/previm.git
-[submodule "pack/async/start/LeaderF"]
-       path = pack/async/start/LeaderF
-       url = https://github.com/Yggdroot/LeaderF.git
-[submodule "pack/tpope/start/vim-vinegar"]
-       path = pack/tpope/start/vim-vinegar
-       url = https://github.com/manasthakur/vim-vinegar.git
-[submodule "pack/github/start/vifm.vim"]
-       path = pack/github/start/vifm.vim
-       url = https://github.com/vifm/vifm.vim.git

diff --git a/pack/async/opt/ale b/pack/async/opt/ale
deleted file mode 160000 (submodule)
index 589c8db..0000000
--- a/pack/async/opt/ale
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 589c8dbd94929a63006c5fee372e022f0f2b8417

diff --git a/pack/async/opt/asyncrun.vim b/pack/async/opt/asyncrun.vim
deleted file mode 160000 (submodule)
index a81b997..0000000
--- a/pack/async/opt/asyncrun.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a81b9972337c61a28786e71ca87e84fa6a756ec7

diff --git a/pack/async/opt/completor.vim b/pack/async/opt/completor.vim
deleted file mode 160000 (submodule)
index d404cea..0000000
--- a/pack/async/opt/completor.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d404ceaa8c9ca6e60f8729d9d6ff94c3ceeb43f2

diff --git a/pack/async/opt/errormarker.vim b/pack/async/opt/errormarker.vim
deleted file mode 160000 (submodule)
index 66ab8e0..0000000
--- a/pack/async/opt/errormarker.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 66ab8e0a356ea8a971e99156c59d09c3beae5ef2

diff --git a/pack/async/opt/gen_tags.vim b/pack/async/opt/gen_tags.vim
deleted file mode 160000 (submodule)
index 6a12af0..0000000
--- a/pack/async/opt/gen_tags.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6a12af043a0790b4678c18e950f71d05d58048fb

diff --git a/pack/async/opt/mesonic b/pack/async/opt/mesonic
deleted file mode 160000 (submodule)
index 6db72c3..0000000
--- a/pack/async/opt/mesonic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6db72c3d1a5c4bb0779a1250dd5f97c96ab202b1

diff --git a/pack/async/opt/validator.vim b/pack/async/opt/validator.vim
deleted file mode 160000 (submodule)
index 531347a..0000000
--- a/pack/async/opt/validator.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 531347abf30d52b8dde02be975e2f9c3cbe8dd4e

diff --git a/pack/async/start/LeaderF b/pack/async/start/LeaderF
deleted file mode 160000 (submodule)
index 73444bb..0000000
--- a/pack/async/start/LeaderF
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 73444bba61483af13fbd20ab2944c65f96640d5d

diff --git a/pack/github/opt/Tortoise-Typing b/pack/github/opt/Tortoise-Typing
deleted file mode 160000 (submodule)
index 3ec01ed..0000000
--- a/pack/github/opt/Tortoise-Typing
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3ec01ed3ff192620194e538670ed331d658e7f13

diff --git a/pack/github/opt/incsearch.vim b/pack/github/opt/incsearch.vim
deleted file mode 160000 (submodule)
index 25e2547..0000000
--- a/pack/github/opt/incsearch.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 25e2547fb0566460f5999024f7a0de7b3775201f

diff --git a/pack/github/opt/pick.vim b/pack/github/opt/pick.vim
deleted file mode 160000 (submodule)
index c59841c..0000000
--- a/pack/github/opt/pick.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c59841c9fffdcf96c4ee3a3564dd447ab612b919

diff --git a/pack/github/opt/supertab b/pack/github/opt/supertab
deleted file mode 160000 (submodule)
index 40fe711..0000000
--- a/pack/github/opt/supertab
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172

diff --git a/pack/github/opt/tagbar b/pack/github/opt/tagbar
deleted file mode 160000 (submodule)
index 387bbad..0000000
--- a/pack/github/opt/tagbar
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 387bbadda98e1376ff3871aa461b1f0abd4ece70

diff --git a/pack/github/opt/vim-airline b/pack/github/opt/vim-airline
deleted file mode 160000 (submodule)
index c7fb175..0000000
--- a/pack/github/opt/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c7fb175d3565159699885653767214a6aa583ea4

diff --git a/pack/github/start/vifm.vim b/pack/github/start/vifm.vim
deleted file mode 160000 (submodule)
index 669a9fc..0000000
--- a/pack/github/start/vifm.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 669a9fcc42fb9cbd7172d0b9ef46521c32c0459d

diff --git a/pack/markdown/opt/vim-javascript b/pack/markdown/opt/vim-javascript
deleted file mode 160000 (submodule)
index 39e332a..0000000
--- a/pack/markdown/opt/vim-javascript
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 39e332a3c36c0115e1eab85c34cf121b7585869d

diff --git a/pack/markdown/opt/vim-pandoc b/pack/markdown/opt/vim-pandoc
deleted file mode 160000 (submodule)
index 0060e5c..0000000
--- a/pack/markdown/opt/vim-pandoc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0060e5c6ac9e4a2391e8a36359dcbbb5827978cb

diff --git a/pack/markdown/opt/vim-pandoc-syntax b/pack/markdown/opt/vim-pandoc-syntax
deleted file mode 160000 (submodule)
index 56e8e41..0000000
--- a/pack/markdown/opt/vim-pandoc-syntax
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3

diff --git a/pack/markdown/opt/vim-syntax-extra b/pack/markdown/opt/vim-syntax-extra
deleted file mode 160000 (submodule)
index 2290b72..0000000
--- a/pack/markdown/opt/vim-syntax-extra
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2290b72ba48c808d741db300110944a484b8ee9c

diff --git a/pack/markdown/start/open-browser.vim b/pack/markdown/start/open-browser.vim
deleted file mode 160000 (submodule)
index de4eeb0..0000000
--- a/pack/markdown/start/open-browser.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit de4eeb085051e9b56dd5574eba7c7e72feb21246

diff --git a/pack/markdown/start/previm b/pack/markdown/start/previm
deleted file mode 160000 (submodule)
index 6ab010b..0000000
--- a/pack/markdown/start/previm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6ab010bd5a76afcd3772559bc78e76edcd0107d0

diff --git a/pack/markdown/start/vim-markdown b/pack/markdown/start/vim-markdown
deleted file mode 160000 (submodule)
index f19506b..0000000
--- a/pack/markdown/start/vim-markdown
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f19506b1bfe5e60c39581dd53f6913a09385f5dd

diff --git a/pack/shougo/opt/deoplete.nvim b/pack/shougo/opt/deoplete.nvim
deleted file mode 160000 (submodule)
index 57ae326..0000000
--- a/pack/shougo/opt/deoplete.nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 57ae32605a786fbb2c88bd5c7427dec41df0e209

diff --git a/pack/shougo/opt/nvim-yarp b/pack/shougo/opt/nvim-yarp
deleted file mode 160000 (submodule)
index 52317ce..0000000
--- a/pack/shougo/opt/nvim-yarp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 52317ced0e16f226f0d44878917d0b5f4657b4d4

diff --git a/pack/shougo/opt/vim-hug-neovim-rpc b/pack/shougo/opt/vim-hug-neovim-rpc
deleted file mode 160000 (submodule)
index 4ee5d81..0000000
--- a/pack/shougo/opt/vim-hug-neovim-rpc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4ee5d8119458d82e5e7840cff377d38002c5d844

diff --git a/pack/snippets/opt/tlib_vim b/pack/snippets/opt/tlib_vim
deleted file mode 160000 (submodule)
index ced8f3e..0000000
--- a/pack/snippets/opt/tlib_vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b

diff --git a/pack/snippets/opt/vim-addon-mw-utils b/pack/snippets/opt/vim-addon-mw-utils
deleted file mode 160000 (submodule)
index 295862b..0000000
--- a/pack/snippets/opt/vim-addon-mw-utils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 295862ba6be47ec3b11b6c85c10d982ffd9bc0b2

diff --git a/pack/snippets/opt/vim-snipmate b/pack/snippets/opt/vim-snipmate
deleted file mode 160000 (submodule)
index a9802f2..0000000
--- a/pack/snippets/opt/vim-snipmate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a9802f2351910f64b70fb10b63651e6ff6b8125e

diff --git a/pack/snippets/opt/vim-snippets b/pack/snippets/opt/vim-snippets
deleted file mode 160000 (submodule)
index 1143432..0000000
--- a/pack/snippets/opt/vim-snippets
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1143432afdb3a97b606b081700eead5b4f499d4d

diff --git a/pack/tpope/start/vim-commentary b/pack/tpope/start/vim-commentary
deleted file mode 160000 (submodule)
index 141d9d3..0000000
--- a/pack/tpope/start/vim-commentary
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a

diff --git a/pack/tpope/start/vim-fugitive b/pack/tpope/start/vim-fugitive
deleted file mode 160000 (submodule)
index 84fcfae..0000000
--- a/pack/tpope/start/vim-fugitive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 84fcfae7f019f41f95b3ea885033346e6e66cbc3

diff --git a/pack/tpope/start/vim-repeat b/pack/tpope/start/vim-repeat
deleted file mode 160000 (submodule)
index 43d2678..0000000
--- a/pack/tpope/start/vim-repeat
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 43d2678fa59d068c815d8298331c195e850ff5a7

diff --git a/pack/tpope/start/vim-surround b/pack/tpope/start/vim-surround
deleted file mode 160000 (submodule)
index 5970688..0000000
--- a/pack/tpope/start/vim-surround
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 597068870b8f093a8b2d11536c62ff31222ee8d0

diff --git a/pack/tpope/start/vim-unimpaired b/pack/tpope/start/vim-unimpaired
deleted file mode 160000 (submodule)
index d632599..0000000
--- a/pack/tpope/start/vim-unimpaired
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d6325994b3c16ce36fd494c47dae4dab8d21a3da

diff --git a/pack/tpope/start/vim-vinegar b/pack/tpope/start/vim-vinegar
deleted file mode 160000 (submodule)
index b4f81f7..0000000
--- a/pack/tpope/start/vim-vinegar
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b4f81f7b3873729c95a817a28e6ad4471d60fd2f

diff --git a/vimrc b/vimrc
index 56b0562e166c700bf4a0b34c201c475b8ceace23..dcd8de7e1654382e0f7fbb6e9d05fb3bd413d336 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -4,9 +4,10 @@ filetype plugin indent on
 syntax on
 
 " indentation
-set expandtab
-set shiftwidth=2
 set softtabstop=2
+set shiftwidth=2
+set tabstop=4 
+set expandtab
 set autoindent
 set copyindent
 set smarttab
@@ -144,6 +145,7 @@ tnoremap <C-l>              <C-\><C-n><C-w>l
 " Normal Mode
 nnoremap n                        nzzzv
 nnoremap N                        Nzzzv
+nnoremap g=                       gg=Gg``
 nnoremap <silent><leader>+        :exe "resize " . (winheight(0) * 3/2)<cr>
 nnoremap <silent><leader>-        :exe "resize " . (winheight(0) * 2/3)<cr>
 nnoremap <silent><leader>hs       :noh<cr>
@@ -203,134 +205,174 @@ endfunction
 " Autocommands
 if has('autocmd')
   augroup filetypes 
-  autocmd!
-  autocmd BufNewFile,BufRead *.{md,mdwn,mkd,mkdn,mark*} set filetype=markdown
-  autocmd BufNewfile,BufRead *.gradle                   set filetype=groovy
-  autocmd BufNewfile,BufRead *.json                     set filetype=json
-  autocmd BufNewfile,BufRead *.yml                      set filetype=yaml
+    autocmd!
+    autocmd BufNewFile,BufRead *.{md,mdwn,mkd,mkdn,mark*} set filetype=markdown
+    autocmd BufNewfile,BufRead *.gradle                   set filetype=groovy
+    autocmd BufNewfile,BufRead *.json                     set filetype=json
+    autocmd BufNewfile,BufRead *.yml                      set filetype=yaml
   augroup end
 
   augroup formats
-  autocmd!
-  autocmd FileType c      setlocal expandtab softtabstop=2 shiftwidth=2
-  autocmd FileType cpp    setlocal expandtab softtabstop=2 shiftwidth=2
-  autocmd FileType make   setlocal noexpandtab   tabstop=8 shiftwidth=8
-  autocmd FileType python setlocal expandtab softtabstop=4 shiftwidth=4
-        \ formatoptions+=croq colorcolumn=79
-        \ cinwords=if,elif,else,for,while,try,except,finally,def,class,with
-  autocmd FileType netrw  setlocal bufhidden=wipe
+    autocmd!
+    autocmd FileType c      setlocal expandtab softtabstop=2 shiftwidth=2
+    autocmd FileType cpp    setlocal expandtab softtabstop=2 shiftwidth=2
+    autocmd FileType make   setlocal noexpandtab   tabstop=8 shiftwidth=8
+    autocmd FileType python setlocal expandtab softtabstop=4 shiftwidth=4
+          \ formatoptions+=croq colorcolumn=79
+          \ cinwords=if,elif,else,for,while,try,except,finally,def,class,with
+    autocmd FileType netrw  setlocal bufhidden=wipe
   augroup end
 
   augroup saveall
-  autocmd!
-  autocmd FocusLost * silent! wa
+    autocmd!
+    autocmd FocusLost * silent! wa
   augroup end
 
   augroup numbers
-  autocmd!
-  autocmd BufEnter,FocusGained,InsertLeave * set relativenumber
-  autocmd BufLeave,FocusLost,InsertEnter   * set norelativenumber
+    autocmd!
+    autocmd BufEnter,FocusGained,InsertLeave * set relativenumber
+    autocmd BufLeave,FocusLost,InsertEnter   * set norelativenumber
   augroup end
 
   augroup vimrc
-  autocmd!
-  autocmd BufWritePost vimrc,gvimrc,vimrc.local source $MYVIMRC
+    autocmd!
+    autocmd BufWritePost vimrc,gvimrc,vimrc.local source $MYVIMRC
   augroup end
 
   augroup quickfix
-  autocmd!
-"  autocmd QuickFixCmdPost [^l]* nested cwindow
-"  autocmd QuickFixCmdPost l*    nested lwindow 
-  autocmd QuickFixCmdPost * call asyncrun#quickfix_toggle(8, 1)
+    autocmd!
+    "  autocmd QuickFixCmdPost [^l]* nested cwindow
+    "  autocmd QuickFixCmdPost l*    nested lwindow 
+    autocmd QuickFixCmdPost * call asyncrun#quickfix_toggle(8, 1)
   augroup end
 endif
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" minpac 
+packadd minpac
+if exists('*minpac#init')
+call minpac#init()
+call minpac#add('k-takata/minpac', {'type': 'opt'})
+call minpac#add('tpope/vim-surround', {'type': 'opt'})
+call minpac#add('tpope/vim-commentary', {'type': 'opt'})
+call minpac#add('tpope/vim-fugitive', {'type': 'opt'})
+call minpac#add('tpope/vim-repeat', {'type': 'opt'})
+call minpac#add('tpope/vim-unimpaired', {'type': 'opt'})
+call minpac#add('manasthakur/vim-vinager', {'type': 'opt'})
+call minpac#add('igankevich/mesonic', {'type': 'opt'})
+call minpac#add('ervandew/supertab', {'type': 'opt'})
+call minpac#add('majutsushi/tagbar', {'type': 'opt'})
+call minpac#add('vim-airline/vim-airline', {'type': 'opt'})
+
+endif
+packloadall
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Tpope 
+packadd! vim-surround
+packadd! vim-unimpaired
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Airline
 packadd! vim-airline
 
 let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
+let g:airline#extensions#ale#enabled = 1
+let g:airline_section_error = airline#section#create_right(['%{g:asyncrun_status}'])
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " ALE
-packadd! ale
+"packadd! ale
 let g:ale_enabled = 1
-let g:airline#extensions#ale#enabled = 1
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Tagbar
-packadd! tagbar
+"packadd! tagbar
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Gtags-Cscope
 if executable('global')
-packadd! gen_tags.vim
-let GtagsCscope_Auto_Map = 1
-let GtagsCscope_Ignore_Case = 1
-let GtagsCscope_Absolute_Path = 1
-let GtagsCscope_Keep_Alive = 1
-let GtagsCscope_Auto_Load = 1
-let GtagsCscope_Quiet = 1
-set csprg=gtags-cscope
-set cscopetag
+"  packadd! gen_tags.vim
+  let GtagsCscope_Auto_Map = 1
+  let GtagsCscope_Ignore_Case = 1
+  let GtagsCscope_Absolute_Path = 1
+  let GtagsCscope_Keep_Alive = 1
+  let GtagsCscope_Auto_Load = 1
+  let GtagsCscope_Quiet = 1
+  set csprg=gtags-cscope
+  set cscopetag
 endif
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Async shell commands
-packadd asyncrun.vim
+"packadd asyncrun.vim
 let g:asyncrun_open = 8
 let g:asyncrun_status = "" 
-let g:airline_section_error = airline#section#create_right(['%{g:asyncrun_status}'])
 let g:asyncrun_auto = "make"
 command! -bang -nargs=* -complete=file Make AsyncRun -program=make @ <args>
 command! -bang -nargs=* -complete=file Grep AsyncRun -program=grep @ <args>
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Error markers
-packadd errormarker.vim
+"packadd errormarker.vim
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Meson build system
-packadd mesonic
+"packadd mesonic
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Snippets 
-packadd tlib_vim 
-packadd vim-addon-mw-utils
-packadd vim-snipmate
-packadd vim-snippets 
+"packadd tlib_vim 
+"packadd vim-addon-mw-utils
+"packadd vim-snipmate
+"packadd vim-snippets 
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " stock vim 
-packadd! matchit
-packadd! vim-syntax-extra
+"packadd! matchit
+"packadd! vim-syntax-extra
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " supertab
 packadd supertab
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Jedi (python)
 "packadd jedi-vim
 "let g:polyglot_disabled = ['python']
 "let python_highlight_all = 1
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " completor (python)
 "packadd completor.vim
 "let g:completor_clang_binary = '/usr/bin/clang'
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " validator (python)
 "packadd validator.vim
 "let g:completor_clang_tidy_binary = '/usr/bin/run-clang-tidy'
 "let g:validator_c_checkers = ['clang-tidy']
 "let g:validator_cpp_checkers = ['clang-tidy']
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " markdown 
 "packadd vim-pandoc
 "packadd vim-pandoc-syntax
-packadd vim-javascript
-packadd vim-markdown
+"packadd vim-javascript
+"packadd vim-markdown
+"packadd previm
 let g:previm_enable_realtime = 1
 nnoremap <silent><Leader>md :PrevimOpen<cr>
 nnoremap <silent><Leader>pd :call Pandoc_Preview()<CR>
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " deoplete
 set pyx=3
 set pyxversion=3
 set encoding=utf-8
 let g:deoplete#enable_at_startup = 1
 
-packloadall
 silent! helptags ALL
 
 " local settings