Patches

docs/manual/configuring/queries.md

@@ -28,16 +28,14 @@ in {
     filetypes = ["nix"];
     loadtype = "extends";
     query = ''
-      ((apply_expression
+      (apply_expression
         function: (variable_expression
           name: (identifier) @_func
           (#eq? @_func "mkLuaInline"))
-
         argument: (indented_string_expression
           (string_fragment) @injection.content)
-
         (#set! injection.language "lua")
-        (#set! injection.combined)))
+        (#set! injection.combined))
     '';
   }];
 }

docs/manual/hacking.md

@@ -310,6 +310,25 @@ acceptableList = [
 ];
 ```
 
+##### Binaries
+
+Always use `getExe` and `getExe'` from `lib.meta` instead of manual binary path
+expansion.
+
+###### Examples
+
+```diff
++let
++  inherit (lib.meta) getExe getExe';
++in
+
+-bin = "${pkgs.bar}/bin/bar";
++cmd = getExe pkgs.bar;
+
+-cmd = "${pkgs.bar}/bin/foo";
++cmd = getExe' pkgs.bar "foo";
+```
+
 #### Naming of External Tools {#sec-code-style-naming-external-tools}
 
 In NVF, we often package or preconfigure external tools. One common example are

docs/manual/release-notes/rl-0.9.md

@@ -362,6 +362,15 @@
 
 - Split of `zsh` from `languages.bash` into its own language module.
 
+[`injected` formatter]: https://github.com/stevearc/conform.nvim/blob/master/doc/advanced_topics.md#injected-language-formatting-code-blocks
+
+- Add [`injected` formatter] to all language modules, to allow for formatting of
+  injections via conform, like Markdown code blocks or some multiline strings in
+  nix.
+
+- Make `query` injections in `nix` files combined, to fix highlighting problems,
+  when injecting inside multiline strings.
+
 - Telling the `vscode-json-language-server` that `json5` is `jsonc` instead of
   the default fallback of `json`, for more accurate results.
 
@@ -395,6 +404,10 @@
 
 - Added `gitlab-ci-ls`.
 
+- Add `ts-query-ls` as a conform.nvim formatter.
+
+- Added formatting to `languages.query`.
+
 - Added `phpantom` LSP preset and into `languages.php`.
 
 - Moved extra diagnostic modules under `diagnostics.presets.<name>` this will

modules/plugins/debugger/nvim-dap/presets/lldb.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDapPresetEnableOption;
+  inherit (lib.meta) getExe';
 
   cfg = config.vim.debugger.nvim-dap.presets.lldb;
 in {
@@ -20,7 +21,7 @@ in {
   config.vim.debugger.nvim-dap.adapters = mkIf cfg.enable {
     lldb = {
       type = "executable";
-      command = "${pkgs.lldb}/bin/lldb-dap";
+      command = getExe' pkgs.lldb "lldb-dap";
     };
   };
 }

modules/plugins/diagnostics/presets/biomejs.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.biomejs;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.biomejs.cmd = "${pkgs.biome}/bin/biome";
+    vim.diagnostics.nvim-lint.linters.biomejs.cmd = getExe pkgs.biome;
   };
 }

modules/plugins/diagnostics/presets/checkmake.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.checkmake;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.checkmake.cmd = "${pkgs.checkmake}/bin/checkmake";
+    vim.diagnostics.nvim-lint.linters.checkmake.cmd = getExe pkgs.checkmake;
   };
 }

modules/plugins/diagnostics/presets/cpplint.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.cpplint;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.cpplint.cmd = "${pkgs.cpplint}/bin/cpplint";
+    vim.diagnostics.nvim-lint.linters.cpplint.cmd = getExe pkgs.cpplint;
   };
 }

modules/plugins/diagnostics/presets/deadnix.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.deadnix;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.deadnix.cmd = "${pkgs.deadnix}/bin/deadnix";
+    vim.diagnostics.nvim-lint.linters.deadnix.cmd = getExe pkgs.deadnix;
   };
 }

modules/plugins/diagnostics/presets/djlint.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.djlint;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.djlint.cmd = "${pkgs.djlint}/bin/djlint";
+    vim.diagnostics.nvim-lint.linters.djlint.cmd = getExe pkgs.djlint;
   };
 }

modules/plugins/diagnostics/presets/dotenv-linter.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.dotenv-linter;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.dotenv-linter.cmd = "${pkgs.dotenv-linter}/bin/dotenv-linter";
+    vim.diagnostics.nvim-lint.linters.dotenv-linter.cmd = getExe pkgs.dotenv-linter;
   };
 }

