From 3bf7abd6c9807bbbb2c791fdb6c9be8e36618dd6 Mon Sep 17 00:00:00 2001 From: Adam Szalkowski Date: Sat, 1 Mar 2025 14:44:08 +0100 Subject: [PATCH 1/4] plugins/nvim-docs-view: fix default mappings (#675) --- modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix b/modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix index 105aebec..df571123 100644 --- a/modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix +++ b/modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix @@ -57,8 +57,8 @@ in { }; mappings = { - viewToggle = mkMappingOption "Open or close the docs view panel" "lvt"; - viewUpdate = mkMappingOption "Manually update the docs view panel" "lvu"; + viewToggle = mkMappingOption "Open or close the docs view panel" "lvt"; + viewUpdate = mkMappingOption "Manually update the docs view panel" "lvu"; }; }; } From 0fdfb9bf3b419dba3b1ccd2728ed6a366866a942 Mon Sep 17 00:00:00 2001 From: MaxMur <31189199+TheMaxMur@users.noreply.github.com> Date: Sun, 2 Mar 2025 16:59:32 +0300 Subject: [PATCH 2/4] languages/yaml: Init (#676) --- docs/release-notes/rl-0.8.md | 4 ++ modules/plugins/languages/default.nix | 1 + modules/plugins/languages/yaml.nix | 72 +++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 modules/plugins/languages/yaml.nix diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index 0440f38f..d81b142f 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -192,3 +192,7 @@ - Add formatters for go: [gofmt](https://go.dev/blog/gofmt), [golines](https://github.com/segmentio/golines) and [gofumpt](https://github.com/mvdan/gofumpt) + +[MaxMur](https://github.com/TheMaxMur) + +- Add YAML support under `vim.languages.yaml`. diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index 219e04fb..08d676b9 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -39,6 +39,7 @@ in { ./nu.nix ./odin.nix ./wgsl.nix + ./yaml.nix ./ruby.nix ]; diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix new file mode 100644 index 00000000..2892f607 --- /dev/null +++ b/modules/plugins/languages/yaml.nix @@ -0,0 +1,72 @@ +{ + pkgs, + config, + lib, + ... +}: let + inherit (builtins) attrNames; + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.lists) isList; + inherit (lib.types) enum either listOf package str; + inherit (lib.nvim.types) mkGrammarOption; + inherit (lib.nvim.lua) expToLua; + + cfg = config.vim.languages.yaml; + + defaultServer = "yaml-language-server"; + servers = { + yaml-language-server = { + package = pkgs.nodePackages.yaml-language-server; + lspConfig = '' + lspconfig.yamlls.setup { + capabilities = capabilities; + on_attach = default_on_attach; + cmd = ${ + if isList cfg.lsp.package + then expToLua cfg.lsp.package + else ''{"${cfg.lsp.package}/bin/yaml-language-server", "--stdio"}'' + }, + } + ''; + }; + }; +in { + options.vim.languages.yaml = { + enable = mkEnableOption "YAML language support"; + + treesitter = { + enable = mkEnableOption "YAML treesitter"; + + package = mkGrammarOption pkgs "yaml"; + }; + + lsp = { + enable = mkEnableOption "YAML LSP support"; + + server = mkOption { + type = enum (attrNames servers); + default = defaultServer; + description = "YAML LSP server to use"; + }; + + package = mkOption { + type = either package (listOf str); + default = servers.${cfg.lsp.server}.package; + description = "YAML LSP server package"; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + (mkIf cfg.treesitter.enable { + vim.treesitter.enable = true; + vim.treesitter.grammars = [cfg.treesitter.package]; + }) + + (mkIf cfg.lsp.enable { + vim.lsp.lspconfig.enable = true; + vim.lsp.lspconfig.sources.yaml-lsp = servers.${cfg.lsp.server}.lspConfig; + }) + ]); +} From 60ebec1956a9e30e840bf03a77abb64968de1021 Mon Sep 17 00:00:00 2001 From: alfarel Date: Sun, 2 Mar 2025 12:19:29 -0500 Subject: [PATCH 3/4] utility/yazi-nvim: add missing dependency (snacks.nvim) `:checkhealth yazi` was warning about it. Project `README` recently added it to the requirements. --- docs/release-notes/rl-0.8.md | 4 ++++ modules/plugins/utility/yazi-nvim/config.nix | 1 + npins/sources.json | 12 ++++++++++++ 3 files changed, 17 insertions(+) diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index d81b142f..6027736a 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -196,3 +196,7 @@ [MaxMur](https://github.com/TheMaxMur) - Add YAML support under `vim.languages.yaml`. + +[alfarel](https://github.com/alfarelcynthesis): + +- Add missing `yazi.nvim` dependency (`snacks.nvim`). diff --git a/modules/plugins/utility/yazi-nvim/config.nix b/modules/plugins/utility/yazi-nvim/config.nix index a781e5f0..e6a85d68 100644 --- a/modules/plugins/utility/yazi-nvim/config.nix +++ b/modules/plugins/utility/yazi-nvim/config.nix @@ -15,6 +15,7 @@ in { config = mkIf cfg.enable { vim = { + startPlugins = ["snacks-nvim"]; lazy.plugins."yazi.nvim" = { package = pkgs.vimPlugins.yazi-nvim; setupModule = "yazi"; diff --git a/npins/sources.json b/npins/sources.json index 0dc9e21b..d196ff99 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -1880,6 +1880,18 @@ "url": "https://github.com/m4xshen/smartcolumn.nvim/archive/92f3773af80d674f1eb61e112dca79e2fa449fd1.tar.gz", "hash": "0k1xnyvblshn4fhbxgl0i34j22n55xlwr09sdmb23l57br5rb07q" }, + "snacks-nvim": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "folke", + "repo": "snacks.nvim" + }, + "branch": "main", + "revision": "bc0630e43be5699bb94dadc302c0d21615421d93", + "url": "https://github.com/folke/snacks.nvim/archive/bc0630e43be5699bb94dadc302c0d21615421d93.tar.gz", + "hash": "0a5nw7xa33shag1h12gf930g3vcixbwk8dxv0ji4980ycskh238v" + }, "sqls-nvim": { "type": "Git", "repository": { From 6e35b04e748fd90458328f39b8372d1f82ffb7e0 Mon Sep 17 00:00:00 2001 From: MaxMur <31189199+TheMaxMur@users.noreply.github.com> Date: Sun, 2 Mar 2025 20:51:54 +0300 Subject: [PATCH 4/4] languages/yaml: fix enableLSP/enableTreesitter defaults (#680) --- modules/plugins/languages/yaml.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix index 2892f607..ef17b964 100644 --- a/modules/plugins/languages/yaml.nix +++ b/modules/plugins/languages/yaml.nix @@ -36,13 +36,13 @@ in { enable = mkEnableOption "YAML language support"; treesitter = { - enable = mkEnableOption "YAML treesitter"; + enable = mkEnableOption "YAML treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "yaml"; }; lsp = { - enable = mkEnableOption "YAML LSP support"; + enable = mkEnableOption "YAML LSP support" // {default = config.vim.languages.enableLSP;}; server = mkOption { type = enum (attrNames servers);