From 0c90a7b1c691893a139aa9db94ec0f6e6b78e2f5 Mon Sep 17 00:00:00 2001 From: raf Date: Mon, 9 Dec 2024 13:31:59 +0300 Subject: [PATCH 1/4] configuration: disable superfluous language modules in maximal (#491) --- configuration.nix | 82 ++++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/configuration.nix b/configuration.nix index aadd1f83..3802f758 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,3 +1,7 @@ +# This is the sample configuration for nvf, aiming to give you a feel of the default options +# while certain plugins are enabled. While it may act as one, this is not an overview of nvf's +# module options. To find a complete overview of nvf's options and examples, visit the manual. +# https://notashelf.github.io/nvf/options.html isMaximal: { config.vim = { viAlias = true; @@ -31,54 +35,60 @@ isMaximal: { }; }; + # This section does not include a comprehensive list of available language modules. + # To list all available language module options, please visit the nvf manual. languages = { enableLSP = true; enableFormat = true; enableTreesitter = true; enableExtraDiagnostics = true; + # Languages that will be supported in default and maximal configurations. + nix.enable = true; + markdown.enable = true; + + # Languages that are enabled in the maximal configuration. + bash.enable = isMaximal; + clang.enable = isMaximal; + css.enable = isMaximal; + html.enable = isMaximal; + sql.enable = isMaximal; + java.enable = isMaximal; + kotlin.enable = isMaximal; + ts.enable = isMaximal; + go.enable = isMaximal; + lua.enable = isMaximal; + zig.enable = isMaximal; + python.enable = isMaximal; + typst.enable = isMaximal; + rust = { + enable = isMaximal; + crates.enable = isMaximal; + }; + + # Language modules that are not as common. + assembly.enable = false; + astro.enable = false; + nu.enable = false; + csharp.enable = false; + julia.enable = false; + vala.enable = false; + scala.enable = false; + r.enable = false; + gleam.enable = false; + dart.enable = false; + ocaml.enable = false; + elixir.enable = false; + + tailwind.enable = false; + svelte.enable = false; + # Nim LSP is broken on Darwin and therefore # should be disabled by default. Users may still enable # `vim.languages.vim` to enable it, this does not restrict # that. # See: nim.enable = false; - - nix.enable = true; - - # Assembly is not common, and the asm LSP is a major hit-or-miss - assembly.enable = false; - astro.enable = false; - markdown.enable = isMaximal; - html.enable = isMaximal; - css.enable = isMaximal; - sql.enable = isMaximal; - java.enable = isMaximal; - kotlin.enable = isMaximal; - ts.enable = isMaximal; - svelte.enable = isMaximal; - go.enable = isMaximal; - lua.enable = isMaximal; - elixir.enable = isMaximal; - zig.enable = isMaximal; - ocaml.enable = isMaximal; - python.enable = isMaximal; - dart.enable = isMaximal; - bash.enable = isMaximal; - gleam.enable = false; - r.enable = isMaximal; - tailwind.enable = isMaximal; - typst.enable = isMaximal; - clang.enable = isMaximal; - scala.enable = isMaximal; - rust = { - enable = isMaximal; - crates.enable = isMaximal; - }; - csharp.enable = isMaximal; - julia.enable = isMaximal; - vala.enable = isMaximal; - nu.enable = false; }; visuals = { From 48bcd5d695794cb693e3a82d55f6742b6010d6bc Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Mon, 9 Dec 2024 17:57:27 +0300 Subject: [PATCH 2/4] visuals/indent-blankline: properly pass setupOpts to `mkPluginSetupOption` --- modules/plugins/visuals/indent-blankline/indent-blankline.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/plugins/visuals/indent-blankline/indent-blankline.nix b/modules/plugins/visuals/indent-blankline/indent-blankline.nix index ff9bccc7..1133b80b 100644 --- a/modules/plugins/visuals/indent-blankline/indent-blankline.nix +++ b/modules/plugins/visuals/indent-blankline/indent-blankline.nix @@ -6,6 +6,7 @@ inherit (lib.modules) mkRenamedOptionModule; inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.types) int bool str nullOr either listOf attrsOf; + inherit (lib.nvim.types) mkPluginSetupOption; cfg = config.vim.visuals; in { @@ -15,7 +16,7 @@ in { options.vim.visuals.indent-blankline = { enable = mkEnableOption "indentation guides [indent-blankline]"; - setupOpts = { + setupOpts = mkPluginSetupOption "indent-blankline" { debounce = mkOption { type = int; description = "Debounce time in milliseconds"; From 0a3855cdc277b3cb402a22850f943c31f9f8f700 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 10 Dec 2024 12:46:50 +0300 Subject: [PATCH 3/4] docs: properly theme searchbar on prefers-dark --- docs/static/style.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/static/style.scss b/docs/static/style.scss index 3b148739..1c0b57e5 100644 --- a/docs/static/style.scss +++ b/docs/static/style.scss @@ -240,13 +240,19 @@ li { padding: 10px; border-bottom: 1px solid #ccc; z-index: 1000; + @media (prefers-color-scheme: dark) { + background: $color-gray-900; + color: $color-gray-50; + } } + #search-input { width: 100%; padding: 8px; border: 1px solid #ccc; border-radius: 4px; } + .hidden { display: none; } From 9fad42374f3f4cdaa67ec13483824896ba55f174 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Tue, 10 Dec 2024 11:34:18 +0100 Subject: [PATCH 4/4] docs: fix search bar style in dark mode --- docs/static/style.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/static/style.scss b/docs/static/style.scss index 1c0b57e5..d5f739e5 100644 --- a/docs/static/style.scss +++ b/docs/static/style.scss @@ -251,6 +251,8 @@ li { padding: 8px; border: 1px solid #ccc; border-radius: 4px; + background: inherit; + color: inherit; } .hidden {