Switch to neovim

2 files changed, 5 insertions, 17 deletions

diff --git a/lib/common.nix b/lib/common.nix
index 429d6b7..f7a7d35 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -135,11 +135,12 @@ in
       enable = true;
     };
 
-    vim = {
+    neovim = {
       enable = true;
-      plugins = with pkgs.vimPlugins; [
-        editorconfig-vim
-      ];
+      vimAlias = true;
+      viAlias = true;
+      vimdiffAlias = true;
+      plugins = [ pkgs.vimPlugins.editorconfig-vim ];
       extraConfig = builtins.readFile ./vimrc;
     };
 
@@ -198,9 +199,7 @@ in
         tdate = "date +%Y.%m.%d..%H.%M";
         ttime = "date +%H.%M";
         typeless = "history | tail -n 20000 | sed 's/.*  //' | sort | uniq -c | sort -g | tail -n 100";
-        v = "vim";
         "v." = "vim .";
-        vimdiff = "vim -d";
         vk = "vim $(sk -m)";
         vs = "vim $(sk -m)";
       };
diff --git a/lib/vimrc b/lib/vimrc
index 9496a24..3c42015 100644
--- a/lib/vimrc
+++ b/lib/vimrc
@@ -107,17 +107,6 @@ function! <SID>SynStack()
     echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
 endfunc
 
-""" Plugins with vim-plug
-""" only use this for stuff not available in nix/home-manager
-if empty(glob('~/.vim/autoload/plug.vim'))
-    silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
-    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-    autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-endif
-call plug#begin('~/.vim/plugged')
-Plug 'urbit/hoon.vim'
-call plug#end()
-
 " Vim color scheme, modified from Xavier's below
 "
 " Name:       monochrome.vim