From 4e487434da3882417ff54c8579520987b9256c1a Mon Sep 17 00:00:00 2001 From: poz Date: Wed, 18 Feb 2026 11:48:39 +0100 Subject: [PATCH] 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