From 5e5cb81bc8f7a344fc43bc658fd409be5da55e67 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 14 Mar 2023 16:15:22 +0100
Subject: neovim: use builtin home-manager module to configure coc

---
 user/modules/nvim-coc.nix | 26 --------------------------
 user/settings/base.nix    |  7 ++-----
 user/settings/tabnine.nix |  2 +-
 3 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 user/modules/nvim-coc.nix

(limited to 'user')

diff --git a/user/modules/nvim-coc.nix b/user/modules/nvim-coc.nix
deleted file mode 100644
index bc8fbb19..00000000
--- a/user/modules/nvim-coc.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  inherit (pkgs) stdenv;
-  cfg = config.programs.neovim.coc;
-in {
-  options.programs.neovim.coc = {
-    config = mkOption {
-      type = types.attrs;
-      default = {};
-      description = ''
-        Settings for coc.nvim
-      '';
-    };
-  };
-
-  config = {
-    xdg.configFile."nvim/coc-settings.json" = {
-      source = pkgs.writeText "coc-settings.json" (builtins.toJSON cfg.config);
-    };
-  };
-}
diff --git a/user/settings/base.nix b/user/settings/base.nix
index 105ec050..b5ed8f0d 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -4,10 +4,6 @@
   pkgs,
   ...
 }: {
-  imports = [
-    ../modules/nvim-coc.nix
-  ];
-
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
   manual = {
@@ -33,7 +29,8 @@
     ];
     extraLuaConfig = builtins.readFile ../nvim/init.lua;
     coc = {
-      config = {
+      enable = true;
+      settings = {
         "json.enable" = true;
         "suggest.enablePreview" = true;
       };
diff --git a/user/settings/tabnine.nix b/user/settings/tabnine.nix
index 61cbf29c..02f0e071 100644
--- a/user/settings/tabnine.nix
+++ b/user/settings/tabnine.nix
@@ -87,7 +87,7 @@
     };
   };
 
-  programs.neovim.coc.config = {
+  programs.neovim.coc.settings = {
     "tabnine.binary_path" = "${pkgs.tabnine}/bin/TabNine";
   };
 }
-- 
cgit 1.4.1