diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index 43d79f15..b6eb0d41 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -25,7 +25,7 @@ jobs: name: Checkout - name: Install Nix - uses: cachix/install-nix-action@v31.10.1 + uses: cachix/install-nix-action@v31.9.1 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 944386eb..bf1163df 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31.10.1 + - uses: cachix/install-nix-action@v31.9.1 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v6 - name: Install Nix - uses: cachix/install-nix-action@v31.10.1 + uses: cachix/install-nix-action@v31.9.1 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | @@ -93,7 +93,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31.10.1 + - uses: cachix/install-nix-action@v31.9.1 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | @@ -131,7 +131,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31.10.1 + - uses: cachix/install-nix-action@v31.9.1 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | @@ -169,7 +169,7 @@ jobs: cat "$HOME/changed_files" - name: Install Nix - uses: cachix/install-nix-action@v31.10.1 + uses: cachix/install-nix-action@v31.9.1 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index 1418e2cb..43c29afa 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31.10.1 + - uses: cachix/install-nix-action@v31.9.1 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index d6e117a6..6134f764 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31.10.1 + - uses: cachix/install-nix-action@v31.9.1 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: | diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index e60997d6..2cc2fadf 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v6 - name: "Install Nix" - uses: cachix/install-nix-action@v31.10.1 + uses: cachix/install-nix-action@v31.9.1 - name: Set up Git run: | diff --git a/configuration.nix b/configuration.nix index d0594674..9cce777a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -101,8 +101,6 @@ isMaximal: { tailwind.enable = false; svelte.enable = false; tera.enable = false; - twig.enable = false; - fluent.enable = false; # Nim LSP is broken on Darwin and therefore # should be disabled by default. Users may still enable diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index a7d44024..4a322868 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -48,8 +48,6 @@ - Added [taplo](https://taplo.tamasfe.dev/) as the default formatter and lsp for `languages.toml` so we don't default to AI-Slop. -- Added `json5` into `languages.json`. Some options where renamed. - ## Changelog {#sec-release-0-9-changelog} [taylrfnt](https://github.com/taylrfnt) @@ -210,9 +208,6 @@ - Added [`golangci-lint`](https://golangci-lint.run/) for more diagnostics. -- Added [`gopher.nvim`](https://github.com/olexsmir/gopher.nvim) for extra - actions in `languages.go`. - - updated default filetypes for [harper-ls](https://github.com/Automattic/harper) to match what they are supposed to be. @@ -222,19 +217,11 @@ - Fix `languages.hcl` init, depending on `comment-nvim` by checking if it is enabled. Fixes a crash (#1350). -- Add `languages.fluent` using the official plugin. This only provides - highlighting. - - Added Debugging support to `languages.php`. - Added Formatting support to `languages.php` via [PHP-CS-Fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer). -- Added minimal `languages.twig`. Currently using [djlint](https://djlint.com/) - for most options, as better alternatives like - [twig-cs-fixer](https://github.com/VincentLanglet/Twig-CS-Fixer) aren't - packaged for nix. - - Didn't Add [`syntax-gaslighting`](https://github.com/NotAShelf/syntax-gaslighting.nvim), you're crazy. @@ -284,14 +271,4 @@ https://github.com/gorbit99/codewindow.nvim - [img-clip.nvim]'s configuration now has it's own DAG entry, separate from image-nvim. -[phanirithvij](https://github.com/phanirithvij): - -[elm-language-server]: https://github.com/elm-tooling/elm-language-server - -- Add Elm support with [elm-language-server] - -[alv-around](https://github.com/alv-around): - -- Fix `vim.assistant.codecompanion-nvim` lazy loading with [blink-cmp] - diff --git a/flake/pkgs/by-name/json2go/package.nix b/flake/pkgs/by-name/json2go/package.nix deleted file mode 100644 index 0c7eff1a..00000000 --- a/flake/pkgs/by-name/json2go/package.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: -buildGoModule (finalAttrs: { - pname = "json2go"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "olexsmir"; - repo = "json2go"; - tag = "v${finalAttrs.version}"; - hash = "sha256-2QGvPLQ7CADRNURTdnHgTCK2vyRHgtdR6YFPuTL9Ymo="; - }; - - vendorHash = null; - - meta = { - description = "convert json to go type annotations"; - mainProgram = "json2go"; - homepage = "https://github.com/olexsmir/json2go"; - license = lib.licenses.unlicense; - changelog = "${finalAttrs.meta.homepage}/releases/tag/${finalAttrs.version}"; - }; -}) diff --git a/modules/plugins/assistant/codecompanion/config.nix b/modules/plugins/assistant/codecompanion/config.nix index 6fbb60fb..fa863b74 100644 --- a/modules/plugins/assistant/codecompanion/config.nix +++ b/modules/plugins/assistant/codecompanion/config.nix @@ -18,18 +18,6 @@ in { package = "codecompanion-nvim"; setupModule = "codecompanion"; inherit (cfg) setupOpts; - - # Register commands with lz.n so Neovim recognizes them immediately - cmd = [ - "CodeCompanion" - "CodeCompanionChat" - "CodeCompanionActions" - "CodeCompanionCmd" - ]; - - # Ensure the plugin loads when entering Insert/Cmdline mode - # so the module is ready when blink.cmp requests it - event = ["InsertEnter" "CmdlineEnter"]; }; }; @@ -45,20 +33,9 @@ in { ]; }; - autocomplete = { - nvim-cmp = { - sources = {codecompanion-nvim = "[codecompanion]";}; - sourcePlugins = ["codecompanion-nvim"]; - }; - blink-cmp = { - setupOpts.sources = { - default = ["codecompanion"]; - providers.codecompanion = { - name = "CodeCompanion"; - module = "codecompanion.providers.completion.blink"; - }; - }; - }; + autocomplete.nvim-cmp = { + sources = {codecompanion-nvim = "[codecompanion]";}; + sourcePlugins = ["codecompanion-nvim"]; }; }; }; diff --git a/modules/plugins/languages/arduino.nix b/modules/plugins/languages/arduino.nix index 89f9e051..b22c6d9d 100644 --- a/modules/plugins/languages/arduino.nix +++ b/modules/plugins/languages/arduino.nix @@ -8,7 +8,7 @@ inherit (lib.generators) mkLuaInline; inherit (lib.meta) getExe getExe'; inherit (lib.modules) mkIf mkMerge; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) enum listOf str; inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.types) mkGrammarOption; @@ -57,22 +57,12 @@ in { enable = mkEnableOption "Arduino support"; treesitter = { - enable = - mkEnableOption "Arduino treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Arduino treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "arduino"; }; lsp = { - enable = - mkEnableOption "Arduino LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Arduino LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/asm.nix b/modules/plugins/languages/asm.nix index eccc91e7..4fb36f4c 100644 --- a/modules/plugins/languages/asm.nix +++ b/modules/plugins/languages/asm.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum; inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; @@ -27,22 +27,12 @@ in { enable = mkEnableOption "Assembly support"; treesitter = { - enable = - mkEnableOption "Assembly treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Assembly treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "asm"; }; lsp = { - enable = - mkEnableOption "Assembly LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Assembly LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.asm.lsp.servers" (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix index af647ad0..4dbbaa71 100644 --- a/modules/plugins/languages/astro.nix +++ b/modules/plugins/languages/astro.nix @@ -6,7 +6,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum coercedTo; @@ -89,23 +89,13 @@ in { enable = mkEnableOption "Astro language support"; treesitter = { - enable = - mkEnableOption "Astro treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Astro treesitter" // {default = config.vim.languages.enableTreesitter;}; astroPackage = mkGrammarOption pkgs "astro"; }; lsp = { - enable = - mkEnableOption "Astro LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Astro LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.astro.lsp.servers" (enum (attrNames servers)); default = defaultServers; @@ -114,12 +104,7 @@ in { }; format = { - enable = - mkEnableOption "Astro formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "Astro formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { type = formatType; @@ -129,12 +114,7 @@ in { }; extraDiagnostics = { - enable = - mkEnableOption "extra Astro diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; - }; + enable = mkEnableOption "extra Astro diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; types = diagnostics { langDesc = "Astro"; diff --git a/modules/plugins/languages/bash.nix b/modules/plugins/languages/bash.nix index d9d78b2b..467f3f63 100644 --- a/modules/plugins/languages/bash.nix +++ b/modules/plugins/languages/bash.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkOption mkEnableOption literalExpression; + inherit (lib.options) mkOption mkEnableOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum bool; @@ -48,22 +48,12 @@ in { enable = mkEnableOption "Bash language support"; treesitter = { - enable = - mkEnableOption "Bash treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Bash treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "bash"; }; lsp = { - enable = - mkEnableOption "Bash LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Bash LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.bash.lsp.servers" (enum (attrNames servers)); default = defaultServers; @@ -75,7 +65,6 @@ in { enable = mkOption { type = bool; default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; description = "Enable Bash formatting"; }; type = mkOption { @@ -86,12 +75,7 @@ in { }; extraDiagnostics = { - enable = - mkEnableOption "extra Bash diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; - }; + enable = mkEnableOption "extra Bash diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; types = diagnostics { langDesc = "Bash"; inherit diagnosticsProviders; diff --git a/modules/plugins/languages/clang.nix b/modules/plugins/languages/clang.nix index 5115ed2a..6948ff50 100644 --- a/modules/plugins/languages/clang.nix +++ b/modules/plugins/languages/clang.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) bool enum package; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; @@ -184,23 +184,13 @@ in { }; treesitter = { - enable = - mkEnableOption "C/C++ treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "C/C++ treesitter" // {default = config.vim.languages.enableTreesitter;}; cPackage = mkGrammarOption pkgs "c"; cppPackage = mkGrammarOption pkgs "cpp"; }; lsp = { - enable = - mkEnableOption "clang LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "clang LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { description = "The clang LSP server to use"; @@ -214,7 +204,6 @@ in { description = "Enable clang Debug Adapter"; type = bool; default = config.vim.languages.enableDAP; - defaultText = literalExpression "config.vim.languages.enableDAP"; }; debugger = mkOption { description = "clang debugger to use"; diff --git a/modules/plugins/languages/clojure.nix b/modules/plugins/languages/clojure.nix index decaf926..53c7fbbe 100644 --- a/modules/plugins/languages/clojure.nix +++ b/modules/plugins/languages/clojure.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum listOf; @@ -28,22 +28,12 @@ in { enable = mkEnableOption "Clojure language support"; treesitter = { - enable = - mkEnableOption "Clojure treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Clojure treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "clojure"; }; lsp = { - enable = - mkEnableOption "Clojure LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Clojure LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/cmake.nix b/modules/plugins/languages/cmake.nix index a0610d46..6c6fa287 100644 --- a/modules/plugins/languages/cmake.nix +++ b/modules/plugins/languages/cmake.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum listOf package; @@ -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 = { @@ -38,22 +38,12 @@ in { enable = mkEnableOption "CMake language support"; treesitter = { - enable = - mkEnableOption "CMake treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "CMake treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "cmake"; }; lsp = { - enable = - mkEnableOption "CMake LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "CMake LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); default = defaultServers; @@ -62,12 +52,7 @@ in { }; format = { - enable = - mkEnableOption "CMake formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "CMake formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { description = "CMake formatter to use"; diff --git a/modules/plugins/languages/csharp.nix b/modules/plugins/languages/csharp.nix index b6942d0a..ef973301 100644 --- a/modules/plugins/languages/csharp.nix +++ b/modules/plugins/languages/csharp.nix @@ -6,7 +6,7 @@ ... }: let inherit (builtins) attrNames concatMap; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) enum; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; @@ -177,22 +177,12 @@ in { enable = mkEnableOption "C# language support"; treesitter = { - enable = - mkEnableOption "C# treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "C# treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "c_sharp"; }; lsp = { - enable = - mkEnableOption "C# LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "C# LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { description = "C# LSP server to use"; type = deprecatedSingleOrListOf "vim.language.csharp.lsp.servers" (enum (attrNames servers)); diff --git a/modules/plugins/languages/css.nix b/modules/plugins/languages/css.nix index 27516400..28e94151 100644 --- a/modules/plugins/languages/css.nix +++ b/modules/plugins/languages/css.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum; @@ -49,23 +49,13 @@ in { enable = mkEnableOption "CSS language support"; treesitter = { - enable = - mkEnableOption "CSS treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "CSS treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "css"; }; lsp = { - enable = - mkEnableOption "CSS LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "CSS LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.css.lsp.servers" (enum (attrNames servers)); diff --git a/modules/plugins/languages/cue.nix b/modules/plugins/languages/cue.nix index b4294ecd..a22ff91c 100644 --- a/modules/plugins/languages/cue.nix +++ b/modules/plugins/languages/cue.nix @@ -4,7 +4,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption literalExpression; + inherit (lib.options) mkEnableOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption; @@ -21,23 +21,13 @@ in { enable = mkEnableOption "CUE language support"; treesitter = { - enable = - mkEnableOption "CUE treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "CUE treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "cue"; }; lsp = { - enable = - mkEnableOption "CUE LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "CUE LSP support" // {default = config.vim.lsp.enable;}; }; }; diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix index b585da76..291999c2 100644 --- a/modules/plugins/languages/dart.nix +++ b/modules/plugins/languages/dart.nix @@ -8,7 +8,7 @@ inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.trivial) boolToString; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) enum package nullOr str bool; inherit (lib.strings) optionalString; inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; @@ -45,22 +45,12 @@ in { enable = mkEnableOption "Dart language support"; treesitter = { - enable = - mkEnableOption "Dart treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Dart treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "dart"; }; lsp = { - enable = - mkEnableOption "Dart LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Dart LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.dart.lsp.servers" (enum (attrNames servers)); default = defaultServers; @@ -73,7 +63,6 @@ in { description = "Enable Dart DAP support via flutter-tools"; type = bool; default = config.vim.languages.enableDAP; - defaultText = literalExpression "config.vim.languages.enableDAP"; }; }; @@ -81,7 +70,6 @@ in { enable = mkOption { type = bool; default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; description = "Enable flutter-tools for flutter support"; }; diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index ee652d2d..1cdead76 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -14,7 +14,6 @@ in { ./cmake.nix ./css.nix ./elixir.nix - ./elm.nix ./fsharp.nix ./gleam.nix ./glsl.nix @@ -24,7 +23,6 @@ in { ./kotlin.nix ./html.nix ./tera.nix - ./twig.nix ./haskell.nix ./java.nix ./jinja.nix @@ -59,7 +57,6 @@ in { ./just.nix ./make.nix ./xml.nix - ./fluent.nix # This is now a hard deprecation. (mkRenamedOptionModule ["vim" "languages" "enableLSP"] ["vim" "lsp" "enable"]) diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix index f8191f77..0aa32453 100644 --- a/modules/plugins/languages/elixir.nix +++ b/modules/plugins/languages/elixir.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum; @@ -51,24 +51,14 @@ in { enable = mkEnableOption "Elixir language support"; treesitter = { - enable = - mkEnableOption "Elixir treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Elixir treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "elixir"; heexPackage = mkGrammarOption pkgs "heex"; eexPackage = mkGrammarOption pkgs "eex"; }; lsp = { - enable = - mkEnableOption "Elixir LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Elixir LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.elixir.lsp.servers" (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/elm.nix b/modules/plugins/languages/elm.nix deleted file mode 100644 index 9a7c4a17..00000000 --- a/modules/plugins/languages/elm.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; - inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) enum; - inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; - inherit (lib.meta) getExe; - inherit (lib.nvim.attrsets) mapListToAttrs; - - cfg = config.vim.languages.elm; - - defaultServers = ["elm-language-server"]; - servers = { - elm-language-server = { - enable = true; - cmd = [(getExe pkgs.elmPackages.elm-language-server)]; - filetypes = ["elm"]; - root_markers = ["elm.json"]; - workspace_required = false; - }; - }; -in { - options.vim.languages.elm = { - enable = mkEnableOption "Elm language support"; - - treesitter = { - enable = - mkEnableOption "Elm treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; - package = mkGrammarOption pkgs "elm"; - }; - - lsp = { - enable = - mkEnableOption "Elm LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; - - servers = mkOption { - type = deprecatedSingleOrListOf "vim.language.elm.lsp.servers" (enum (attrNames servers)); - default = defaultServers; - description = "Elm LSP servers 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; - }; - }) - ]); -} diff --git a/modules/plugins/languages/fluent.nix b/modules/plugins/languages/fluent.nix deleted file mode 100644 index 631ba590..00000000 --- a/modules/plugins/languages/fluent.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib.options) mkEnableOption; - inherit (lib.modules) mkIf; - - cfg = config.vim.languages.fluent; -in { - options.vim.languages.fluent = { - enable = mkEnableOption "Fluent language support"; - }; - - config = mkIf cfg.enable { - vim = { - lazy.plugins.fluent-nvim = { - package = "fluent-nvim"; - ft = ["fluent"]; - }; - autocmds = [ - { - event = [ - "BufRead" - "BufNewFile" - ]; - pattern = ["*.ftl"]; - desc = "Set fluent filetype"; - command = "set filetype=fluent"; - } - ]; - }; - }; -} diff --git a/modules/plugins/languages/fsharp.nix b/modules/plugins/languages/fsharp.nix index e57eb66d..19703022 100644 --- a/modules/plugins/languages/fsharp.nix +++ b/modules/plugins/languages/fsharp.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) enum; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; @@ -65,22 +65,12 @@ in { enable = mkEnableOption "F# language support"; treesitter = { - enable = - mkEnableOption "F# treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "F# treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "fsharp"; }; lsp = { - enable = - mkEnableOption "F# LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "F# LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.fsharp.lsp.servers" (enum (attrNames servers)); default = defaultServer; diff --git a/modules/plugins/languages/gleam.nix b/modules/plugins/languages/gleam.nix index 8007c8bc..349d9ac1 100644 --- a/modules/plugins/languages/gleam.nix +++ b/modules/plugins/languages/gleam.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum; @@ -28,22 +28,12 @@ in { enable = mkEnableOption "Gleam language support"; treesitter = { - enable = - mkEnableOption "Gleam treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Gleam treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "gleam"; }; lsp = { - enable = - mkEnableOption "Gleam LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Gleam LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.gleam.lsp.servers" (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/glsl.nix b/modules/plugins/languages/glsl.nix index c4df32e3..b555b008 100644 --- a/modules/plugins/languages/glsl.nix +++ b/modules/plugins/languages/glsl.nix @@ -7,7 +7,7 @@ inherit (builtins) attrNames; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) enum listOf; inherit (lib.meta) getExe; inherit (lib.nvim.attrsets) mapListToAttrs; @@ -28,22 +28,12 @@ in { enable = mkEnableOption "GLSL language support"; treesitter = { - enable = - mkEnableOption "GLSL treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "GLSL treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "glsl"; }; lsp = { - enable = - mkEnableOption "GLSL LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "GLSL LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); diff --git a/modules/plugins/languages/go.nix b/modules/plugins/languages/go.nix index 7c83ebf2..da3700a7 100644 --- a/modules/plugins/languages/go.nix +++ b/modules/plugins/languages/go.nix @@ -1,17 +1,16 @@ { - inputs, config, pkgs, lib, ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalMD literalExpression; + inherit (lib.options) mkEnableOption mkOption literalMD; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.generators) mkLuaInline; - inherit (lib.types) bool enum package str; - inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf mkPluginSetupOption; + inherit (lib.types) bool enum package; + inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf; inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.attrsets) mapListToAttrs; @@ -65,11 +64,9 @@ gofmt = { command = "${pkgs.go}/bin/gofmt"; }; - gofumpt = { command = getExe pkgs.gofumpt; }; - golines = { command = "${pkgs.golines}/bin/golines"; }; @@ -171,12 +168,7 @@ in { enable = mkEnableOption "Go language support"; treesitter = { - enable = - mkEnableOption "Go treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Go treesitter" // {default = config.vim.languages.enableTreesitter;}; goPackage = mkGrammarOption pkgs "go"; gomodPackage = mkGrammarOption pkgs "gomod"; @@ -186,12 +178,7 @@ in { }; lsp = { - enable = - mkEnableOption "Go LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Go LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.go.lsp.servers" (enum (attrNames servers)); @@ -211,111 +198,51 @@ in { }; type = mkOption { + description = "Go formatter to use"; type = deprecatedSingleOrListOf "vim.language.go.format.type" (enum (attrNames formats)); default = defaultFormat; - description = "Go formatter to use"; }; }; dap = { - enable = - mkEnableOption "Go Debug Adapter (DAP) via `nvim-dap-go" - // { - default = config.vim.languages.enableDAP; - defaultText = literalExpression "config.vim.languages.enableDAP"; - }; + enable = mkOption { + description = "Enable Go Debug Adapter via nvim-dap-go plugin"; + type = bool; + default = config.vim.languages.enableDAP; + }; debugger = mkOption { + description = "Go debugger to use"; type = enum (attrNames debuggers); default = defaultDebugger; - description = "Go debugger to use"; }; package = mkOption { + description = "Go debugger package."; type = package; default = debuggers.${cfg.dap.debugger}.package; - description = "Go debugger package."; }; }; - extraDiagnostics = { - enable = - mkEnableOption "extra Go diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostic"; - }; - + enable = mkEnableOption "extra Go diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; types = diagnostics { langDesc = "Go"; inherit diagnosticsProviders; inherit defaultDiagnosticsProvider; }; }; - - extensions = { - gopher-nvim = { - enable = mkEnableOption "Minimalistic plugin for Go development"; - setupOpts = mkPluginSetupOption "gopher-nvim" { - commands = { - go = mkOption { - type = str; - default = "go"; - description = "Go binary to use"; - }; - - gomodifytags = mkOption { - type = str; - default = getExe pkgs.gomodifytags; - defaultText = literalExpression "getExe pkgs.gomodifytags"; - description = "gomodifytags binary to use"; - }; - - gotests = mkOption { - type = str; - default = getExe pkgs.gotests; - defaultText = literalExpression "getExe pkgs.gotests"; - description = "gotests binary to use"; - }; - - impl = mkOption { - type = str; - default = getExe pkgs.impl; - defaultText = literalExpression "getExe pkgs.impl"; - description = "impl binary to use"; - }; - - iferr = mkOption { - type = str; - default = getExe pkgs.iferr; - defaultText = literalExpression "getExe pkgs.iferr"; - description = "iferr binary to use"; - }; - - json2go = mkOption { - type = str; - default = getExe inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.json2go; - defaultText = literalExpression "getExe inputs.self.packages.$${pkgs.stdenv.hostPlatform.system}.json2go"; - description = "json2go binary to use"; - }; - }; - }; - }; - }; }; config = mkIf cfg.enable (mkMerge [ (mkIf cfg.treesitter.enable { - vim.treesitter = { - enable = true; - grammars = [ - cfg.treesitter.goPackage - cfg.treesitter.gomodPackage - cfg.treesitter.gosumPackage - cfg.treesitter.goworkPackage - cfg.treesitter.gotmplPackage - ]; - }; + vim.treesitter.enable = true; + vim.treesitter.grammars = [ + cfg.treesitter.goPackage + cfg.treesitter.gomodPackage + cfg.treesitter.gosumPackage + cfg.treesitter.goworkPackage + cfg.treesitter.gotmplPackage + ]; }) (mkIf cfg.lsp.enable { @@ -365,14 +292,5 @@ in { cfg.extraDiagnostics.types); }; }) - - (mkIf cfg.extensions.gopher-nvim.enable { - vim.lazy.plugins.gopher-nvim = { - package = "gopher-nvim"; - setupModule = "gopher"; - inherit (cfg.extensions.gopher-nvim) setupOpts; - ft = ["go"]; - }; - }) ]); } diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix index 32f45151..ac18fe55 100644 --- a/modules/plugins/languages/haskell.nix +++ b/modules/plugins/languages/haskell.nix @@ -6,7 +6,7 @@ }: let inherit (builtins) isList attrNames; inherit (lib.types) either package enum listOf str; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.strings) optionalString; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption; @@ -57,7 +57,7 @@ settings = { haskell = { formattingProvider = "ormolu"; - cabalFormattingProvider = "cabal-fmt"; + cabalFormattingProvider = "cabalfmt"; }; }; }; @@ -67,22 +67,12 @@ in { enable = mkEnableOption "Haskell support"; treesitter = { - enable = - mkEnableOption "Treesitter support for Haskell" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Treesitter support for Haskell" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "haskell"; }; lsp = { - enable = - mkEnableOption "Haskell LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Haskell LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); default = defaultServers; @@ -91,12 +81,7 @@ in { }; dap = { - enable = - mkEnableOption "DAP support for Haskell" - // { - default = config.vim.languages.enableDAP; - defaultText = literalExpression "config.vim.languages.enableDAP"; - }; + enable = mkEnableOption "DAP support for Haskell" // {default = config.vim.languages.enableDAP;}; package = mkOption { default = haskellPackages.haskell-debug-adapter; type = either package (listOf str); diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix index ea125f1b..c20c7872 100644 --- a/modules/plugins/languages/hcl.nix +++ b/modules/plugins/languages/hcl.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) bool enum listOf; @@ -35,22 +35,12 @@ in { enable = mkEnableOption "HCL support"; treesitter = { - enable = - mkEnableOption "HCL treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "HCL treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "hcl"; }; lsp = { - enable = - mkEnableOption "HCL LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "HCL LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); default = defaultServers; @@ -59,12 +49,11 @@ in { }; format = { - enable = - mkEnableOption "HCL formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkOption { + type = bool; + default = config.vim.languages.enableFormat; + description = "Enable HCL formatting"; + }; type = mkOption { type = deprecatedSingleOrListOf "vim.language.hcl.format.type" (enum (attrNames formats)); default = defaultFormat; diff --git a/modules/plugins/languages/helm.nix b/modules/plugins/languages/helm.nix index c2152b54..18b09722 100644 --- a/modules/plugins/languages/helm.nix +++ b/modules/plugins/languages/helm.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames head; - inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkDefault mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum; @@ -44,22 +44,12 @@ in { enable = mkEnableOption "Helm language support"; treesitter = { - enable = - mkEnableOption "Helm treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Helm treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "helm"; }; lsp = { - enable = - mkEnableOption "Helm LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Helm LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.helm.lsp.servers" (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/html.nix b/modules/plugins/languages/html.nix index cba4da6d..85918ad2 100644 --- a/modules/plugins/languages/html.nix +++ b/modules/plugins/languages/html.nix @@ -6,7 +6,7 @@ }: let inherit (builtins) attrNames; inherit (lib.meta) getExe; - inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) bool enum; inherit (lib.lists) optional; @@ -48,12 +48,7 @@ in { options.vim.languages.html = { enable = mkEnableOption "HTML language support"; treesitter = { - enable = - mkEnableOption "HTML treesitter support" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "HTML treesitter support" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "html"; autotagHtml = mkOption { type = bool; @@ -63,12 +58,7 @@ in { }; lsp = { - enable = - mkEnableOption "HTML LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "HTML LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.html.lsp.servers" (enum (attrNames servers)); default = defaultServers; @@ -77,12 +67,7 @@ in { }; format = { - enable = - mkEnableOption "HTML formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "HTML formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { type = deprecatedSingleOrListOf "vim.language.html.format.type" (enum (attrNames formats)); @@ -92,12 +77,7 @@ in { }; extraDiagnostics = { - enable = - mkEnableOption "extra HTML diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; - }; + enable = mkEnableOption "extra HTML diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; types = diagnostics { langDesc = "HTML"; diff --git a/modules/plugins/languages/java.nix b/modules/plugins/languages/java.nix index d843e2a8..82fae184 100644 --- a/modules/plugins/languages/java.nix +++ b/modules/plugins/languages/java.nix @@ -4,7 +4,7 @@ lib, ... }: let - inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (builtins) attrNames; @@ -65,22 +65,12 @@ in { enable = mkEnableOption "Java language support"; treesitter = { - enable = - mkEnableOption "Java treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Java treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "java"; }; lsp = { - enable = - mkEnableOption "Java LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Java LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/jinja.nix b/modules/plugins/languages/jinja.nix index ce141eb9..a4635f58 100644 --- a/modules/plugins/languages/jinja.nix +++ b/modules/plugins/languages/jinja.nix @@ -7,7 +7,7 @@ inherit (builtins) attrNames; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; - inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) enum listOf; inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.attrsets) mapListToAttrs; @@ -29,23 +29,13 @@ in { enable = mkEnableOption "Jinja template language support"; treesitter = { - enable = - mkEnableOption "Jinja treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Jinja treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "jinja"; inlinePackage = mkGrammarOption pkgs "jinja_inline"; }; lsp = { - enable = - mkEnableOption "Jinja LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Jinja LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { description = "Jinja LSP server to use"; type = listOf (enum (attrNames servers)); diff --git a/modules/plugins/languages/json.nix b/modules/plugins/languages/json.nix index 5e85371a..c928d3c5 100644 --- a/modules/plugins/languages/json.nix +++ b/modules/plugins/languages/json.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkOption mkEnableOption literalExpression; + inherit (lib.options) mkOption mkEnableOption; inherit (lib.meta) getExe' getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum; @@ -18,7 +18,7 @@ servers = { jsonls = { cmd = [(getExe' pkgs.vscode-langservers-extracted "vscode-json-language-server") "--stdio"]; - filetypes = ["json" "jsonc" "json5"]; + filetypes = ["json" "jsonc"]; init_options = {provideFormatter = true;}; root_markers = [".git"]; }; @@ -37,24 +37,13 @@ in { enable = mkEnableOption "JSON language support"; treesitter = { - enable = - mkEnableOption "JSON treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "JSON treesitter" // {default = config.vim.languages.enableTreesitter;}; - jsonPackage = mkGrammarOption pkgs "json"; - json5Package = mkGrammarOption pkgs "json5"; + package = mkGrammarOption pkgs "json"; }; lsp = { - enable = - mkEnableOption "JSON LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "JSON LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.json.lsp.servers" (enum (attrNames servers)); @@ -64,12 +53,7 @@ in { }; format = { - enable = - mkEnableOption "JSON formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "JSON formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { description = "JSON formatter to use"; @@ -82,10 +66,7 @@ in { config = mkIf cfg.enable (mkMerge [ (mkIf cfg.treesitter.enable { vim.treesitter.enable = true; - vim.treesitter.grammars = [ - cfg.treesitter.jsonPackage - cfg.treesitter.json5Package - ]; + vim.treesitter.grammars = [cfg.treesitter.package]; }) (mkIf cfg.lsp.enable { @@ -102,7 +83,6 @@ in { enable = true; setupOpts = { formatters_by_ft.json = cfg.format.type; - formatters_by_ft.json5 = cfg.format.type; formatters = mapListToAttrs (name: { inherit name; diff --git a/modules/plugins/languages/julia.nix b/modules/plugins/languages/julia.nix index 7d5785c9..971e9f03 100644 --- a/modules/plugins/languages/julia.nix +++ b/modules/plugins/languages/julia.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) enum; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; @@ -90,22 +90,12 @@ in { enable = mkEnableOption "Julia language support"; treesitter = { - enable = - mkEnableOption "Julia treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Julia treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "julia"; }; lsp = { - enable = - mkEnableOption "Julia LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Julia LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.julia.lsp.servers" (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/just.nix b/modules/plugins/languages/just.nix index 210941bd..7645f255 100644 --- a/modules/plugins/languages/just.nix +++ b/modules/plugins/languages/just.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum listOf; @@ -29,21 +29,13 @@ in { treesitter = { enable = - mkEnableOption "Just treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + mkEnableOption "Just treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "just"; }; lsp = { enable = - mkEnableOption "Just LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + mkEnableOption "Just LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/kotlin.nix b/modules/plugins/languages/kotlin.nix index 63cbe428..f316c4cb 100644 --- a/modules/plugins/languages/kotlin.nix +++ b/modules/plugins/languages/kotlin.nix @@ -4,7 +4,7 @@ lib, ... }: let - inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe' getExe; inherit (builtins) attrNames; @@ -56,22 +56,12 @@ in { enable = mkEnableOption "Kotlin/HCL support"; treesitter = { - enable = - mkEnableOption "Kotlin treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Kotlin treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "kotlin"; }; lsp = { - enable = - mkEnableOption "Kotlin LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Kotlin LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); default = defaultServers; @@ -80,12 +70,7 @@ in { }; extraDiagnostics = { - enable = - mkEnableOption "extra Kotlin diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; - }; + enable = mkEnableOption "extra Kotlin diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; types = diagnostics { langDesc = "Kotlin"; diff --git a/modules/plugins/languages/lua.nix b/modules/plugins/languages/lua.nix index 52d32d6f..564fcece 100644 --- a/modules/plugins/languages/lua.nix +++ b/modules/plugins/languages/lua.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) bool enum listOf; @@ -60,22 +60,12 @@ in { options.vim.languages.lua = { enable = mkEnableOption "Lua language support"; treesitter = { - enable = - mkEnableOption "Lua Treesitter support" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Lua Treesitter support" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "lua"; }; lsp = { - enable = - mkEnableOption "Lua LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Lua LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); default = defaultServers; @@ -89,7 +79,6 @@ in { enable = mkOption { type = bool; default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; description = "Enable Lua formatting"; }; type = mkOption { @@ -100,12 +89,7 @@ in { }; extraDiagnostics = { - enable = - mkEnableOption "extra Lua diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; - }; + enable = mkEnableOption "extra Lua diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; types = diagnostics { langDesc = "Lua"; inherit diagnosticsProviders; diff --git a/modules/plugins/languages/make.nix b/modules/plugins/languages/make.nix index 25cbb885..f7780cd9 100644 --- a/modules/plugins/languages/make.nix +++ b/modules/plugins/languages/make.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.meta) getExe; inherit (lib.types) listOf enum; inherit (lib.modules) mkIf mkMerge; @@ -34,22 +34,12 @@ in { enable = mkEnableOption "Make support"; treesitter = { - enable = - mkEnableOption "Make treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Make treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "make"; }; format = { - enable = - mkEnableOption "Make formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "Make formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { description = "make formatter to use"; type = listOf (enum (attrNames formats)); @@ -58,12 +48,7 @@ in { }; extraDiagnostics = { - enable = - mkEnableOption "extra Make diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; - }; + enable = mkEnableOption "extra Make diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; types = diagnostics { langDesc = "Make"; inherit diagnosticsProviders; diff --git a/modules/plugins/languages/markdown.nix b/modules/plugins/languages/markdown.nix index c8a4c222..76b1e92f 100644 --- a/modules/plugins/languages/markdown.nix +++ b/modules/plugins/languages/markdown.nix @@ -7,7 +7,7 @@ inherit (builtins) attrNames; inherit (lib.meta) getExe getExe'; inherit (lib.modules) mkIf mkMerge; - inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) bool enum listOf str nullOr; inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption deprecatedSingleOrListOf; @@ -82,7 +82,6 @@ in { enable = mkOption { type = bool; default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; description = "Enable Markdown treesitter"; }; mdPackage = mkGrammarOption pkgs "markdown"; @@ -90,12 +89,7 @@ in { }; lsp = { - enable = - mkEnableOption "Markdown LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Markdown LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { description = "Markdown LSP server to use"; @@ -105,12 +99,7 @@ in { }; format = { - enable = - mkEnableOption "Markdown formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "Markdown formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { type = deprecatedSingleOrListOf "vim.language.markdown.format.type" (enum (attrNames formats)); @@ -165,12 +154,7 @@ in { }; extraDiagnostics = { - enable = - mkEnableOption "extra Markdown diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; - }; + enable = mkEnableOption "extra Markdown diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; types = diagnostics { langDesc = "Markdown"; inherit diagnosticsProviders; diff --git a/modules/plugins/languages/nim.nix b/modules/plugins/languages/nim.nix index 97bcdd9d..faf71baa 100644 --- a/modules/plugins/languages/nim.nix +++ b/modules/plugins/languages/nim.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.meta) getExe'; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum; @@ -48,22 +48,12 @@ in { enable = mkEnableOption "Nim language support"; treesitter = { - enable = - mkEnableOption "Nim treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Nim treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "nim"; }; lsp = { - enable = - mkEnableOption "Nim LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Nim LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.nim.lsp.servers" (enum (attrNames servers)); @@ -73,12 +63,7 @@ in { }; format = { - enable = - mkEnableOption "Nim formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "Nim formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { type = deprecatedSingleOrListOf "vim.language.nim.format.type" (enum (attrNames formats)); default = defaultFormat; diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix index 29185b12..0dc5b357 100644 --- a/modules/plugins/languages/nix.nix +++ b/modules/plugins/languages/nix.nix @@ -7,7 +7,7 @@ inherit (builtins) attrNames; inherit (lib) concatStringsSep; inherit (lib.meta) getExe; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum; inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf; @@ -74,22 +74,12 @@ in { enable = mkEnableOption "Nix language support"; treesitter = { - enable = - mkEnableOption "Nix treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Nix treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "nix"; }; lsp = { - enable = - mkEnableOption "Nix LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Nix LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.nix.lsp.servers" (enum (attrNames servers)); default = defaultServers; @@ -98,12 +88,7 @@ in { }; format = { - enable = - mkEnableOption "Nix formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "Nix formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { description = "Nix formatter to use"; @@ -113,12 +98,7 @@ in { }; extraDiagnostics = { - enable = - mkEnableOption "extra Nix diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; - }; + enable = mkEnableOption "extra Nix diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; types = diagnostics { langDesc = "Nix"; diff --git a/modules/plugins/languages/nu.nix b/modules/plugins/languages/nu.nix index a36e1255..7bbe1d78 100644 --- a/modules/plugins/languages/nu.nix +++ b/modules/plugins/languages/nu.nix @@ -4,7 +4,7 @@ config, ... }: let - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) enum; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; @@ -38,22 +38,12 @@ in { enable = mkEnableOption "Nu language support"; treesitter = { - enable = - mkEnableOption "Nu treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Nu treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "nu"; }; lsp = { - enable = - mkEnableOption "Nu LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Nu LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.nu.lsp.servers" (enum (attrNames servers)); diff --git a/modules/plugins/languages/ocaml.nix b/modules/plugins/languages/ocaml.nix index 6395fda5..2ff5bfce 100644 --- a/modules/plugins/languages/ocaml.nix +++ b/modules/plugins/languages/ocaml.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum; @@ -66,22 +66,12 @@ in { enable = mkEnableOption "OCaml language support"; treesitter = { - enable = - mkEnableOption "OCaml treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "OCaml treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "ocaml"; }; lsp = { - enable = - mkEnableOption "OCaml LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "OCaml LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.ocaml.lsp.servers" (enum (attrNames servers)); diff --git a/modules/plugins/languages/odin.nix b/modules/plugins/languages/odin.nix index d2bd3c85..cee9b330 100644 --- a/modules/plugins/languages/odin.nix +++ b/modules/plugins/languages/odin.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum package; inherit (lib.nvim.dag) entryAfter; @@ -53,22 +53,12 @@ in { enable = mkEnableOption "Odin language support"; treesitter = { - enable = - mkEnableOption "Odin treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Odin treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "odin"; }; lsp = { - enable = - mkEnableOption "Odin LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Odin LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.odin.lsp.servers" (enum (attrNames servers)); @@ -78,12 +68,7 @@ in { }; dap = { - enable = - mkEnableOption "Enable Odin Debug Adapter" - // { - default = config.vim.languages.enableDAP; - defaultText = literalExpression "config.vim.languages.enableDAP"; - }; + enable = mkEnableOption "Enable Odin Debug Adapter" // {default = config.vim.languages.enableDAP;}; debugger = mkOption { description = "Odin debugger to use"; diff --git a/modules/plugins/languages/php.nix b/modules/plugins/languages/php.nix index 02e430a2..8d2af124 100644 --- a/modules/plugins/languages/php.nix +++ b/modules/plugins/languages/php.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames toString; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum int attrs listOf; @@ -85,22 +85,12 @@ in { enable = mkEnableOption "PHP language support"; treesitter = { - enable = - mkEnableOption "PHP treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "PHP treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "php"; }; lsp = { - enable = - mkEnableOption "PHP LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "PHP LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.php.lsp.servers" (enum (attrNames servers)); @@ -110,12 +100,7 @@ in { }; format = { - enable = - mkEnableOption "PHP formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "PHP formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { description = "PHP formatter to use"; @@ -125,12 +110,7 @@ in { }; dap = { - enable = - mkEnableOption "Enable PHP Debug Adapter" - // { - default = config.vim.languages.enableDAP; - defaultText = literalExpression "config.vim.languages.enableDAP"; - }; + enable = mkEnableOption "Enable PHP Debug Adapter" // {default = config.vim.languages.enableDAP;}; xdebug = { adapter = mkOption { type = attrs; diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix index b6858fd1..4c777e3e 100644 --- a/modules/plugins/languages/python.nix +++ b/modules/plugins/languages/python.nix @@ -291,12 +291,7 @@ in { enable = mkEnableOption "Python language support"; treesitter = { - enable = - mkEnableOption "Python treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Python treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkOption { description = "Python treesitter grammar to use"; type = package; @@ -305,12 +300,7 @@ in { }; lsp = { - enable = - mkEnableOption "Python LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Python LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.python.lsp.servers" (enum (attrNames servers)); @@ -320,12 +310,7 @@ in { }; format = { - enable = - mkEnableOption "Python formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "Python formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { type = deprecatedSingleOrListOf "vim.language.python.format.type" (enum (attrNames formats)); @@ -339,7 +324,6 @@ in { enable = mkOption { type = bool; default = config.vim.languages.enableDAP; - defaultText = literalExpression "config.vim.languages.enableDAP"; description = "Enable Python Debug Adapter"; }; @@ -361,12 +345,7 @@ in { }; extraDiagnostics = { - enable = - mkEnableOption "extra Python diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; - }; + enable = mkEnableOption "extra Python diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; types = diagnostics { langDesc = "Python"; inherit diagnosticsProviders; diff --git a/modules/plugins/languages/qml.nix b/modules/plugins/languages/qml.nix index 73d40575..e8f40654 100644 --- a/modules/plugins/languages/qml.nix +++ b/modules/plugins/languages/qml.nix @@ -6,7 +6,7 @@ }: let inherit (builtins) attrNames; inherit (lib.meta) getExe'; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum; inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; @@ -37,22 +37,12 @@ in { options.vim.languages.qml = { enable = mkEnableOption "QML language support"; treesitter = { - enable = - mkEnableOption "QML treesitter support" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "QML treesitter support" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "qmljs"; }; lsp = { - enable = - mkEnableOption "QML LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "QML LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.qml.lsp.servers" (enum (attrNames servers)); default = defaultServers; @@ -61,12 +51,7 @@ in { }; format = { - enable = - mkEnableOption "QML formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "QML formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { type = deprecatedSingleOrListOf "vim.language.qml.format.type" (enum (attrNames formats)); diff --git a/modules/plugins/languages/r.nix b/modules/plugins/languages/r.nix index 764e0eba..d9f6e9f0 100644 --- a/modules/plugins/languages/r.nix +++ b/modules/plugins/languages/r.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum; inherit (lib.meta) getExe; @@ -65,22 +65,12 @@ in { enable = mkEnableOption "R language support"; treesitter = { - enable = - mkEnableOption "R treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "R treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "r"; }; lsp = { - enable = - mkEnableOption "R LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "R LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.r.lsp.servers" (enum (attrNames servers)); @@ -90,12 +80,7 @@ in { }; format = { - enable = - mkEnableOption "R formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "R formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { type = deprecatedSingleOrListOf "vim.language.r.format.type" (enum (attrNames formats)); diff --git a/modules/plugins/languages/ruby.nix b/modules/plugins/languages/ruby.nix index 5ebcdea5..14896f01 100644 --- a/modules/plugins/languages/ruby.nix +++ b/modules/plugins/languages/ruby.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf; @@ -67,22 +67,12 @@ in { enable = mkEnableOption "Ruby language support"; treesitter = { - enable = - mkEnableOption "Ruby treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Ruby treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "ruby"; }; lsp = { - enable = - mkEnableOption "Ruby LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Ruby LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.ruby.lsp.servers" (enum (attrNames servers)); diff --git a/modules/plugins/languages/rust.nix b/modules/plugins/languages/rust.nix index 3a3e4d1f..ec5a3d81 100644 --- a/modules/plugins/languages/rust.nix +++ b/modules/plugins/languages/rust.nix @@ -6,7 +6,7 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; - inherit (lib.options) mkOption mkEnableOption literalMD literalExpression; + inherit (lib.options) mkOption mkEnableOption literalMD; inherit (lib.strings) optionalString; inherit (lib.lists) isList; inherit (lib.attrsets) attrNames; @@ -29,22 +29,12 @@ in { enable = mkEnableOption "Rust language support"; treesitter = { - enable = - mkEnableOption "Rust treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Rust treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "rust"; }; lsp = { - enable = - mkEnableOption "Rust LSP support (rust-analyzer with extra tools)" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Rust LSP support (rust-analyzer with extra tools)" // {default = config.vim.lsp.enable;}; package = mkOption { description = "rust-analyzer package, or the command to run as a list of strings"; example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]''; @@ -90,7 +80,6 @@ in { description = "Rust Debug Adapter support"; type = bool; default = config.vim.languages.enableDAP; - defaultText = literalExpression "config.vim.languages.enableDAP"; }; package = mkOption { @@ -119,39 +108,14 @@ in { setupOpts = mkPluginSetupOption "crates-nvim" { lsp = { - enabled = - mkEnableOption "crates.nvim's in-process language server" - // { - default = cfg.extensions.crates-nvim.enable; - defaultText = literalExpression "config.vim.languages.rust.extensions.crates-nvim.enable"; - }; - actions = - mkEnableOption "actions for crates-nvim's in-process language server" - // { - default = cfg.extensions.crates-nvim.enable; - defaultText = literalExpression "config.vim.languages.rust.extensions.crates-nvim.enable"; - }; - completion = - mkEnableOption "completion for crates-nvim's in-process language server" - // { - default = cfg.extensions.crates-nvim.enable; - defaultText = literalExpression "config.vim.languages.rust.extensions.crates-nvim.enable"; - }; - hover = - mkEnableOption "hover actions for crates-nvim's in-process language server" - // { - default = cfg.extensions.crates-nvim.enable; - defaultText = literalExpression "config.vim.languages.rust.extensions.crates-nvim.enable"; - }; + enabled = mkEnableOption "crates.nvim's in-process language server" // {default = cfg.extensions.crates-nvim.enable;}; + actions = mkEnableOption "actions for crates-nvim's in-process language server" // {default = cfg.extensions.crates-nvim.enable;}; + completion = mkEnableOption "completion for crates-nvim's in-process language server" // {default = cfg.extensions.crates-nvim.enable;}; + hover = mkEnableOption "hover actions for crates-nvim's in-process language server" // {default = cfg.extensions.crates-nvim.enable;}; }; completion = { crates = { - enabled = - mkEnableOption "completion for crates-nvim's in-process language server" - // { - default = cfg.extensions.crates-nvim.enable; - defaultText = literalExpression "config.vim.languages.rust.extensions.crates-nvim.enable"; - }; + enabled = mkEnableOption "completion for crates-nvim's in-process language server" // {default = cfg.extensions.crates-nvim.enable;}; max_results = mkOption { description = "The maximum number of search results to display"; type = int; diff --git a/modules/plugins/languages/scala.nix b/modules/plugins/languages/scala.nix index bcbe43fe..b5382415 100644 --- a/modules/plugins/languages/scala.nix +++ b/modules/plugins/languages/scala.nix @@ -10,7 +10,7 @@ inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.types) mkGrammarOption luaInline; - inherit (lib.options) mkOption mkEnableOption mkPackageOption literalExpression; + inherit (lib.options) mkOption mkEnableOption mkPackageOption; inherit (lib.strings) optionalString; inherit (lib.types) attrsOf anything bool; @@ -28,22 +28,12 @@ in { enable = mkEnableOption "Scala language support"; treesitter = { - enable = - mkEnableOption "Scala treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Scala treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "scala"; }; lsp = { - enable = - mkEnableOption "Scala LSP support (metals)" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Scala LSP support (metals)" // {default = config.vim.lsp.enable;}; package = mkPackageOption pkgs "metals" { default = ["metals"]; }; diff --git a/modules/plugins/languages/sql.nix b/modules/plugins/languages/sql.nix index 9aff0029..b65bba8b 100644 --- a/modules/plugins/languages/sql.nix +++ b/modules/plugins/languages/sql.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum package str; @@ -74,12 +74,7 @@ in { }; treesitter = { - enable = - mkEnableOption "SQL treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "SQL treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkOption { type = package; @@ -89,12 +84,7 @@ in { }; lsp = { - enable = - mkEnableOption "SQL LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "SQL LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.sql.lsp.servers" (enum (attrNames servers)); @@ -104,12 +94,7 @@ in { }; format = { - enable = - mkEnableOption "SQL formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "SQL formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { type = deprecatedSingleOrListOf "vim.language.sql.format.type" (enum (attrNames formats)); @@ -119,12 +104,7 @@ in { }; extraDiagnostics = { - enable = - mkEnableOption "extra SQL diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; - }; + enable = mkEnableOption "extra SQL diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;}; types = diagnostics { langDesc = "SQL"; diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix index 3756e55c..a34d5212 100644 --- a/modules/plugins/languages/svelte.nix +++ b/modules/plugins/languages/svelte.nix @@ -6,7 +6,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum package coercedTo; @@ -104,23 +104,13 @@ in { enable = mkEnableOption "Svelte language support"; treesitter = { - enable = - mkEnableOption "Svelte treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Svelte treesitter" // {default = config.vim.languages.enableTreesitter;}; sveltePackage = mkGrammarOption pkgs "svelte"; }; lsp = { - enable = - mkEnableOption "Svelte LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Svelte LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.svelte.lsp.servers" (enum (attrNames servers)); diff --git a/modules/plugins/languages/tailwind.nix b/modules/plugins/languages/tailwind.nix index da2a514e..35449237 100644 --- a/modules/plugins/languages/tailwind.nix +++ b/modules/plugins/languages/tailwind.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum; @@ -151,12 +151,7 @@ in { enable = mkEnableOption "Tailwindcss language support"; lsp = { - enable = - mkEnableOption "Tailwindcss LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Tailwindcss LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.tailwind.lsp.servers" (enum (attrNames servers)); diff --git a/modules/plugins/languages/tera.nix b/modules/plugins/languages/tera.nix index 9650da92..7e1d5573 100644 --- a/modules/plugins/languages/tera.nix +++ b/modules/plugins/languages/tera.nix @@ -4,7 +4,7 @@ lib, ... }: let - inherit (lib.options) mkEnableOption literalExpression; + inherit (lib.options) mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption; @@ -14,12 +14,7 @@ in { enable = mkEnableOption "Tera templating language support"; treesitter = { - enable = - mkEnableOption "Tera treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Tera treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "tera"; }; }; diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix index 43a82e45..5f3952df 100644 --- a/modules/plugins/languages/terraform.nix +++ b/modules/plugins/languages/terraform.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum listOf; @@ -28,22 +28,12 @@ in { enable = mkEnableOption "Terraform/HCL support"; treesitter = { - enable = - mkEnableOption "Terraform treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Terraform treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "terraform"; }; lsp = { - enable = - mkEnableOption "Terraform LSP support (terraform-ls)" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); diff --git a/modules/plugins/languages/toml.nix b/modules/plugins/languages/toml.nix index 1ead6c7c..9a5ec948 100644 --- a/modules/plugins/languages/toml.nix +++ b/modules/plugins/languages/toml.nix @@ -7,7 +7,7 @@ inherit (builtins) attrNames; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) enum; inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.attrsets) mapListToAttrs; @@ -78,7 +78,6 @@ in { mkEnableOption "TOML treesitter" // { default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; }; package = mkGrammarOption pkgs "toml"; }; @@ -88,7 +87,6 @@ in { mkEnableOption "TOML LSP support" // { default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; }; servers = mkOption { @@ -103,7 +101,6 @@ in { mkEnableOption "TOML formatting" // { default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; }; type = mkOption { @@ -118,7 +115,6 @@ in { mkEnableOption "extra TOML diagnostics" // { default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; }; types = diagnostics { langDesc = "TOML"; diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix index b7aaac73..e5dc8d13 100644 --- a/modules/plugins/languages/ts.nix +++ b/modules/plugins/languages/ts.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames elem; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum package bool; @@ -215,24 +215,14 @@ in { enable = mkEnableOption "Typescript/Javascript language support"; treesitter = { - enable = - mkEnableOption "Typescript/Javascript treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Typescript/Javascript treesitter" // {default = config.vim.languages.enableTreesitter;}; tsPackage = mkGrammarOption pkgs "typescript"; tsxPackage = mkGrammarOption pkgs "tsx"; jsPackage = mkGrammarOption pkgs "javascript"; }; lsp = { - enable = - mkEnableOption "Typescript/Javascript LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Typescript/Javascript LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.ts.lsp.servers" (enum (attrNames servers)); @@ -242,12 +232,7 @@ in { }; format = { - enable = - mkEnableOption "Typescript/Javascript formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "Typescript/Javascript formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { description = "Typescript/Javascript formatter to use"; diff --git a/modules/plugins/languages/twig.nix b/modules/plugins/languages/twig.nix deleted file mode 100644 index 36e64838..00000000 --- a/modules/plugins/languages/twig.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: let - inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; - inherit (lib.modules) mkIf mkMerge; - inherit (lib.meta) getExe; - inherit (lib.types) listOf enum; - inherit (lib.nvim.types) mkGrammarOption diagnostics; - inherit (lib.nvim.attrsets) mapListToAttrs; - - cfg = config.vim.languages.twig; - - defaultServers = ["twig-language-server"]; - servers = { - twig-language-server = { - enable = true; - cmd = [(getExe pkgs.twig-language-server) "--stdio"]; - filetypes = ["twig"]; - root_markers = [".git"]; - }; - }; - - defaultFormat = ["djlint"]; - formats = { - djlint = { - command = getExe pkgs.djlint; - }; - # TODO: if twig-cs-fixer gets packaged for nix, add it and default to it. - }; - defaultDiagnosticsProvider = ["djlint"]; - diagnosticsProviders = { - djlint = { - config = { - cmd = getExe pkgs.djlint; - }; - }; - # TODO: if curlylint gets packaged for nix, add it. - }; -in { - options.vim.languages.twig = { - enable = mkEnableOption "Twig templating language support"; - - treesitter = { - enable = - mkEnableOption "Twig treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; - package = mkGrammarOption pkgs "twig"; - }; - - lsp = { - enable = - mkEnableOption "Twig LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; - servers = mkOption { - type = listOf (enum (attrNames servers)); - default = defaultServers; - description = "Twig LSP server to use"; - }; - }; - - format = { - enable = - mkEnableOption "PHP formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; - type = mkOption { - description = "Twig formatter to use"; - type = listOf (enum (attrNames formats)); - default = defaultFormat; - }; - }; - - extraDiagnostics = { - enable = - mkEnableOption "extra Twig diagnostics" - // { - default = config.vim.languages.enableExtraDiagnostics; - defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics"; - }; - types = diagnostics { - langDesc = "Twig"; - inherit diagnosticsProviders; - inherit defaultDiagnosticsProvider; - }; - }; - }; - - 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.twig = cfg.format.type; - formatters = - mapListToAttrs (name: { - inherit name; - value = formats.${name}; - }) - cfg.format.type; - }; - }; - }) - - (mkIf cfg.extraDiagnostics.enable { - vim.diagnostics.nvim-lint = { - enable = true; - linters_by_ft.twig = cfg.extraDiagnostics.types; - linters = - mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;}) - cfg.extraDiagnostics.types); - }; - }) - ]); -} diff --git a/modules/plugins/languages/typst.nix b/modules/plugins/languages/typst.nix index 2e29f22b..10783b61 100644 --- a/modules/plugins/languages/typst.nix +++ b/modules/plugins/languages/typst.nix @@ -4,7 +4,7 @@ lib, ... }: let - inherit (lib.options) mkOption mkEnableOption literalExpression; + inherit (lib.options) mkOption mkEnableOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) nullOr enum attrsOf listOf package str bool int; inherit (lib.attrsets) attrNames; @@ -104,22 +104,12 @@ in { enable = mkEnableOption "Typst language support"; treesitter = { - enable = - mkEnableOption "Typst treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Typst treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "typst"; }; lsp = { - enable = - mkEnableOption "Typst LSP support (typst-lsp)" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Typst LSP support (typst-lsp)" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.typst.lsp.servers" (enum (attrNames servers)); @@ -129,12 +119,7 @@ in { }; format = { - enable = - mkEnableOption "Typst document formatting" - // { - default = config.vim.languages.enableFormat; - defaultText = literalExpression "config.vim.languages.enableFormat"; - }; + enable = mkEnableOption "Typst document formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { type = deprecatedSingleOrListOf "vim.language.typst.format.type" (enum (attrNames formats)); diff --git a/modules/plugins/languages/vala.nix b/modules/plugins/languages/vala.nix index b3376daf..af58758d 100644 --- a/modules/plugins/languages/vala.nix +++ b/modules/plugins/languages/vala.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum; @@ -67,22 +67,12 @@ in { enable = mkEnableOption "Vala language support"; treesitter = { - enable = - mkEnableOption "Vala treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Vala treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "vala"; }; lsp = { - enable = - mkEnableOption "Vala LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Vala LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.vala.lsp.servers" (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/wgsl.nix b/modules/plugins/languages/wgsl.nix index 016f6c4a..f38cb124 100644 --- a/modules/plugins/languages/wgsl.nix +++ b/modules/plugins/languages/wgsl.nix @@ -7,7 +7,7 @@ inherit (builtins) attrNames; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.types) enum; inherit (lib.meta) getExe; inherit (lib.nvim.attrsets) mapListToAttrs; @@ -29,22 +29,12 @@ in { enable = mkEnableOption "WGSL language support"; treesitter = { - enable = - mkEnableOption "WGSL treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "WGSL treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "wgsl"; }; lsp = { - enable = - mkEnableOption "WGSL LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "WGSL LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.wgsl.lsp.servers" (enum (attrNames servers)); diff --git a/modules/plugins/languages/xml.nix b/modules/plugins/languages/xml.nix index 7eae0026..351232a9 100644 --- a/modules/plugins/languages/xml.nix +++ b/modules/plugins/languages/xml.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkOption mkEnableOption literalExpression; + inherit (lib.options) mkOption mkEnableOption; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) enum listOf; @@ -30,22 +30,12 @@ in { enable = mkEnableOption "XML language support"; treesitter = { - enable = - mkEnableOption "XML treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "XML treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "xml"; }; lsp = { - enable = - mkEnableOption "XML LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "XML LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = listOf (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix index 097b98c5..2e57d8be 100644 --- a/modules/plugins/languages/yaml.nix +++ b/modules/plugins/languages/yaml.nix @@ -6,7 +6,7 @@ }: let inherit (builtins) attrNames; inherit (lib.generators) mkLuaInline; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge; inherit (lib.meta) getExe; inherit (lib.types) enum; @@ -51,23 +51,13 @@ in { enable = mkEnableOption "YAML language support"; treesitter = { - enable = - mkEnableOption "YAML treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "YAML treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "yaml"; }; lsp = { - enable = - mkEnableOption "Yaml LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Yaml LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.yaml.lsp.servers" (enum (attrNames servers)); default = defaultServers; diff --git a/modules/plugins/languages/zig.nix b/modules/plugins/languages/zig.nix index 5e1db977..57ce961e 100644 --- a/modules/plugins/languages/zig.nix +++ b/modules/plugins/languages/zig.nix @@ -5,7 +5,7 @@ ... }: let inherit (builtins) attrNames; - inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.options) mkEnableOption mkOption; inherit (lib.modules) mkIf mkMerge mkDefault; inherit (lib.types) bool package enum; inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; @@ -59,22 +59,12 @@ in { enable = mkEnableOption "Zig language support"; treesitter = { - enable = - mkEnableOption "Zig treesitter" - // { - default = config.vim.languages.enableTreesitter; - defaultText = literalExpression "config.vim.languages.enableTreesitter"; - }; + enable = mkEnableOption "Zig treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkGrammarOption pkgs "zig"; }; lsp = { - enable = - mkEnableOption "Zig LSP support" - // { - default = config.vim.lsp.enable; - defaultText = literalExpression "config.vim.lsp.enable"; - }; + enable = mkEnableOption "Zig LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { type = deprecatedSingleOrListOf "vim.language.zig.lsp.servers" (enum (attrNames servers)); @@ -87,7 +77,6 @@ in { enable = mkOption { type = bool; default = config.vim.languages.enableDAP; - defaultText = literalExpression "config.vim.languages.enableDAP"; description = "Enable Zig Debug Adapter"; }; diff --git a/npins/sources.json b/npins/sources.json index 9d9cc978..05b662ff 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -539,19 +539,6 @@ "url": "https://github.com/folke/flash.nvim/archive/b68bda044d68e4026c4e1ec6df3c5afd7eb8e341.tar.gz", "hash": "sha256-7isgZdploAGK5l8TxVxL277CH6kPbcBnMwfZeqPHjq4=" }, - "fluent-nvim": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "projectfluent", - "repo": "fluent.vim" - }, - "branch": "master", - "submodules": false, - "revision": "94c1ef622187032778f546d2f8ad821661475172", - "url": "https://github.com/projectfluent/fluent.vim/archive/94c1ef622187032778f546d2f8ad821661475172.tar.gz", - "hash": "sha256-tOYxOUKa6Zn2Yq5peqGDEdCkpl+b+VKkSmZx7+kHZJ0=" - }, "flutter-tools-nvim": { "type": "Git", "repository": { @@ -669,22 +656,6 @@ "url": "https://github.com/ellisonleao/glow.nvim/archive/5d5954b2f22e109d4a6eba8b2618c5b96e4ee7a2.tar.gz", "hash": "sha256-CvBcmVWBgI+m+PS7p7PmsiPtTEfqx2kpIzz4mImONIc=" }, - "gopher-nvim": { - "type": "GitRelease", - "repository": { - "type": "GitHub", - "owner": "olexsmir", - "repo": "gopher.nvim" - }, - "pre_releases": false, - "version_upper_bound": null, - "release_prefix": null, - "submodules": false, - "version": "v0.6.0", - "revision": "95fdeb571d837af9efae27fea1c0131fa756ab43", - "url": "https://api.github.com/repos/olexsmir/gopher.nvim/tarball/refs/tags/v0.6.0", - "hash": "sha256-7aDjMFMCiqub/zCDJIWUIX9Zc6+vyPQOczuOFdc/6S0=" - }, "grug-far-nvim": { "type": "Git", "repository": { @@ -892,16 +863,15 @@ "leap-nvim": { "type": "Git", "repository": { - "type": "Forgejo", - "server": "https://codeberg.org/", - "owner": "andyg", + "type": "GitHub", + "owner": "ggandor", "repo": "leap.nvim" }, "branch": "main", "submodules": false, - "revision": "774c452da3521d4434f912b6ca6dd97318aca4b0", - "url": "https://codeberg.org/andyg/leap.nvim/archive/774c452da3521d4434f912b6ca6dd97318aca4b0.tar.gz", - "hash": "sha256-HkLmYb0+Vu65JalaE2JuMJM74/fWAS3QJRQb4BW5esw=" + "revision": "07304103f6bd923004fdef9262d9a4d7925fb70a", + "url": "https://github.com/ggandor/leap.nvim/archive/07304103f6bd923004fdef9262d9a4d7925fb70a.tar.gz", + "hash": "sha256-AImK8kLWBdA1IFeTt52UF8+j+BBmQmz00VW4EWCVQdg=" }, "leetcode-nvim": { "type": "Git",