From 374fccae9e0e7be9da16d988ebf379fe00b5afe4 Mon Sep 17 00:00:00 2001
From: traxys <quentin+dev@familleboyer.net>
Date: Mon, 23 Jan 2023 14:52:46 +0100
Subject: [PATCH] nvim-lsp: Put the settings options in the `settings`
 namespace (#137)

This is done to avoid mixing setting options and LSP setup options.
---
 plugins/nvim-lsp/basic-servers.nix | 6 +++---
 plugins/nvim-lsp/helpers.nix       | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/nvim-lsp/basic-servers.nix b/plugins/nvim-lsp/basic-servers.nix
index ce496b0f..30d2c48a 100644
--- a/plugins/nvim-lsp/basic-servers.nix
+++ b/plugins/nvim-lsp/basic-servers.nix
@@ -23,7 +23,7 @@ let
       name = "dartls";
       description = "Enable dart language-server, for dart";
       package = pkgs.dart;
-      extraOptions = {
+      settingsOptions = {
         analysisExcludedFolders = mkOption {
           type = types.nullOr (types.listOf types.str);
           default = null;
@@ -152,7 +152,7 @@ let
       name = "nil_ls";
       description = "Enable nil, for Nix";
       package = pkgs.nil;
-      extraOptions = {
+      settingsOptions = {
         formatting.command = mkOption {
           type = types.nullOr (types.listOf types.str);
           default = null;
@@ -198,7 +198,7 @@ let
       description = "Enable rust-analyzer, for Rust.";
       serverName = "rust_analyzer";
 
-      extraOptions = import ./rust-analyzer-config.nix lib;
+      settingsOptions = import ./rust-analyzer-config.nix lib;
       settings = cfg: { rust-analyzer = cfg; };
     }
     {
diff --git a/plugins/nvim-lsp/helpers.nix b/plugins/nvim-lsp/helpers.nix
index 42e7dcfd..540369b7 100644
--- a/plugins/nvim-lsp/helpers.nix
+++ b/plugins/nvim-lsp/helpers.nix
@@ -9,7 +9,7 @@
     , extraPackages ? { }
     , cmd ? (cfg: null)
     , settings ? (cfg: { })
-    , extraOptions ? { }
+    , settingsOptions ? { }
     , ...
     }:
     # returns a module
@@ -30,7 +30,8 @@
         options = {
           plugins.lsp.servers.${name} = {
             enable = mkEnableOption description;
-          } // packageOption // extraOptions;
+            settings = settingsOptions;
+          } // packageOption;
         };
 
         config = mkIf cfg.enable
@@ -42,7 +43,7 @@
               name = serverName;
               extraOptions = {
                 cmd = cmd cfg;
-                settings = settings cfg;
+                settings = settings cfg.settings;
               };
             }];
           };