From 4e487434da3882417ff54c8579520987b9256c1a Mon Sep 17 00:00:00 2001 From: poz Date: Wed, 18 Feb 2026 11:48:39 +0100 Subject: [PATCH 1/4] languages/cmake: init --- configuration.nix | 1 + docs/manual/release-notes/rl-0.9.md | 6 ++ modules/plugins/languages/cmake.nix | 96 +++++++++++++++++++++++++++ modules/plugins/languages/default.nix | 1 + 4 files changed, 104 insertions(+) create mode 100644 modules/plugins/languages/cmake.nix diff --git a/configuration.nix b/configuration.nix index 13d3cf5d..fd006949 100644 --- a/configuration.nix +++ b/configuration.nix @@ -55,6 +55,7 @@ isMaximal: { # Languages that are enabled in the maximal configuration. bash.enable = isMaximal; clang.enable = isMaximal; + cmake.enable = isMaximal; css.enable = isMaximal; html.enable = isMaximal; json.enable = isMaximal; diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 47ce7cd6..83296c2b 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -241,4 +241,10 @@ https://github.com/gorbit99/codewindow.nvim - Ignore terminals by default in spell-checking +[poz](https://poz.pet): + +[neocmakelsp]: https://github.com/neocmakelsp/neocmakelsp + +- Add CMake support with [neocmakelsp]. + diff --git a/modules/plugins/languages/cmake.nix b/modules/plugins/languages/cmake.nix new file mode 100644 index 00000000..6c6fa287 --- /dev/null +++ b/modules/plugins/languages/cmake.nix @@ -0,0 +1,96 @@ +{ + config, + pkgs, + lib, + ... +}: let + inherit (builtins) attrNames; + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.meta) getExe; + inherit (lib.types) enum listOf package; + inherit (lib.nvim.attrsets) mapListToAttrs; + inherit (lib.nvim.types) mkGrammarOption; + + cfg = config.vim.languages.cmake; + + defaultServers = ["neocmakelsp"]; + servers = { + neocmakelsp = { + enable = true; + cmd = [(getExe pkgs.neocmakelsp) "--stdio"]; + filetypes = ["cmake"]; + root_markers = [".gersemirc" ".git" "build" "cmake"]; + capabilities = { + textDocument.completion.completionItem.snippetSupport = true; + }; + }; + }; + + defaultFormat = "gersemi"; + formats = { + gersemi = { + package = pkgs.gersemi; + }; + }; +in { + options.vim.languages.cmake = { + enable = mkEnableOption "CMake language support"; + + treesitter = { + enable = mkEnableOption "CMake treesitter" // {default = config.vim.languages.enableTreesitter;}; + package = mkGrammarOption pkgs "cmake"; + }; + + lsp = { + enable = mkEnableOption "CMake LSP support" // {default = config.vim.lsp.enable;}; + servers = mkOption { + type = listOf (enum (attrNames servers)); + default = defaultServers; + description = "CMake LSP servers to use"; + }; + }; + + format = { + enable = mkEnableOption "CMake formatting" // {default = config.vim.languages.enableFormat;}; + + type = mkOption { + description = "CMake formatter to use"; + type = enum (attrNames formats); + default = defaultFormat; + }; + + package = mkOption { + description = "CMake formatter package"; + type = package; + default = formats.${cfg.format.type}.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.servers = + mapListToAttrs (n: { + name = n; + value = servers.${n}; + }) + cfg.lsp.servers; + }) + + (mkIf cfg.format.enable { + vim.formatter.conform-nvim = { + enable = true; + setupOpts.formatters_by_ft.cmake = [cfg.format.type]; + setupOpts.formatters.${cfg.format.type} = { + command = getExe cfg.format.package; + }; + }; + }) + ]); +} diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index 0986e1e1..fe608513 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -10,6 +10,7 @@ in { ./dart.nix ./clang.nix ./clojure.nix + ./cmake.nix ./css.nix ./elixir.nix ./fsharp.nix From 54afb6211cc3a3b67e9bab3369e04197cc6ced95 Mon Sep 17 00:00:00 2001 From: poz Date: Wed, 18 Feb 2026 11:50:05 +0100 Subject: [PATCH 2/4] languages/arduino: init --- configuration.nix | 1 + docs/manual/release-notes/rl-0.9.md | 2 + modules/plugins/languages/arduino.nix | 95 +++++++++++++++++++++++++++ modules/plugins/languages/default.nix | 1 + 4 files changed, 99 insertions(+) create mode 100644 modules/plugins/languages/arduino.nix diff --git a/configuration.nix b/configuration.nix index fd006949..e52f667d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -76,6 +76,7 @@ isMaximal: { xml.enable = isMaximal; # Language modules that are not as common. + arduino.enable = false; assembly.enable = false; astro.enable = false; nu.enable = false; diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 83296c2b..5594fbe0 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -244,7 +244,9 @@ https://github.com/gorbit99/codewindow.nvim [poz](https://poz.pet): [neocmakelsp]: https://github.com/neocmakelsp/neocmakelsp +[arduino-language-server]: https://github.com/arduino/arduino-language-server - Add CMake support with [neocmakelsp]. +- Add Arduino support with [arduino-language-server]. diff --git a/modules/plugins/languages/arduino.nix b/modules/plugins/languages/arduino.nix new file mode 100644 index 00000000..b22c6d9d --- /dev/null +++ b/modules/plugins/languages/arduino.nix @@ -0,0 +1,95 @@ +{ + config, + pkgs, + lib, + ... +}: let + inherit (builtins) attrNames; + inherit (lib.generators) mkLuaInline; + inherit (lib.meta) getExe getExe'; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.types) enum listOf str; + inherit (lib.nvim.attrsets) mapListToAttrs; + inherit (lib.nvim.types) mkGrammarOption; + + cfg = config.vim.languages.arduino; + + defaultServers = ["arduino-language-server"]; + servers = { + arduino-language-server = { + enable = true; + cmd = + [ + (getExe pkgs.arduino-language-server) + "-clangd" + (getExe' pkgs.clang-tools "clangd") + "-cli" + (getExe pkgs.arduino-cli) + "-cli-config" + "$HOME/.arduino15/arduino-cli.yaml" + ] + ++ cfg.lsp.extraArgs; + filetypes = ["arduino"]; + root_dir = + mkLuaInline + /* + lua + */ + '' + function(bufnr, on_dir) + local fname = vim.api.nvim_buf_get_name(bufnr) + on_dir(util.root_pattern("*.ino")(fname)) + end + ''; + capabilities = { + textDocument = { + semanticTokens = mkLuaInline "vim.NIL"; + }; + workspace = { + semanticTokens = mkLuaInline "vim.NIL"; + }; + }; + }; + }; +in { + options.vim.languages.arduino = { + enable = mkEnableOption "Arduino support"; + + treesitter = { + enable = mkEnableOption "Arduino treesitter" // {default = config.vim.languages.enableTreesitter;}; + package = mkGrammarOption pkgs "arduino"; + }; + + lsp = { + enable = mkEnableOption "Arduino LSP support" // {default = config.vim.lsp.enable;}; + servers = mkOption { + type = listOf (enum (attrNames servers)); + default = defaultServers; + description = "Arduino LSP servers to use"; + }; + + extraArgs = mkOption { + type = listOf str; + default = []; + description = "Extra arguments passed to the Arduino LSP"; + }; + }; + }; + + 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.servers = + mapListToAttrs (n: { + name = n; + value = servers.${n}; + }) + cfg.lsp.servers; + }) + ]); +} diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index fe608513..e1cc8062 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -3,6 +3,7 @@ inherit (lib.nvim.languages) mkEnable; in { imports = [ + ./arduino.nix ./asm.nix ./astro.nix ./bash.nix From bacaa87608b1896b2a7ff335068f6d640b4117f0 Mon Sep 17 00:00:00 2001 From: poz Date: Wed, 18 Feb 2026 11:51:48 +0100 Subject: [PATCH 3/4] languages/glsl: init --- configuration.nix | 1 + docs/manual/release-notes/rl-0.9.md | 2 + modules/plugins/languages/default.nix | 1 + modules/plugins/languages/glsl.nix | 63 +++++++++++++++++++++++++++ 4 files changed, 67 insertions(+) create mode 100644 modules/plugins/languages/glsl.nix diff --git a/configuration.nix b/configuration.nix index e52f667d..cb0a2385 100644 --- a/configuration.nix +++ b/configuration.nix @@ -86,6 +86,7 @@ isMaximal: { scala.enable = false; r.enable = false; gleam.enable = false; + glsl.enable = false; dart.enable = false; ocaml.enable = false; elixir.enable = false; diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 5594fbe0..c275b0d3 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -245,8 +245,10 @@ https://github.com/gorbit99/codewindow.nvim [neocmakelsp]: https://github.com/neocmakelsp/neocmakelsp [arduino-language-server]: https://github.com/arduino/arduino-language-server +[glsl_analyzer]: https://github.com/nolanderc/glsl_analyzer - Add CMake support with [neocmakelsp]. - Add Arduino support with [arduino-language-server]. +- Add GLSL support with [glsl_analyzer]. diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index e1cc8062..1cdead76 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -16,6 +16,7 @@ in { ./elixir.nix ./fsharp.nix ./gleam.nix + ./glsl.nix ./go.nix ./hcl.nix ./helm.nix diff --git a/modules/plugins/languages/glsl.nix b/modules/plugins/languages/glsl.nix new file mode 100644 index 00000000..b555b008 --- /dev/null +++ b/modules/plugins/languages/glsl.nix @@ -0,0 +1,63 @@ +{ + config, + lib, + pkgs, + ... +}: let + inherit (builtins) attrNames; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.nvim.types) mkGrammarOption; + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.types) enum listOf; + inherit (lib.meta) getExe; + inherit (lib.nvim.attrsets) mapListToAttrs; + + cfg = config.vim.languages.glsl; + + defaultServers = ["glsl_analyzer"]; + servers = { + glsl_analyzer = { + enable = true; + cmd = [(getExe pkgs.glsl_analyzer)]; + filetypes = ["glsl" "vert" "tesc" "tese" "frag" "geom" "comp"]; + root_markers = [".git"]; + }; + }; +in { + options.vim.languages.glsl = { + enable = mkEnableOption "GLSL language support"; + + treesitter = { + enable = mkEnableOption "GLSL treesitter" // {default = config.vim.languages.enableTreesitter;}; + package = mkGrammarOption pkgs "glsl"; + }; + + lsp = { + enable = mkEnableOption "GLSL LSP support" // {default = config.vim.lsp.enable;}; + + servers = mkOption { + type = listOf (enum (attrNames servers)); + default = defaultServers; + description = "GLSL LSP server to use"; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + (mkIf cfg.treesitter.enable { + vim.treesitter = { + enable = true; + grammars = [cfg.treesitter.package]; + }; + }) + + (mkIf cfg.lsp.enable { + vim.lsp.servers = + mapListToAttrs (n: { + name = n; + value = servers.${n}; + }) + cfg.lsp.servers; + }) + ]); +} From 9724ddf39d9476f2696eb380530de06abf45ca39 Mon Sep 17 00:00:00 2001 From: poz Date: Wed, 18 Feb 2026 13:29:24 +0100 Subject: [PATCH 4/4] ci: add `tese` to typos --- .github/typos.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/typos.toml b/.github/typos.toml index 25d5c0e1..b6211a80 100644 --- a/.github/typos.toml +++ b/.github/typos.toml @@ -9,6 +9,7 @@ default.extend-ignore-words-re = [ "edn", "esy", "BA", # somehow "BANanaD3V" is valid, but BA is not... - "Emac" + "Emac", + "tese" # for glsl shaders ]