From b2fb11e1bf06f9d1c33b9a158a7a418602c0bddd Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 19 Nov 2021 22:59:13 +0900 Subject: neovim: add neovim (a.k.a., nvim) --- .config/nvim/autoload | 1 + .config/nvim/init.vim | 1 + .config/nvim/my | 1 + .config/nvim/plugged | 1 + .gitignore | 6 ++++-- .vimrc | 12 ++++++++++-- INSTALL.txt | 1 + setup.sh | 1 + 8 files changed, 20 insertions(+), 4 deletions(-) create mode 120000 .config/nvim/autoload create mode 120000 .config/nvim/init.vim create mode 120000 .config/nvim/my create mode 120000 .config/nvim/plugged diff --git a/.config/nvim/autoload b/.config/nvim/autoload new file mode 120000 index 0000000..2d31eb7 --- /dev/null +++ b/.config/nvim/autoload @@ -0,0 +1 @@ +../vim/autoload \ No newline at end of file diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim new file mode 120000 index 0000000..71b3819 --- /dev/null +++ b/.config/nvim/init.vim @@ -0,0 +1 @@ +../../.vimrc \ No newline at end of file diff --git a/.config/nvim/my b/.config/nvim/my new file mode 120000 index 0000000..dd11040 --- /dev/null +++ b/.config/nvim/my @@ -0,0 +1 @@ +../vim/my \ No newline at end of file diff --git a/.config/nvim/plugged b/.config/nvim/plugged new file mode 120000 index 0000000..13b61af --- /dev/null +++ b/.config/nvim/plugged @@ -0,0 +1 @@ +../vim/plugged \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7702980..ef83f6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ -/.config/vim/* -!/.config/vim/my/ +/.config/vim/autoload/plug.vim +/.config/vim/plugged/ +/.config/nvim/autoload/plug.vim +/.config/nvim/plugged/ /.config/emacs vim-startup.log diff --git a/.vimrc b/.vimrc index 1a7fa4e..ea0d437 100644 --- a/.vimrc +++ b/.vimrc @@ -43,8 +43,16 @@ else let g:MY_ENV.cache_home = $XDG_CONFIG_HOME endif -let g:MY_ENV.config_dir = g:MY_ENV.config_home . '/vim' -let g:MY_ENV.cache_dir = g:MY_ENV.cache_home . '/vim' +if has('nvim') + let g:MY_ENV.config_dir = g:MY_ENV.config_home . '/nvim' +else + let g:MY_ENV.config_dir = g:MY_ENV.config_home . '/vim' +endif +if has('nvim') + let g:MY_ENV.cache_dir = g:MY_ENV.cache_home . '/nvim' +else + let g:MY_ENV.cache_dir = g:MY_ENV.cache_home . '/vim' +endif let g:MY_ENV.my_dir = g:MY_ENV.config_dir . '/my' let g:MY_ENV.plug_dir = g:MY_ENV.config_dir . '/plugged' diff --git a/INSTALL.txt b/INSTALL.txt index 5f083ec..68034b1 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -11,6 +11,7 @@ $ brew install \ gcc \ git \ jq \ + neovim \ pandoc \ python \ ripgrep \ diff --git a/setup.sh b/setup.sh index 28e6ae1..3244e83 100755 --- a/setup.sh +++ b/setup.sh @@ -22,6 +22,7 @@ for name in \ bat \ emacs \ git \ + nvim \ vim \ ; \ do -- cgit v1.2.3-70-g09d2