NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-03-15 21:26:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'main' into notashelf/push-pkmkotukopkx

Browse source
This commit is contained in:
raf 2026-03-15 15:43:51 +03:00 • committed by GitHub
commit b1ebfab36f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/manual/release-notes/rl-0.9.md
View file

@ -297,4 +297,8 @@ https://github.com/gorbit99/codewindow.nvim
- Fix `vim.assistant.codecompanion-nvim` lazy loading with [blink-cmp] - 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: --> <!-- vim: set textwidth=80: -->

4
modules/plugins/formatter/conform-nvim/conform-nvim.nix
View file

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

2
modules/plugins/languages/cmake.nix
View file

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