modules/plugins/diagnostics/presets/eslint_d.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.eslint_d;
 in {
@@ -18,7 +19,7 @@ in {
 
   config = mkIf cfg.enable {
     vim.diagnostics.nvim-lint.linters.eslint_d = {
-      cmd = "${pkgs.eslint_d}/bin/eslint_d";
+      cmd = getExe pkgs.eslint_d;
       required_files = [
         "eslint.config.js"
         "eslint.config.mjs"

modules/plugins/diagnostics/presets/golangci-lint.nix

@@ -5,6 +5,7 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
+  inherit (lib.meta) getExe;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
 
@@ -19,7 +20,7 @@ in {
 
   config = mkIf cfg.enable {
     vim.diagnostics.nvim-lint.linters.golangci-lint = {
-      cmd = "${pkgs.golangci-lint}/bin/golangci-lint";
+      cmd = getExe pkgs.golangci-lint;
       args = [
         "run"
         "--output.json.path=stdout"
@@ -40,7 +41,7 @@ in {
           -- Run on current file only if go.mod is missing
           function()
             local fnmod = ":p";
-            local cmd = {"${pkgs.go}/bin/go", "env", "GOMOD"};
+            local cmd = {"${getExe pkgs.go}", "env", "GOMOD"};
             local ok, gomod = pcall(vim.fn.system, cmd);
             gomod = gomod:gsub("%s+", "")
             if ok and gomod ~= "" and gomod ~= "/dev/null" then

modules/plugins/diagnostics/presets/hadolint.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.hadolint;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.hadolint.cmd = "${pkgs.hadolint}/bin/hadolint";
+    vim.diagnostics.nvim-lint.linters.hadolint.cmd = getExe pkgs.hadolint;
   };
 }

modules/plugins/diagnostics/presets/htmlhint.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.htmlhint;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.htmlhint.cmd = "${pkgs.htmlhint}/bin/htmlhint";
+    vim.diagnostics.nvim-lint.linters.htmlhint.cmd = getExe pkgs.htmlhint;
   };
 }

modules/plugins/diagnostics/presets/ktlint.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.ktlint;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.ktlint.cmd = "${pkgs.ktlint}/bin/ktlint";
+    vim.diagnostics.nvim-lint.linters.ktlint.cmd = getExe pkgs.ktlint;
   };
 }

modules/plugins/diagnostics/presets/luacheck.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.luacheck;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.luacheck.cmd = "${pkgs.luajitPackages.luacheck}/bin/luacheck";
+    vim.diagnostics.nvim-lint.linters.luacheck.cmd = getExe pkgs.luajitPackages.luacheck;
   };
 }

modules/plugins/diagnostics/presets/mago.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets;
 in {
@@ -24,10 +25,10 @@ in {
 
   config.vim.diagnostics.nvim-lint.linters = {
     mago_lint = mkIf cfg.mago_lint.enable {
-      cmd = "${pkgs.mago}/bin/mago";
+      cmd = getExe pkgs.mago;
     };
     mago_analyze = mkIf cfg.mago_analyze.enable {
-      cmd = "${pkgs.mago}/bin/mago";
+      cmd = getExe pkgs.mago;
     };
   };
 }

modules/plugins/diagnostics/presets/markdownlint-cli2.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.markdownlint-cli2;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.markdownlint-cli2.cmd = "${pkgs.markdownlint-cli2}/bin/markdownlint-cli2";
+    vim.diagnostics.nvim-lint.linters.markdownlint-cli2.cmd = getExe pkgs.markdownlint-cli2;
   };
 }

modules/plugins/diagnostics/presets/mypy.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.mypy;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.mypy.cmd = "${pkgs.mypy}/bin/mypy";
+    vim.diagnostics.nvim-lint.linters.mypy.cmd = getExe pkgs.mypy;
   };
 }

modules/plugins/diagnostics/presets/phpstan.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.phpstan;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.phpstan.cmd = "${pkgs.phpstan}/bin/phpstan";
+    vim.diagnostics.nvim-lint.linters.phpstan.cmd = getExe pkgs.phpstan;
   };
 }

modules/plugins/diagnostics/presets/rubocop.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.rubocop;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.rubocop.cmd = "${pkgs.rubocop}/bin/rubocop";
+    vim.diagnostics.nvim-lint.linters.rubocop.cmd = getExe pkgs.rubocop;
   };
 }

modules/plugins/diagnostics/presets/rumdl.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.diagnostics.presets.rumdl;
 in {
@@ -17,6 +18,6 @@ in {
   };
 
   config = mkIf cfg.enable {
-    vim.diagnostics.nvim-lint.linters.rumdl.cmd = "${pkgs.rumdl}/bin/rumdl";
+    vim.diagnostics.nvim-lint.linters.rumdl.cmd = getExe pkgs.rumdl;
   };
 }