1 files changed, 10 insertions, 20 deletions

diff --git a/vim/init.vim b/vim/init.vim
index 031a0ed..adfd9d6 100644
--- a/vim/init.vim
+++ b/vim/init.vim
@@ -8,32 +8,22 @@ endif
 " Get current dir
 " let s:home = fnamemodify(resolve(expand('<sfile>:p')), ':h')
 let s:home = '~/helper/vim'
-execute 'cd '.s:home
-
-" Load script in current dir
-" command! -nargs=1 LoadScript exec 'source '.s:home.'/'.'<args>'
 
 " Add current dir into runtimepath
 execute 'set runtimepath+='.s:home
 
-"----------------------------------------------------------------------
-" Locad Scripts
-"----------------------------------------------------------------------
-
-" Basic configuration
-source init/basic.vim
-
-" Key mappings
-source init/keymaps.vim
+" Load script in home
+command! -nargs=1 LoadScript exec 'source '.s:home.'/'.'<args>'
 
-" Extra config for different contexts
-source init/config.vim
+" Gerneral scripts
+LoadScript init/basic.vim     " Basic configuration
+LoadScript init/keymaps.vim   " Key mappings
+LoadScript init/config.vim    " Extra config for different contexts
 
+" Different scripts for nvim and vim
 if has('nvim')
-  " For neovim
-  source lazy.lua
+  LoadScript lazy.lua
 else
-  " For vim
-  source init/plugins.vim
-  source init/style.vim
+  LoadScript init/plugins.vim
+  LoadScript init/style.vim
 endif