3 files changed, 16 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 4e435fb..e7e446b 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,9 @@ tig:
         ln -sf `pwd`/tigrc ~/.tigrc
 
 vim:
-        ln -sf `pwd`/vimrc ~/.vimrc
+        ln -sf `pwd`/init.vim ~/.vimrc
         # vim-plug
-        curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+        # curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 
 gpg:
         ln -sf `pwd`/misc/gpg-agent ~/.gnupg/gpg-agent.conf
diff --git a/X11/openbox/rc.xml b/X11/openbox/rc.xml
index 65ffdf2..aa0ff0d 100644
--- a/X11/openbox/rc.xml
+++ b/X11/openbox/rc.xml
@@ -471,17 +471,17 @@
     <!-- Brightness Control -->
     <keybind key="XF86MonBrightnessUp">
       <action name="Execute">
-        <command>brightness --inc</command>
+        <command>ob-brightness --inc</command>
       </action>
     </keybind>
     <keybind key="S-XF86MonBrightnessUp">
       <action name="Execute">
-        <command>brightness --inc 1</command>
+        <command>ob-brightness --inc 1</command>
       </action>
     </keybind>
     <keybind key="XF86MonBrightnessDown">
       <action name="Execute">
-        <command>brightness --dec</command>
+        <command>ob-brightness --dec</command>
       </action>
     </keybind>
     <keybind key="S-XF86MonBrightnessDown">
diff --git a/vimrc b/init.vim
index bfdd212..6b31c8e 100644
--- a/vimrc
+++ b/init.vim
@@ -1,8 +1,8 @@
 " Avoid load this script twice
 if get(s:, 'loaded', 0) != 0
-        finish
+  finish
 else
-        let s:loaded = 1
+  let s:loaded = 1
 endif
 
 " Get current dir
@@ -30,13 +30,19 @@ source ~/.vim/vim-init/init/init-keymaps.vim
 " source ~/.vim/vim-init/init/init-style.vim
 
 " Extra config for different contexts
-source ~/.vim/vim-init/init/init-config.vim
+" source ~/.vim/vim-init/init/init-config.vim
 
 " 设定 tabsize
-source ~/.vim/vim-init/init/init-tabsize.vim
+" source ~/.vim/vim-init/init/init-tabsize.vim
 
 " Plugins
-source ~/.vim/vim-init/init/init-plugins.vim
+
+" Neovim
+if has('nvim')
+  source ~/.config/nvim/nvim.lua
+else
+  source ~/.vim/vim-init/init/init-plugins.vim
+endif
 
 " Set UI theme
 colorscheme desert