simplify and remove unnecessary stuff

lib/languages.nix

@@ -1,13 +1,9 @@
 {lib}: let
   inherit (builtins) isString getAttr;
   inherit (lib.options) mkOption;
-  inherit (lib.strings) concatStringsSep;
+  inherit (lib.types) listOf bool str submodule attrsOf anything either nullOr;
-  inherit (lib.types) listOf bool str submodule attrsOf anything either nullOr oneOf enum;
-  inherit (lib.attrsets) attrNames;
   inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (lib.nvim.types) luaInline;
-  inherit (lib.lists) isList;
-  inherit (lib) genAttrs recursiveUpdate;
 in {
   # TODO: remove
   diagnosticsToLua = {
@@ -38,18 +34,6 @@ in {
       description = "Turn on ${desc} for enabled languages by default";
     };
 
-  # resolveLspOptions
-  # servers: AttrsOf lspOptions
-  # selected: AttrsOf lspOptions | List of string keys from servers
-  # Returns: AttrsOf lspOptions
-  resolveLspOptions = {
-    servers,
-    selected,
-  }:
-    if isList selected
-    then genAttrs selected (name: servers.${name})
-    else selected;
-
   lspOptions = submodule {
     freeformType = attrsOf anything;
     options = {
@@ -93,27 +77,4 @@ in {
       };
     };
   };
-
-  mkLspOption = {servers, ...} @ args: let
-    serverNames = attrNames servers;
-    defaultAttrs = {
-      type = oneOf [
-        (attrsOf lib.nvim.languages.lspOptions)
-        (listOf (enum serverNames))
-      ];
-      description = ''
-        Either a full set of selected LSP options as an attribute set,
-        or a list of server names from: ${concatStringsSep ", " serverNames}.
-      '';
-      default = {};
-      example = {
-        clangd = {
-          filetypes = ["c"];
-          root_markers = ["CMakeLists.txt"];
-        };
-      };
-    };
-    cleanedArgs = removeAttrs args ["servers"];
-  in
-    mkOption (recursiveUpdate defaultAttrs cleanedArgs);
 }

modules/neovim/init/lsp.nix

@@ -18,36 +18,12 @@
 
   lspConfigurations =
     mapAttrsToList (
-      # TODO: Determine the best thing to do about merging in lspconfig
+      name: value: ''
-      name: value:
+        vim.lsp.config["${name}"] = ${toLuaObject value}
-      /*
+      ''
-      lua
-      */
-      ''vim.lsp.config["${name}"] = ${toLuaObject value}''
     )
     cfg.servers;
 
-  # Approach 1:
-  # Create function perhaps called mkLspConfig
-  # mkLspConfig servers;
-  # that expands to something like
-  # vim.lsp.servers = cfg.lsp.servers......
-  # vim.luaConfigRC.lspconfigMerge = entryAfter ["lsp-servers"] ''vim.lsp.config["${name}"] = vim.tbl_deep_extend("force", lspconfig.${name}, vim.lsp.config["${name}"])''
-
-
-  # Approach 2:
-  # lspConfigurations =
-  #   mapAttrsToList (
-  #     name: value: ''vim.lsp.config["${name}"] = vim.tbl_deep_extend("force", lspconfig.${name}, ${toLuaObject value})''
-  #   )
-  #   (filterAttrs (n: _: n != "*") cfg.servers);
-  # Then also need to configure global * settings
-  # globalConfiguration =
-  #   mapAttrsToList (
-  #     name: value: ''vim.lsp.config["${name}"] = ${toLuaObject value}''
-  #   )
-  #   (filterAttrs (n: _: n == "*") cfg.servers);
-
   enabledServers = filterAttrs (_: u: u.enable) cfg.servers;
 in {
   options = {
@@ -105,18 +81,13 @@ in {
     }
 
     (mkIf (cfg.servers != {}) {
-      vim.luaConfigRC.lsp-servers =
+      vim.luaConfigRC.lsp-servers = entryAnywhere ''
-        entryAnywhere
+        -- Individual LSP configurations managed by nvf.
-         # Or entryAfter ["lspconfig"] if we go with the second approach
+        ${concatLines lspConfigurations}
-        /*
-        lua
-        */
-        ''
-          ${concatLines lspConfigurations}
 
-          -- Enable configured LSPs explicitly
+        -- Enable configured LSPs explicitly
-          vim.lsp.enable(${toLuaObject (filter (name: name != "*") (attrNames enabledServers))});
+        vim.lsp.enable(${toLuaObject (filter (name: name != "*") (attrNames enabledServers))})
-        '';
+      '';
     })
   ];
 }

modules/plugins/languages/nix.nix

@@ -6,15 +6,14 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib) concatStringsSep;
-  inherit (lib.generators) mkLuaInline;
   inherit (lib.meta) getExe;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
-  inherit (lib.types) enum package;
+  inherit (lib.types) enum package listOf;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
+  inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (lib.nvim.lua) expToLua;
-  inherit (lib.nvim.languages) resolveLspOptions mkLspOption;
 
   cfg = config.vim.languages.nix;
 
@@ -23,18 +22,18 @@
     then expToLua package
     else ''{"${package}/bin/${defaultCmd}"}'';
 
-  formattingCmd = lib.mkIf (cfg.format.enable && cfg.lsp.enable) {
+  formattingCmd = mkIf (cfg.format.enable && cfg.lsp.enable) {
-    formatting = lib.mkMerge [
+    formatting = mkMerge [
-      (lib.mkIf (cfg.format.type == "alejandra") {
+      (mkIf (cfg.format.type == "alejandra") {
         command = ["${cfg.format.package}/bin/alejandra" "--quiet"];
       })
-      (lib.mkIf (cfg.format.type == "nixfmt") {
+      (mkIf (cfg.format.type == "nixfmt") {
         command = ["${cfg.format.package}/bin/nixfmt"];
       })
     ];
   };
 
-  defaultServers = ["nil_ls"]
+  defaultServers = ["nil_ls"];
   servers = {
     nil_ls = {
       enable = true;
@@ -101,9 +100,11 @@ in {
 
     lsp = {
       enable = mkEnableOption "Nix LSP support" // {default = config.vim.lsp.enable;};
-      servers = mkLspOption {
+      servers = mkOption {
-        inherit servers;
+        description = "Nix LSP server to use";
+        type = listOf (enum (attrNames servers));
         default = defaultServers;
+        example = ["nixd"];
       };
     };
 
@@ -153,14 +154,14 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      # TODO: Map this to include lspconfig stuff so that we can do
+      vim.lsp.servers =
-      vim.lsp.servers = resolveLspOptions {
+        mapListToAttrs (n: {
-        inherit servers;
+          name = n;
-        selected = cfg.lsp.servers;
+          value = servers.${n};
-      };
+        })
+        cfg.lsp.servers;
     })
 
-    # TODO: Figure out what do here. This is not necessarily correct as other lsps might not have formatting by default
     (mkIf (cfg.format.enable && !cfg.lsp.enable) {
       vim.formatter.conform-nvim = {
         enable = true;