From b1cc8c0bf8b699c435e967873d88159aae7b2ad4 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 5 Jun 2021 15:41:43 +0200
Subject: neovim: update config structure for home-manager 21.05

---
 user/settings/base.nix | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/user/settings/base.nix b/user/settings/base.nix
index 4ad9edfb..1e19a48d 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -15,26 +15,21 @@
     vimAlias = true;
     vimdiffAlias = true;
     withNodeJs = true;
-    configure = {
-      customRC = builtins.readFile ../nvim/init.vim;
-      packages.myVimPackage = with pkgs.vimPlugins; {
-        start = [
-          commentary
-          coc-css
-          coc-eslint
-          coc-git
-          coc-html
-          coc-json
-          coc-nvim
-          coc-prettier
-          coc-tabnine
-          coc-yaml
-          vim-surround
-          vim-nix
-        ];
-        opt = [ ];
-      };
-    };
+    plugins = with pkgs.vimPlugins; [
+      commentary
+      coc-css
+      coc-eslint
+      coc-git
+      coc-html
+      coc-json
+      coc-nvim
+      coc-prettier
+      coc-tabnine
+      coc-yaml
+      vim-surround
+      vim-nix
+    ];
+    extraConfig = builtins.readFile ../nvim/init.vim;
     coc = {
       config = {
         "json.enable" = true;
-- 
cgit 1.4.1