Begin refactoring into layers

jeaye · Jun 4, 2016 · 0030e7e · 0030e7e
1 parent a782374
commit 0030e7e
Show file tree

Hide file tree

Showing 46 changed files with 40 additions and 54 deletions.
diff --git a/config/neobundle.vim b/config/neobundle.vim
diff --git a/config/airline.vim → layer/airline/config.vim b/config/airline.vim → layer/airline/config.vim
diff --git a/layer/airline/package.vim b/layer/airline/package.vim
diff --git a/config/buffer.vim → layer/buffer/config.vim b/config/buffer.vim → layer/buffer/config.vim
diff --git a/layer/buffer/package.vim b/layer/buffer/package.vim
diff --git a/config/c++.vim → layer/c++/config.vim b/config/c++.vim → layer/c++/config.vim
diff --git a/layer/c++/package.vim b/layer/c++/package.vim
diff --git a/config/clojure.vim → layer/clojure/config.vim b/config/clojure.vim → layer/clojure/config.vim
diff --git a/layer/clojure/package.vim b/layer/clojure/package.vim
diff --git a/config/color.vim → layer/color/config.vim b/config/color.vim → layer/color/config.vim
diff --git a/layer/color/package.vim b/layer/color/package.vim
diff --git a/config/color_coded.vim → layer/color_coded/config.vim b/config/color_coded.vim → layer/color_coded/config.vim
diff --git a/layer/color_coded/package.vim b/layer/color_coded/package.vim
diff --git a/config/completion.vim → layer/completion/config.vim b/config/completion.vim → layer/completion/config.vim
diff --git a/layer/completion/package.vim b/layer/completion/package.vim
diff --git a/config/debug.vim → layer/debug/config.vim b/config/debug.vim → layer/debug/config.vim
diff --git a/layer/debug/package.vim b/layer/debug/package.vim
diff --git a/config/f-sharp.vim → layer/f-sharp/config.vim b/config/f-sharp.vim → layer/f-sharp/config.vim
diff --git a/layer/f-sharp/package.vim b/layer/f-sharp/package.vim
diff --git a/config/git.vim → layer/git/config.vim b/config/git.vim → layer/git/config.vim
diff --git a/layer/git/package.vim b/layer/git/package.vim
diff --git a/config/indent.vim → layer/indent/config.vim b/config/indent.vim → layer/indent/config.vim
diff --git a/layer/indent/package.vim b/layer/indent/package.vim
diff --git a/config/jank.vim → layer/jank/config.vim b/config/jank.vim → layer/jank/config.vim
diff --git a/layer/jank/package.vim b/layer/jank/package.vim
diff --git a/config/lisp.vim → layer/lisp/config.vim b/config/lisp.vim → layer/lisp/config.vim
diff --git a/layer/lisp/package.vim b/layer/lisp/package.vim
diff --git a/config/markdown.vim → layer/markdown/config.vim b/config/markdown.vim → layer/markdown/config.vim
diff --git a/layer/markdown/package.vim b/layer/markdown/package.vim
diff --git a/config/motion.vim → layer/motion/config.vim b/config/motion.vim → layer/motion/config.vim
diff --git a/layer/motion/package.vim b/layer/motion/package.vim
diff --git a/config/mutt.vim → layer/mutt/config.vim b/config/mutt.vim → layer/mutt/config.vim
diff --git a/layer/mutt/package.vim b/layer/mutt/package.vim
diff --git a/layer/neobundle/config.vim b/layer/neobundle/config.vim
@@ -0,0 +1,38 @@
+" Install NeoBundle, if it doesn't exist
+" Credit: https://github.com/tony/vim-config
+"let neobundle_readme=expand('~/.vim/bundle/neobundle.vim/README.md')
+"if !filereadable(neobundle_readme)
+"  echo "Installing neobundle.vim"
+"  echo ""
+"  silent !mkdir -p ~/.vim/bundle
+"  silent !git clone https://github.com/Shougo/neobundle.vim ~/.vim/bundle/neobundle.vim
+"endif
+
+if has('vim_starting')
+  set runtimepath+=~/.vim/dein/repos/github.com/Shougo/dein.vim
+  "set runtimepath+=~/.vim/bundle/neobundle.vim/
+endif
+
+"call neobundle#begin(expand('~/.vim/bundle/'))
+"  NeoBundleFetch 'Shougo/neobundle.vim'
+"call neobundle#end()
+
+" Give big plugins a while to install
+"let g:neobundle#install_process_timeout = 1500
+
+call dein#begin(expand('~/.vim/dein'))
+  call dein#add('Shougo/dein.vim')
+  call dein#add('Shougo/vimproc.vim', {
+      \ 'build': {
+      \     'mac': 'make -f make_mac.mak',
+      \     'linux': 'make',
+      \     'unix': 'gmake',
+      \    },
+      \ })
+
+  let files = globpath($HOME . "/.vim/config", "**/package.vim")
+  for f in split(files, "\n")
+    echom "Loading layer" f
+    exe "source" f
+  endfor
+call dein#end()
diff --git a/layer/neobundle/package.vim b/layer/neobundle/package.vim
diff --git a/config/nix.vim → layer/nix/config.vim b/config/nix.vim → layer/nix/config.vim
diff --git a/layer/nix/package.vim b/layer/nix/package.vim
diff --git a/config/save.vim → layer/save/config.vim b/config/save.vim → layer/save/config.vim
diff --git a/layer/save/package.vim b/layer/save/package.vim
diff --git a/config/search.vim → layer/search/config.vim b/config/search.vim → layer/search/config.vim
diff --git a/layer/search/package.vim b/layer/search/package.vim
diff --git a/config/shell.vim → layer/shell/config.vim b/config/shell.vim → layer/shell/config.vim
diff --git a/layer/shell/package.vim b/layer/shell/package.vim
diff --git a/config/ui.vim → layer/ui/config.vim b/config/ui.vim → layer/ui/config.vim
diff --git a/layer/ui/package.vim b/layer/ui/package.vim
diff --git a/vimrc b/vimrc
@@ -5,40 +5,8 @@ set nocompatible
 
 let g:hostname = substitute(system('hostname'), "\n", "", "")
 let g:lightweight = g:hostname == "nixums"
