fix several broken options

This commit is contained in:
Pedro Alves 2023-01-19 16:02:40 +00:00
parent 5b0e3623a0
commit 11da3bfbc1
4 changed files with 10 additions and 12 deletions

View file

@ -13,7 +13,7 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.vimPlugins.coq-nvim; default = pkgs.vimPlugins.coq-vim;
description = "Plugin to use for coq-nvim"; description = "Plugin to use for coq-nvim";
}; };

View file

@ -1,4 +1,4 @@
{ pkgs, config, lib, inputs, ... }@args: { pkgs, config, lib, ... }@args:
let let
helpers = import ./helpers.nix args; helpers = import ./helpers.nix args;
serverData = { serverData = {
@ -30,9 +30,6 @@ let
black = { black = {
package = pkgs.python3Packages.black; package = pkgs.python3Packages.black;
}; };
beautysh = {
package = inputs.beautysh.packages.${pkgs.system}.beautysh-python38;
};
fourmolu = { fourmolu = {
package = pkgs.haskellPackages.fourmolu; package = pkgs.haskellPackages.fourmolu;
}; };
@ -57,7 +54,8 @@ in
{ {
imports = lib.lists.map (helpers.mkServer) dataFlattened; imports = lib.lists.map (helpers.mkServer) dataFlattened;
config = let config =
let
cfg = config.plugins.null-ls; cfg = config.plugins.null-ls;
in in
lib.mkIf cfg.enable { lib.mkIf cfg.enable {

View file

@ -125,7 +125,7 @@ let
name = "elixirls"; name = "elixirls";
description = "Enable elixirls"; description = "Enable elixirls";
package = pkgs.elixir_ls; package = pkgs.elixir_ls;
cmd = cfg: ["${cfg.package}/bin/elixir-ls"]; cmd = cfg: [ "${cfg.package}/bin/elixir-ls" ];
} }
{ {
name = "gdscript"; name = "gdscript";
@ -201,7 +201,7 @@ let
{ {
name = "sumneko-lua"; name = "sumneko-lua";
description = "Enable sumneko_lua, for lua"; description = "Enable sumneko_lua, for lua";
packages = [ pkgs.sumneko-lua-language-server ]; package = pkgs.sumneko-lua-language-server;
serverName = "sumneko_lua"; serverName = "sumneko_lua";
} }
{ {

View file

@ -9,7 +9,7 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.vim.telescope-media-files-nvim; default = pkgs.vimPlugins.telescope-media-files-nvim;
description = "Plugin to use for telescope extension media_files"; description = "Plugin to use for telescope extension media_files";
}; };