diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix index 5750d544..5b6a5e58 100644 --- a/modules/plugins/languages/markdown.nix +++ b/modules/plugins/languages/markdown.nix @@ -8,7 +8,6 @@ inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.options) mkEnableOption mkOption; - inherit (lib.lists) isList; inherit (lib.types) bool enum package listOf str nullOr; inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption; diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix index 61bc5abb..1efbdcf2 100644 --- a/modules/plugins/languages/nix.nix +++ b/modules/plugins/languages/nix.nix @@ -9,19 +9,12 @@ inherit (lib.meta) getExe; inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; - inherit (lib.lists) isList; inherit (lib.types) enum package listOf; inherit (lib.nvim.types) mkGrammarOption diagnostics; inherit (lib.nvim.attrsets) mapListToAttrs; - inherit (lib.nvim.lua) expToLua; cfg = config.vim.languages.nix; - packageToCmd = package: defaultCmd: - if isList package - then expToLua package - else ''{"${package}/bin/${defaultCmd}"}''; - formattingCmd = mkIf (cfg.format.enable && cfg.lsp.enable) { formatting = mkMerge [ (mkIf (cfg.format.type == "alejandra") { @@ -37,7 +30,7 @@ servers = { nil_ls = { enable = true; - cmd = ["${pkgs.nil}/bin/nil"]; + cmd = [(getExe pkgs.nil)]; settings = { nil = formattingCmd; }; @@ -47,7 +40,7 @@ nixd = { enable = true; - cmd = ["${pkgs.nixd}/bin/nixd"]; + cmd = [(getExe pkgs.nixd)]; settings = { nixd = formattingCmd; };