ordering of types

This commit is contained in:
sjcobb 2025-07-14 01:15:39 +01:00
commit e0cd56f39e
29 changed files with 54 additions and 54 deletions

View file

@ -34,9 +34,9 @@ in {
lsp = {
enable = mkEnableOption "Assembly LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Assembly LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Assembly LSP server to use";
};
};
};

View file

@ -91,9 +91,9 @@ in {
lsp = {
enable = mkEnableOption "Astro LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Astro LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Astro LSP server to use";
};
};
@ -101,15 +101,15 @@ in {
enable = mkEnableOption "Astro formatting" // {default = config.vim.languages.enableFormat;};
type = mkOption {
description = "Astro formatter to use";
type = enum (attrNames formats);
default = defaultFormat;
description = "Astro formatter to use";
};
package = mkOption {
description = "Astro formatter package";
type = package;
default = formats.${cfg.format.type}.package;
description = "Astro formatter package";
};
};

View file

@ -57,28 +57,28 @@ in {
lsp = {
enable = mkEnableOption "Bash LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Bash LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Bash LSP server to use";
};
};
format = {
enable = mkOption {
description = "Enable Bash formatting";
type = bool;
default = config.vim.languages.enableFormat;
description = "Enable Bash formatting";
};
type = mkOption {
description = "Bash formatter to use";
type = enum (attrNames formats);
default = defaultFormat;
description = "Bash formatter to use";
};
package = mkOption {
description = "Bash formatter package";
type = package;
default = formats.${cfg.format.type}.package;
description = "Bash formatter package";
};
};

View file

@ -37,9 +37,9 @@ in {
lsp = {
enable = mkEnableOption "Clojure LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Clojure LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Clojure LSP server to use";
};
};
};

View file

@ -54,9 +54,9 @@ in {
lsp = {
enable = mkEnableOption "Dart LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Dart LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Dart LSP server to use";
};
};

View file

@ -63,9 +63,9 @@ in {
lsp = {
enable = mkEnableOption "Elixir LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Elixir LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Elixir LSP server to use";
};
};
@ -73,15 +73,15 @@ in {
enable = mkEnableOption "Elixir formatting" // {default = config.vim.languages.enableFormat;};
type = mkOption {
description = "Elixir formatter to use";
type = enum (attrNames formats);
default = defaultFormat;
description = "Elixir formatter to use";
};
package = mkOption {
description = "Elixir formatter package";
type = package;
default = formats.${cfg.format.type}.package;
description = "Elixir formatter package";
};
};

View file

@ -37,9 +37,9 @@ in {
lsp = {
enable = mkEnableOption "Gleam LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Gleam LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Gleam LSP server to use";
};
};
};

View file

@ -77,18 +77,18 @@ in {
lsp = {
enable = mkEnableOption "Haskell LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Haskell LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Haskell LSP server to use";
};
};
dap = {
enable = mkEnableOption "DAP support for Haskell" // {default = config.vim.languages.enableDAP;};
package = mkOption {
description = "Haskell DAP package or command to run the Haskell DAP";
default = haskellPackages.haskell-debug-adapter;
type = either package (listOf str);
description = "Haskell DAP package or command to run the Haskell DAP";
};
};
};

View file

@ -42,9 +42,9 @@ in {
lsp = {
enable = mkEnableOption "HCL LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "HCL LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "HCL LSP server to use";
};
};

View file

@ -49,9 +49,9 @@ in {
lsp = {
enable = mkEnableOption "Helm LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Helm LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Helm LSP server to use";
};
};
};

View file

@ -72,9 +72,9 @@ in {
lsp = {
enable = mkEnableOption "Java LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Java LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Java LSP server to use";
};
};
};

View file

@ -97,6 +97,8 @@ in {
lsp = {
enable = mkEnableOption "Java LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
type = listOf (enum (attrNames servers));
default = defaultServers;
description = ''
Julia LSP Server to Use
@ -110,8 +112,6 @@ in {
Julia in your devshells.
:::
'';
type = listOf (enum (attrNames servers));
default = defaultServers;
};
};
};

View file

@ -63,9 +63,9 @@ in {
lsp = {
enable = mkEnableOption "Kotlin LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Kotlin LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Kotlin LSP server to use";
};
};

View file

@ -64,9 +64,9 @@ in {
lsp = {
enable = mkEnableOption "Lua LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Lua LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Lua LSP server to use";
};
lazydev.enable = mkEnableOption "lazydev.nvim integration, useful for neovim plugin developers";

View file

@ -59,24 +59,24 @@ in {
enable = mkEnableOption "Nim LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Nim LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Nim LSP server to use";
};
};
format = {
enable = mkEnableOption "Nim formatting" // {default = config.vim.languages.enableFormat;};
type = mkOption {
description = "Nim formatter to use";
type = enum (attrNames formats);
default = defaultFormat;
description = "Nim formatter to use";
};
package = mkOption {
description = "Nim formatter package";
type = package;
default = formats.${cfg.format.type}.package;
description = "Nim formatter package";
};
};
};

View file

@ -98,9 +98,9 @@ in {
lsp = {
enable = mkEnableOption "Nix LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Nix LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Nix LSP server to use";
};
};

View file

