Merge branch 'main' into notashelf/push-pkmkotukopkx

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

@@ -297,4 +297,8 @@ https://github.com/gorbit99/codewindow.nvim
 
 - Fix `vim.assistant.codecompanion-nvim` lazy loading with [blink-cmp]
 
+[foobar14](https://github.com/foobar14):
+
+- Fix `vim.formatter.conform-nvim.setupOpts.formatters` type for correct merging
+
 <!-- vim: set textwidth=80: -->

modules/plugins/formatter/conform-nvim/conform-nvim.nix

@@ -1,7 +1,7 @@
 {lib, ...}: let
   inherit (lib.generators) mkLuaInline;
   inherit (lib.options) mkOption mkEnableOption literalMD;
-  inherit (lib.types) attrs either nullOr listOf submodule str;
+  inherit (lib.types) attrs attrsOf either nullOr listOf submodule str;
   inherit (lib.nvim.lua) toLuaObject;
   inherit (lib.nvim.types) luaInline mkPluginSetupOption;
 
@@ -49,7 +49,7 @@ in {
     enable = mkEnableOption "lightweight yet powerful formatter plugin for Neovim [conform-nvim]";
     setupOpts = mkPluginSetupOption "conform.nvim" {
       formatters = mkOption {
-        type = formattersType;
+        type = attrsOf formattersType;
         default = {};
         description = "Custom formatters and overrides for built-in formatters.";
       };

modules/plugins/languages/cmake.nix

@@ -18,7 +18,7 @@
   servers = {
     neocmakelsp = {
       enable = true;
-      cmd = [(getExe pkgs.neocmakelsp) "--stdio"];
+      cmd = [(getExe pkgs.neocmakelsp) "stdio"];
       filetypes = ["cmake"];
       root_markers = [".gersemirc" ".git" "build" "cmake"];
       capabilities = {