Merge d1c24c8eae into 7dbd1cd8d1

configuration.nix

@@ -51,7 +51,6 @@ isMaximal: {
       css.enable = isMaximal;
       sql.enable = isMaximal;
       java.enable = isMaximal;
-      kotlin.enable = isMaximal;
       ts.enable = isMaximal;
       svelte.enable = isMaximal;
       go.enable = isMaximal;

docs/release-notes/rl-0.7.md

@@ -102,10 +102,6 @@ everyone.
   recommended to go through rustacean.nvim's README to take a closer look at its
   features and usage
 
-- Add [lz.n] support and lazy-load some builtin plugins.
-
-[lz.n]: https://github.com/mrcjkb/rustaceanvim
-
 [jacekpoz](https://jacekpoz.pl):
 
 [ocaml-lsp]: https://github.com/ocaml/ocaml-lsp
@@ -263,8 +259,6 @@ everyone.
 - Add LSP and Treesitter support for R under `vim.languages.R`.
 - Add Otter support under `vim.lsp.otter` and an assert to prevent conflict with
   ccc
-- Add LSP, diagnostics, formatter and Treesitter support for Kotlin under
-  `vim.languages.kotlin`
 
 [Bloxx12](https://github.com/Bloxx12)
 

flake.lock

@@ -844,22 +844,6 @@
         "type": "github"
       }
     },
-    "plugin-luasnip": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726165831,
-        "narHash": "sha256-nkaa1NGOI28Et2QitQB+Spv+J42QVdHE1oywteLcJJw=",
-        "owner": "L3MON4D3",
-        "repo": "LuaSnip",
-        "rev": "e808bee352d1a6fcf902ca1a71cee76e60e24071",
-        "type": "github"
-      },
-      "original": {
-        "owner": "L3MON4D3",
-        "repo": "LuaSnip",
-        "type": "github"
-      }
-    },
     "plugin-lz-n": {
       "flake": false,
       "locked": {
@@ -890,6 +874,19 @@
         "owner": "horriblename",
         "ref": "require-rewrite",
         "repo": "lzn-auto-require",
+    "plugin-luasnip": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1726165831,
+        "narHash": "sha256-nkaa1NGOI28Et2QitQB+Spv+J42QVdHE1oywteLcJJw=",
+        "owner": "L3MON4D3",
+        "repo": "LuaSnip",
+        "rev": "e808bee352d1a6fcf902ca1a71cee76e60e24071",
+        "type": "github"
+      },
+      "original": {
+        "owner": "L3MON4D3",
+        "repo": "LuaSnip",
         "type": "github"
       }
     },
@@ -1909,9 +1906,9 @@
         "plugin-lspkind": "plugin-lspkind",
         "plugin-lspsaga": "plugin-lspsaga",
         "plugin-lualine": "plugin-lualine",
-        "plugin-luasnip": "plugin-luasnip",
         "plugin-lz-n": "plugin-lz-n",
         "plugin-lzn-auto-require": "plugin-lzn-auto-require",
+        "plugin-luasnip": "plugin-luasnip",
         "plugin-mind-nvim": "plugin-mind-nvim",
         "plugin-minimap-vim": "plugin-minimap-vim",
         "plugin-modes-nvim": "plugin-modes-nvim",

modules/plugins/languages/default.nix

@@ -8,7 +8,6 @@ in {
     ./css.nix
     ./elixir.nix
     ./go.nix
-    ./kotlin.nix
     ./html.nix
     ./java.nix
     ./lua.nix

modules/plugins/languages/kotlin.nix

@@ -1,107 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (lib.options) mkEnableOption mkOption literalExpression;
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.meta) getExe;
-  inherit (lib.nvim.languages) diagnosticsToLua;
-  inherit (lib.types) package;
-  inherit (lib.nvim.types) mkGrammarOption diagnostics;
-  inherit (lib.lists) isList;
-  inherit (lib.nvim.lua) expToLua;
-
-  cfg = config.vim.languages.kotlin;
-
-  defaultDiagnosticsProvider = ["ktlint"];
-  diagnosticsProviders = {
-    ktlint = {
-      package = pkgs.ktlint;
-      nullConfig = pkg: ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.diagnostics.ktlint.with({
-            command = "${getExe pkg}",
-          })
-        )
-      '';
-    };
-  };
-in {
-  options.vim.languages.kotlin = {
-    enable = mkEnableOption "Kotlin/HCL support";
-
-    treesitter = {
-      enable = mkEnableOption "Kotlin treesitter" // {default = config.vim.languages.enableTreesitter;};
-      package = mkGrammarOption pkgs "kotlin";
-    };
-
-    lsp = {
-      enable = mkEnableOption "Kotlin LSP support" // {default = config.vim.languages.enableLSP;};
-
-      package = mkOption {
-        description = "kotlin_language_server package with Kotlin runtime";
-        type = package;
-        example = literalExpression ''
-          pkgs.symlinkJoin {
-              name = "kotlin-language-server-wrapped";
-              paths = [pkgs.kotlin-language-server];
-              nativeBuildInputs = [pkgs.makeWrapper];
-              postBuild = '''
-                wrapProgram $out/bin/kotlin-language-server \
-                  --prefix PATH : ''${pkgs.kotlin}/bin
-              ''';
-            };
-        '';
-        default = pkgs.kotlin-language-server;
-      };
-    };
-
-    extraDiagnostics = {
-      enable = mkEnableOption "extra Kotlin diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
-
-      types = diagnostics {
-        langDesc = "Kotlin";
-        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.extraDiagnostics.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources = diagnosticsToLua {
-        lang = "kotlin";
-        config = cfg.extraDiagnostics.types;
-        inherit diagnosticsProviders;
-      };
-    })
-
-    (mkIf cfg.lsp.enable {
-      vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.kotlin_language_server = ''
-        lspconfig.kotlin_language_server.setup {
-          capabilities = capabilities,
-          root_dir = lspconfig.util.root_pattern("main.kt", ".git"),
-          on_attach=default_on_attach,
-          init_options = {
-          -- speeds up the startup time for the LSP
-            storagePath = vim.fn.stdpath('state') .. '/kotlin',
-          },
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/kotlin-language-server"}''
-        },
-        }
-      '';
-    })
-  ]);
-}