-let g:python_host_prog='/usr/bin/python'
+let g:python_host_prog='/usr/bin/python' " TODO: neovim layer
 
-source $HOME/.vim/config/debug.vim
-source $HOME/.vim/config/neobundle.vim
-source $HOME/.vim/config/color.vim
-source $HOME/.vim/config/ui.vim
-source $HOME/.vim/config/indent.vim
-source $HOME/.vim/config/save.vim
-source $HOME/.vim/config/airline.vim
-source $HOME/.vim/config/search.vim
-source $HOME/.vim/config/motion.vim
-source $HOME/.vim/config/git.vim
-source $HOME/.vim/config/mutt.vim
-source $HOME/.vim/config/jank.vim
-source $HOME/.vim/config/markdown.vim
-source $HOME/.vim/config/nix.vim
-source $HOME/.vim/config/buffer.vim
-
-if !g:lightweight
-  source $HOME/.vim/config/completion.vim
-  source $HOME/.vim/config/color_coded.vim
-  source $HOME/.vim/config/lisp.vim
-  source $HOME/.vim/config/clojure.vim
-  source $HOME/.vim/config/c++.vim
-  source $HOME/.vim/config/shell.vim
-  source $HOME/.vim/config/f-sharp.vim
-endif
-
-" Prompt to install missing bundles
-NeoBundleCheck
-
-if !has('vim_starting')
-  " Call on_source hook when reloading .vimrc.
-  call neobundle#call_hook('on_source')
-endif
+source $HOME/.vim/config/neobundle/config.vim
 
 filetype plugin indent on