diff --git a/plugins/completion/coq.nix b/plugins/completion/coq.nix index 59b91319..e278bdc1 100644 --- a/plugins/completion/coq.nix +++ b/plugins/completion/coq.nix @@ -13,7 +13,7 @@ in package = mkOption { type = types.package; - default = pkgs.vimPlugins.coq-nvim; + default = pkgs.vimPlugins.coq-vim; description = "Plugin to use for coq-nvim"; }; diff --git a/plugins/null-ls/servers.nix b/plugins/null-ls/servers.nix index 41f2a7db..0a6610f1 100644 --- a/plugins/null-ls/servers.nix +++ b/plugins/null-ls/servers.nix @@ -1,8 +1,8 @@ -{ pkgs, config, lib, inputs, ... }@args: +{ pkgs, config, lib, ... }@args: let helpers = import ./helpers.nix args; serverData = { - code_actions = { + code_actions = { gitsigns = { }; }; completion = { }; @@ -30,9 +30,6 @@ let black = { package = pkgs.python3Packages.black; }; - beautysh = { - package = inputs.beautysh.packages.${pkgs.system}.beautysh-python38; - }; fourmolu = { package = pkgs.haskellPackages.fourmolu; }; @@ -57,9 +54,10 @@ in { imports = lib.lists.map (helpers.mkServer) dataFlattened; - config = let - cfg = config.plugins.null-ls; - in + config = + let + cfg = config.plugins.null-ls; + in lib.mkIf cfg.enable { plugins.gitsigns.enable = lib.mkIf (cfg.sources.code_actions.gitsigns.enable) true; }; diff --git a/plugins/nvim-lsp/basic-servers.nix b/plugins/nvim-lsp/basic-servers.nix index 74116858..1f92dc7c 100644 --- a/plugins/nvim-lsp/basic-servers.nix +++ b/plugins/nvim-lsp/basic-servers.nix @@ -125,7 +125,7 @@ let name = "elixirls"; description = "Enable elixirls"; package = pkgs.elixir_ls; - cmd = cfg: ["${cfg.package}/bin/elixir-ls"]; + cmd = cfg: [ "${cfg.package}/bin/elixir-ls" ]; } { name = "gdscript"; @@ -201,7 +201,7 @@ let { name = "sumneko-lua"; description = "Enable sumneko_lua, for lua"; - packages = [ pkgs.sumneko-lua-language-server ]; + package = pkgs.sumneko-lua-language-server; serverName = "sumneko_lua"; } { diff --git a/plugins/telescope/media-files.nix b/plugins/telescope/media-files.nix index 6be5e49d..df2025d4 100644 --- a/plugins/telescope/media-files.nix +++ b/plugins/telescope/media-files.nix @@ -9,7 +9,7 @@ in package = mkOption { 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"; };