@ -46,9 +46,9 @@ in {
enable = mkEnableOption "Nu LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Nu LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Nu LSP server to use";
};
};
};

View file

@ -74,23 +74,23 @@ in {
enable = mkEnableOption "OCaml LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "OCaml LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "OCaml LSP server to use";
};
};
format = {
enable = mkEnableOption "OCaml formatting support (ocamlformat)" // {default = config.vim.languages.enableFormat;};
type = mkOption {
description = "OCaml formatter to use";
type = enum (attrNames formats);
default = defaultFormat;
description = "OCaml formatter to use";
};
package = mkOption {
description = "OCaml formatter package";
type = package;
default = formats.${cfg.format.type}.package;
description = "OCaml formatter package";
};
};
};

View file

@ -46,9 +46,9 @@ in {
enable = mkEnableOption "Odin LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Odin LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Odin LSP server to use";
};
};
};

View file

@ -77,9 +77,9 @@ in {
enable = mkEnableOption "PHP LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "PHP LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "PHP LSP server to use";
};
};
};

View file

@ -229,9 +229,9 @@ in {
enable = mkEnableOption "Python LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Python LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Python LSP server to use";
};
};
@ -239,30 +239,30 @@ in {
enable = mkEnableOption "Python formatting" // {default = config.vim.languages.enableFormat;};
type = mkOption {
description = "Python formatter to use";
type = enum (attrNames formats);
default = defaultFormat;
description = "Python formatter to use";
};
package = mkOption {
description = "Python formatter package";
type = package;
default = formats.${cfg.format.type}.package;
description = "Python formatter package";
};
};
# TODO this implementation is very bare bones, I don't know enough python to implement everything
dap = {
enable = mkOption {
description = "Enable Python Debug Adapter";
type = bool;
default = config.vim.languages.enableDAP;
description = "Enable Python Debug Adapter";
};
debugger = mkOption {
description = "Python debugger to use";
type = enum (attrNames debuggers);
default = defaultDebugger;
description = "Python debugger to use";
};
package = mkOption {

View file

@ -77,9 +77,9 @@ in {
enable = mkEnableOption "R LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "R LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "R LSP server to use";
};
};

View file

@ -59,18 +59,18 @@ in {
enable = mkEnableOption "SQL language support";
dialect = mkOption {
description = "SQL dialect for sqlfluff (if used)";
type = str;
default = "ansi";
description = "SQL dialect for sqlfluff (if used)";
};
treesitter = {
enable = mkEnableOption "SQL treesitter" // {default = config.vim.languages.enableTreesitter;};
package = mkOption {
description = "SQL treesitter grammar to use";
type = package;
default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.sql;
description = "SQL treesitter grammar to use";
};
};
@ -78,9 +78,9 @@ in {
enable = mkEnableOption "SQL LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "SQL LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "SQL LSP server to use";
};
};
@ -88,15 +88,15 @@ in {
enable = mkEnableOption "SQL formatting" // {default = config.vim.languages.enableFormat;};
type = mkOption {
description = "SQL formatter to use";
type = enum (attrNames formats);
default = defaultFormat;
description = "SQL formatter to use";
};
package = mkOption {
description = "SQL formatter package";
type = package;
default = formats.${cfg.format.type}.package;
description = "SQL formatter package";
};
};

View file

@ -90,9 +90,9 @@ in {
enable = mkEnableOption "Svelte LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Svelte LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Svelte LSP server to use";
};
};
@ -100,15 +100,15 @@ in {
enable = mkEnableOption "Svelte formatting" // {default = config.vim.languages.enableFormat;};
type = mkOption {
description = "Svelte formatter to use";
type = enum (attrNames formats);
default = defaultFormat;
description = "Svelte formatter to use";
};
package = mkOption {
description = "Svelte formatter package";
type = package;
default = formats.${cfg.format.type}.package;
description = "Svelte formatter package";
};
};

View file

@ -154,9 +154,9 @@ in {
enable = mkEnableOption "Tailwindcss LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Tailwindcss LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Tailwindcss LSP server to use";
};
};
};

View file

@ -36,9 +36,9 @@ in {
enable = mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Terraform LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Terraform LSP server to use";
};
};
};

View file

@ -114,9 +114,9 @@ in {
enable = mkEnableOption "Typst LSP support (typst-lsp)" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Typst LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Typst LSP server to use";
};
};
@ -124,15 +124,15 @@ in {
enable = mkEnableOption "Typst document formatting" // {default = config.vim.languages.enableFormat;};
type = mkOption {
description = "Typst formatter to use";
type = enum (attrNames formats);
default = defaultFormat;
description = "Typst formatter to use";
};
package = mkOption {
description = "Typst formatter package";
type = package;
default = formats.${cfg.format.type}.package;
description = "Typst formatter package";
};
};

View file

@ -73,9 +73,9 @@ in {
lsp = {
enable = mkEnableOption "Vala LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Vala LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Vala LSP server to use";
};
};
};

View file

@ -56,9 +56,9 @@ in {
lsp = {
enable = mkEnableOption "Yaml LSP support" // {default = config.vim.lsp.enable;};
servers = mkOption {
description = "Yaml LSP server to use";
type = listOf (enum (attrNames servers));
default = defaultServers;
description = "Yaml LSP server to use";
};
};
};