mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

plugins/lsp/nixd: refactor

Browse source
This commit is contained in:
Gaetan Lepage 2024-05-15 09:00:10 +02:00 • committed by Gaétan Lepage
parent f14aa756ba
commit 6be28a941b
3 changed files with 51 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/lsp/language-servers/default.nix
View file

@ -4,11 +4,9 @@
config,
pkgs,
...
}@args:
}:
with lib;
let
nixdSettings = import ./nixd.nix args;
servers = [
{
name = "ansiblels";
@ -408,7 +406,10 @@ let
description = "nixd for Nix";
package = pkgs.nixd;
settings = cfg: { nixd = cfg; };
settingsOptions = nixdSettings.options;
settingsOptions = import ./nixd-settings.nix { inherit lib helpers; };
extraConfig = cfg: {
extraPackages = optional (cfg.settings.formatting.command == [ "nixpkgs-fmt" ]) pkgs.nixpkgs-fmt;
};
}
{
name = "nushell";
@ -683,6 +684,4 @@ in
./rust-analyzer.nix
./svelte.nix
];
config = lib.mkMerge [ nixdSettings.config ];
}

46
plugins/lsp/language-servers/nixd-settings.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib, helpers }:
# Options:
# - https://github.com/nix-community/nixd/blob/main/nixd/docs/configuration.md
# - https://github.com/nix-community/nixd/blob/main/nixd/include/nixd/Controller/Configuration.h
with lib;
{
formatting = {
command = helpers.defaultNullOpts.mkListOf types.str ''[ "nixpkgs-fmt" ]'' ''
Which command you would like to do formatting.
Explicitly set to `["nixpkgs-fmt"]` will automatically add `pkgs.nixpkgs-fmt` to the nixvim
environment.
'';
};
options =
let
provider = types.submodule {
options = {
expr = mkOption {
type = types.str;
description = "Expression to eval. Select this attrset as eval .options";
};
};
};
in
helpers.mkNullOrOption (with helpers.nixvimTypes; attrsOf (maybeRaw provider)) ''
Tell the language server your desired option set, for completion.
This is lazily evaluated.
'';
nixpkgs =
let
provider = types.submodule {
options = {
expr = mkOption {
type = types.str;
description = "Expression to eval. Treat it as `import <nixpkgs> { }`";
};
};
};
in
helpers.mkNullOrOption (helpers.nixvimTypes.maybeRaw provider) ''
This expression will be interpreted as "nixpkgs" toplevel
Nixd provides package, lib completion/information from it.
'';
}

61
plugins/lsp/language-servers/nixd.nix
View file

@ -1,61 +0,0 @@
{
lib,
helpers,
config,
pkgs,
...
}:
with lib;
let
cfg = config.plugins.lsp.servers.nixd;
in
{
# Options:
# - https://github.com/nix-community/nixd/blob/main/nixd/docs/configuration.md
# - https://github.com/nix-community/nixd/blob/main/nixd/include/nixd/Controller/Configuration.h
options = {
formatting = {
command = helpers.defaultNullOpts.mkListOf types.str ''[ "nixpkgs-fmt" ]'' ''
Which command you would like to do formatting.
Explicitly set to `["nixpkgs-fmt"]` will automatically add `pkgs.nixpkgs-fmt` to the nixvim
environment.
'';
};
options =
let
provider = types.submodule {
options = {
expr = mkOption {
type = types.str;
description = "Expression to eval. Select this attrset as eval .options";
};
};
};
in
helpers.mkNullOrOption (with helpers.nixvimTypes; attrsOf (maybeRaw provider)) ''
Tell the language server your desired option set, for completion.
This is lazily evaluated.
'';
nixpkgs =
let
provider = types.submodule {
options = {
expr = mkOption {
type = types.str;
description = "Expression to eval. Treat it as `import <nixpkgs> { }`";
};
};
};
in
helpers.mkNullOrOption (helpers.nixvimTypes.maybeRaw provider) ''
This expression will be interpreted as "nixpkgs" toplevel
Nixd provides package, lib completion/information from it.
'';
};
config = mkIf cfg.enable {
extraPackages = optional (cfg.settings.formatting.command == [ "nixpkgs-fmt" ]) pkgs.nixpkgs-fmt;
};
}