diff options
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | vim/init.vim (renamed from vim/nvim/init.vim) | 0 | ||||
-rw-r--r-- | vim/lazy.lua (renamed from vim/nvim/lazy.lua) | 0 | ||||
-rw-r--r-- | vim/lua/chadrc.lua (renamed from vim/nvim/lua/chadrc.lua) | 0 | ||||
-rw-r--r-- | vim/lua/configs/conform.lua (renamed from vim/nvim/lua/configs/conform.lua) | 0 | ||||
-rw-r--r-- | vim/lua/configs/lazy.lua (renamed from vim/nvim/lua/configs/lazy.lua) | 0 | ||||
-rw-r--r-- | vim/lua/configs/lspconfig.lua (renamed from vim/nvim/lua/configs/lspconfig.lua) | 0 | ||||
-rw-r--r-- | vim/lua/configs/telescope.lua (renamed from vim/nvim/lua/configs/telescope.lua) | 0 | ||||
-rw-r--r-- | vim/lua/configs/treesitter.lua (renamed from vim/nvim/lua/configs/treesitter.lua) | 0 | ||||
-rw-r--r-- | vim/lua/mappings.lua (renamed from vim/nvim/lua/mappings.lua) | 0 | ||||
-rw-r--r-- | vim/lua/options.lua (renamed from vim/nvim/lua/options.lua) | 0 | ||||
-rw-r--r-- | vim/lua/plugins/init.lua (renamed from vim/nvim/lua/plugins/init.lua) | 0 | ||||
-rw-r--r-- | vim/vimrc | 44 |
13 files changed, 2 insertions, 50 deletions
@@ -15,12 +15,8 @@ tig: | |||
15 | ln -sf `pwd`/tigrc ~/.tigrc | 15 | ln -sf `pwd`/tigrc ~/.tigrc |
16 | 16 | ||
17 | vim: | 17 | vim: |
18 | ln -sf `pwd`/vim/vimrc ~/.vimrc | 18 | ln -sf `pwd`/vim/init.vim ~/.vimrc |
19 | mkdir -p ~/.config/nvim | 19 | ln -sf `pwd`/vim ~/.config/nvim |
20 | ln -sf `pwd`/vim/vimrc ~/.config/nvim/init.vim | ||
21 | ln -sf `pwd`/vim/lazy/lazy.lua ~/.config/nvim/lazy.lua | ||
22 | ln -sf `pwd`/vim/lazy/plugin/ ~/.config/nvim/plugin | ||
23 | ln -sf `pwd`/snippets ~/snippets | ||
24 | # vim-plug | 20 | # vim-plug |
25 | # curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim | 21 | # curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim |
26 | 22 | ||
diff --git a/vim/nvim/init.vim b/vim/init.vim index 20a1c74..20a1c74 100644 --- a/vim/nvim/init.vim +++ b/vim/init.vim | |||
diff --git a/vim/nvim/lazy.lua b/vim/lazy.lua index 6cfadf0..6cfadf0 100644 --- a/vim/nvim/lazy.lua +++ b/vim/lazy.lua | |||
diff --git a/vim/nvim/lua/chadrc.lua b/vim/lua/chadrc.lua index aa0d78c..aa0d78c 100644 --- a/vim/nvim/lua/chadrc.lua +++ b/vim/lua/chadrc.lua | |||
diff --git a/vim/nvim/lua/configs/conform.lua b/vim/lua/configs/conform.lua index a000447..a000447 100644 --- a/vim/nvim/lua/configs/conform.lua +++ b/vim/lua/configs/conform.lua | |||
diff --git a/vim/nvim/lua/configs/lazy.lua b/vim/lua/configs/lazy.lua index cd170bd..cd170bd 100644 --- a/vim/nvim/lua/configs/lazy.lua +++ b/vim/lua/configs/lazy.lua | |||
diff --git a/vim/nvim/lua/configs/lspconfig.lua b/vim/lua/configs/lspconfig.lua index a73657a..a73657a 100644 --- a/vim/nvim/lua/configs/lspconfig.lua +++ b/vim/lua/configs/lspconfig.lua | |||
diff --git a/vim/nvim/lua/configs/telescope.lua b/vim/lua/configs/telescope.lua index 73c64e5..73c64e5 100644 --- a/vim/nvim/lua/configs/telescope.lua +++ b/vim/lua/configs/telescope.lua | |||
diff --git a/vim/nvim/lua/configs/treesitter.lua b/vim/lua/configs/treesitter.lua index 8375d5b..8375d5b 100644 --- a/vim/nvim/lua/configs/treesitter.lua +++ b/vim/lua/configs/treesitter.lua | |||
diff --git a/vim/nvim/lua/mappings.lua b/vim/lua/mappings.lua index f6ef8c4..f6ef8c4 100644 --- a/vim/nvim/lua/mappings.lua +++ b/vim/lua/mappings.lua | |||
diff --git a/vim/nvim/lua/options.lua b/vim/lua/options.lua index f9e6e7e..f9e6e7e 100644 --- a/vim/nvim/lua/options.lua +++ b/vim/lua/options.lua | |||
diff --git a/vim/nvim/lua/plugins/init.lua b/vim/lua/plugins/init.lua index 132f1a2..132f1a2 100644 --- a/vim/nvim/lua/plugins/init.lua +++ b/vim/lua/plugins/init.lua | |||
diff --git a/vim/vimrc b/vim/vimrc deleted file mode 100644 index 20a1c74..0000000 --- a/vim/vimrc +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | " Avoid load this script twice | ||
2 | if get(s:, 'loaded', 0) != 0 | ||
3 | finish | ||
4 | else | ||
5 | let s:loaded = 1 | ||
6 | endif | ||
7 | |||
8 | " Get current dir | ||
9 | " let s:home = fnamemodify(resolve(expand('<sfile>:p')), ':h') | ||
10 | let s:home = '~/helper/vim' | ||
11 | |||
12 | " Load script in current dir | ||
13 | " command! -nargs=1 LoadScript exec 'source '.s:home.'/'.'<args>' | ||
14 | |||
15 | " Add current dir into runtimepath | ||
16 | execute 'set runtimepath+='.s:home | ||
17 | |||
18 | |||
19 | "---------------------------------------------------------------------- | ||
20 | " Locad Modules | ||
21 | "---------------------------------------------------------------------- | ||
22 | |||
23 | " Basic configuration | ||
24 | source ~/helper/vim/init/basic.vim | ||
25 | |||
26 | " Key mappings | ||
27 | source ~/helper/vim/init/keymaps.vim | ||
28 | |||
29 | " Extra config for different contexts | ||
30 | source ~/helper/vim/init/config.vim | ||
31 | |||
32 | " Set tabsize | ||
33 | source ~/helper/vim/init/tabsize.vim | ||
34 | |||
35 | if has('nvim') | ||
36 | " For neovim | ||
37 | source ~/.config/nvim/lazy.lua | ||
38 | else | ||
39 | " For vim | ||
40 | source ~/helper/vim/init/plugins.vim | ||
41 | source ~/helper/vim/init/style.vim | ||
42 | endif | ||
43 | |||
44 | source ~/helper/vim/init/special_highlight.vim | ||