From 7db4da419e17f0a3791656450f5bc4aa585e88c9 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Tue, 3 Feb 2026 12:08:50 +0100 Subject: [PATCH 1/2] language/make: add treesitter, formatter and diagnostics support (#1380) --- configuration.nix | 1 + docs/manual/release-notes/rl-0.9.md | 2 + modules/plugins/languages/default.nix | 1 + modules/plugins/languages/make.nix | 93 +++++++++++++++++++++++++++ 4 files changed, 97 insertions(+) create mode 100644 modules/plugins/languages/make.nix diff --git a/configuration.nix b/configuration.nix index 958311b1..2602a811 100644 --- a/configuration.nix +++ b/configuration.nix @@ -92,6 +92,7 @@ isMaximal: { ruby.enable = false; fsharp.enable = false; just.enable = false; + make.enable = false; qml.enable = false; jinja.enable = false; tailwind.enable = false; diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 662f7aeb..735ef61d 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -172,6 +172,8 @@ - Added [`golangci-lint`](https://golangci-lint.run/) for more diagnostics. +- Added Makefile support via `languages.make`. + [vagahbond](https://github.com/vagahbond): [codewindow.nvim]: https://github.com/gorbit99/codewindow.nvim diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index 7cc5bda5..0986e1e1 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -52,6 +52,7 @@ in { ./yaml.nix ./ruby.nix ./just.nix + ./make.nix ./xml.nix # This is now a hard deprecation. diff --git a/modules/plugins/languages/make.nix b/modules/plugins/languages/make.nix new file mode 100644 index 00000000..f7780cd9 --- /dev/null +++ b/modules/plugins/languages/make.nix @@ -0,0 +1,93 @@ +{ + config, + lib, + pkgs, + ... +}: let + inherit (builtins) attrNames; + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.meta) getExe; + inherit (lib.types) listOf enum; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.nvim.types) mkGrammarOption diagnostics; + inherit (lib.nvim.attrsets) mapListToAttrs; + + cfg = config.vim.languages.make; + + defaultFormat = ["bake"]; + formats = { + bake = { + command = "${pkgs.mbake}/bin/mbake"; + }; + }; + + defaultDiagnosticsProvider = ["checkmake"]; + diagnosticsProviders = { + checkmake = { + config = { + cmd = getExe pkgs.checkmake; + }; + }; + }; +in { + options.vim.languages.make = { + enable = mkEnableOption "Make support"; + + treesitter = { + enable = mkEnableOption "Make treesitter" // {default = config.vim.languages.enableTreesitter;}; + package = mkGrammarOption pkgs "make"; + }; + + format = { + enable = mkEnableOption "Make formatting" // {default = config.vim.languages.enableFormat;}; + type = mkOption { + description = "make formatter to use"; + type = listOf (enum (attrNames formats)); + default = defaultFormat; + }; + }; + + extraDiagnostics = { + enable = mkEnableOption "extra Make diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; + types = diagnostics { + langDesc = "Make"; + inherit diagnosticsProviders; + inherit defaultDiagnosticsProvider; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + (mkIf cfg.treesitter.enable { + vim.treesitter = { + enable = true; + grammars = [cfg.treesitter.package]; + }; + }) + + (mkIf cfg.format.enable { + vim.formatter.conform-nvim = { + enable = true; + setupOpts = { + formatters_by_ft.make = cfg.format.type; + formatters = + mapListToAttrs (name: { + inherit name; + value = formats.${name}; + }) + cfg.format.type; + }; + }; + }) + + (mkIf cfg.extraDiagnostics.enable { + vim.diagnostics.nvim-lint = { + enable = true; + linters_by_ft.make = cfg.extraDiagnostics.types; + linters = + mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;}) + cfg.extraDiagnostics.types); + }; + }) + ]); +} From 92854bd0eaaa06914afba345741c372439b8e335 Mon Sep 17 00:00:00 2001 From: irobot Date: Tue, 3 Feb 2026 06:52:39 -0800 Subject: [PATCH 2/2] Keymap/extra options (#1384) * keymaps: fix unable to set noremap = false Currently setting `vim.keymaps.*.noremap = false` has no effect. Given that noremap is set by default, the only way to undo it is to use `remap = true`. This commit adds `remap` as an internal option, and derives its final value as the inverse of noremap. This way, setting `noremap` to `false` now behaves as expected. See https://neovim.io/doc/user/lua-guide.html#_creating-mappings * keymaps/config: fix formatting merge unnecessarily split attrset * keymaps/options: remove unnecessary option + tweak related release notes entry --- docs/manual/release-notes/rl-0.9.md | 5 +++++ modules/wrapper/rc/config.nix | 1 + 2 files changed, 6 insertions(+) diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 735ef61d..651f9f4e 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -180,4 +180,9 @@ https://github.com/gorbit99/codewindow.nvim - Add [codewindow.nvim] plugin in `vim.assistant.codewindow` with `enable` and `setupOpts` +[irobot](https://github.com/irobot): + +- Fix non-functional `vim.keymaps.*.noremap`. Now, setting it to false is + equivalent to `:lua vim.keymap.set(..., { remap = true })` + diff --git a/modules/wrapper/rc/config.nix b/modules/wrapper/rc/config.nix index 77a62d58..50211d2e 100644 --- a/modules/wrapper/rc/config.nix +++ b/modules/wrapper/rc/config.nix @@ -39,6 +39,7 @@ in { getOpts = keymap: { inherit (keymap) desc silent nowait script expr unique noremap; + remap = !keymap.noremap; }; toLuaKeymap = bind: "vim.keymap.set(${toLuaObject bind.mode}, ${toLuaObject bind.key}, ${toLuaObject (getAction bind)}, ${toLuaObject (getOpts bind)})";