Merge 5afcf67b82 into e8018bbd38

Prefer the type-safe `vim.options` equivalent.

.editorconfig

@@ -14,7 +14,7 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = false
 
-[*.{js,nix,yml,yaml}]
+[*.{nix,yml,yaml}]
 indent_style = space
 indent_size = 2
 tab_width = 2

.github/README.md

@@ -69,7 +69,7 @@
 [Home-Manager module]: https://notashelf.github.io/nvf/index.xhtml#ch-standalone-hm
 
 - **Simple**: One language to rule them all! Use Nix to configure everything,
-  with optional Lua support for robust configurability!
+  with additional Lua Support
 - **Reproducible**: Your configuration will behave the same _anywhere_. No
   surprises, promise!
 - **Portable**: nvf depends _solely_ on your Nix store, and nothing else. No
@@ -77,9 +77,8 @@
   - Options to install [standalone], [NixOS module] or [Home-Manager module].
 - **Customizable**: There are _almost no defaults_ to annoy you. nvf is fully
   customizable through the Nix module system.
-  - Not comfortable with a full-nix config or want to bring your Lua config? You
-    can do just that, no unnecessary restrictions.
-  - Lazyloading? We got it! Lazyload both internal and external plugins at will.
+- Not comfortable with a full-nix config or want to bring your Lua config? You
+  can do just that, no unnecessary restrictions.
 - **Well-documented**: Documentation is priority. You will _never_ face
   undocumented, obscure behaviour.
 - **Idiomatic**: nvf does things ✨ _the right way_ ✨ - the codebase is, and
@@ -168,19 +167,19 @@ fix.
 
 ## Frequently Asked Questions
 
-[issue template]: https://github.com/NotAShelf/nvf/issues/new/choose
+[appropriate issue template]: https://github.com/NotAShelf/nvf/issues/new/choose
 [list of branches]: https://github.com/NotAShelf/nvf/branches
 [list of open pull requests]: https://github.com/NotAShelf/nvf/pulls
 
 **Q**: What platforms are supported?
-<br/> **A**: nvf actively supports **Linux and Darwin** platforms using
-standalone Nix, NixOS or Home-Manager. Please take a look at the [nvf manual]
-for available installation instructions.
+<br/> **A**: nvf actively supports Linux and Darwin platforms using standalone
+Nix, NixOS or Home-Manager. Please take a look at the [nvf manual] for available
+installation instructions.
 
 **Q**: Can you add _X_?
 <br/> **A**: Maybe! It is not one of our goals to support each and every Neovim
 plugin, however, I am always open to new modules and plugin setup additions to
-**nvf**. Use the appropriate [issue template] and I will consider a module
+**nvf**. Use the [appropriate issue template] and I will consider a module
 addition. As mentioned before, pull requests to add new features are also
 welcome.
 
@@ -197,13 +196,6 @@ not noticed any activity on the main branch, consider taking a look at the
 _testing_ those release branches to get access to new features ahead of time and
 better prepare to breaking changes.
 
-**Q**: Will you support non-flake installations?
-<br/> **A**: Quite possibly. **nvf** started as "neovim-flake", which does mean
-it is and will remain flakes-first but we might consider non-flakes
-compatibility. Though keep in mind that **nvf** under non-flake environments
-would lose customizability of plugin inputs, which is one of our primary
-features.
-
 ## Credits
 
 ### Contributors

configuration.nix

@@ -1,7 +1,3 @@
-# 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;
@@ -35,60 +31,54 @@ 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: <https://github.com/PMunch/nimlsp/issues/178#issue-2128106096>
       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 = {

docs/manual.nix

@@ -62,8 +62,7 @@ in
       # Copy anchor scripts to the script directory in document root.
       cp -vt "$dest"/script \
         ${./static/script}/anchor-min.js \
-        ${./static/script}/anchor-use.js \
-        ${./static/script}/search.js
+        ${./static/script}/anchor-use.js
 
       substituteInPlace ./options.md \
         --subst-var-by OPTIONS_JSON ./config-options.json
@@ -96,12 +95,11 @@ in
       nixos-render-docs manual html \
         --manpage-urls ${path + "/doc/manpage-urls.json"} \
         --revision ${lib.trivial.revisionWithDefault manual-release} \
-        --stylesheet style.css \
-        --script highlightjs/highlight.pack.js \
-        --script highlightjs/loader.js \
+        --stylesheet "$dest"/style.css \
+        --script ./highlightjs/highlight.pack.js \
+        --script ./highlightjs/loader.js \
         --script script/anchor-use.js \
         --script script/anchor-min.js \
-        --script script/search.js \
         --toc-depth 2 \
         --section-toc-depth 1 \
         manual.md \

docs/release-notes/rl-0.8.md

@@ -1,10 +0,0 @@
-# Release 0.8 {#sec-release-0.8}
-
-[NotAShelf](https://github.com/notashelf):
-
-[typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
-
-- Add [typst-preview.nvim] under
-  `languages.typst.extensions.typst-preview-nvim`.
-
-- Add a search widget to the options page in the nvf manual.

docs/static/script/search.js

@@ -1,58 +0,0 @@
-document.addEventListener("DOMContentLoaded", () => {
-  if (!window.location.pathname.endsWith("options.html")) return;
-
-  const searchDiv = document.createElement("div");
-  searchDiv.id = "search-bar";
-  searchDiv.innerHTML = `
-    <input type="text" id="search-input" placeholder="Search options by ID..." />
-    <div id="search-results"></div>
-  `;
-  document.body.prepend(searchDiv);
-
-  const dtElements = Array.from(document.querySelectorAll("dt"));
-  const ddElements = Array.from(document.querySelectorAll("dd"));
-  const dtOptionIds = dtElements.map(
-    (dt) => dt.querySelector("a")?.id.toLowerCase() || "",
-  );
-
-  if (dtElements.length === 0 || ddElements.length === 0) {
-    console.warn("Something went wrong, page may be loaded incorrectly.");
-    return;
-  }
-
-  const dtElementsData = dtElements.map((dt, index) => ({
-    element: dt,
-    id: dtOptionIds[index],
-    ddElement: ddElements[index],
-  }));
-
-  const hiddenClass = "hidden";
-  const hiddenStyle = document.createElement("style");
-  hiddenStyle.innerHTML = `.${hiddenClass} { display: none; }`;
-  document.head.appendChild(hiddenStyle);
-
-  let debounceTimeout;
-  document.getElementById("search-input").addEventListener("input", (event) => {
-    clearTimeout(debounceTimeout);
-    debounceTimeout = setTimeout(() => {
-      const query = event.target.value.toLowerCase();
-
-      const matches = [];
-      const nonMatches = [];
-
-      dtElementsData.forEach(({ element, id, ddElement }) => {
-        const isMatch = id.includes(query);
-        if (isMatch) {
-          matches.push(element, ddElement);
-        } else {
-          nonMatches.push(element, ddElement);
-        }
-      });
-
-      requestAnimationFrame(() => {
-        matches.forEach((el) => el?.classList.remove(hiddenClass));
-        nonMatches.forEach((el) => el?.classList.add(hiddenClass));
-      });
-    }, 200);
-  });
-});

docs/static/style.scss

@@ -189,16 +189,14 @@ th {
 
 dt {
 	margin: 1.2rem 0 0.8rem;
-  content-visibility: auto;
-  contain-intrinsic-size: auto 42px;
-}
-dd {
-	margin-left: 2rem;
-  content-visibility: auto;
-  contain-intrinsic-size: auto 500px;
 }
 
-div.book {}
+dd {
+	margin-left: 2rem;
+}
+
+div.book {
+}
 
 ul {
 	@include margined;
@@ -235,33 +233,6 @@ li {
 	}
 }
 
-#search-bar {
-	position: sticky;
-	top: 0;
-	background: white;
-	padding: 10px;
-	border-bottom: 1px solid $color-gray-200;
-	z-index: 1000;
-	@media (prefers-color-scheme: dark) {
-		background: $color-gray-900;
-		color: $color-gray-50;
-		border-bottom: 1px solid black;
-	}
-}
-
-#search-input {
-	width: 100%;
-	padding: 8px;
-	border: 1px solid #ccc;
-	border-radius: 4px;
-	background: inherit;
-	color: inherit;
-}
-
-.hidden {
-	display: none;
-}
-
 div.titlepage {
 	margin: 40px 0;
 

flake.lock

@@ -1902,22 +1902,6 @@
         "type": "github"
       }
     },
-    "plugin-typst-preview-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733120663,
-        "narHash": "sha256-uYMZ2PONiiI3UDvCgNvyy4+jhzmUDbAyxX0phKxELXw=",
-        "owner": "chomosuke",
-        "repo": "typst-preview.nvim",
-        "rev": "0cb5f5627312f50ce089f785ec42b55a85f30ce7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "chomosuke",
-        "repo": "typst-preview.nvim",
-        "type": "github"
-      }
-    },
     "plugin-vim-dirtytalk": {
       "flake": false,
       "locked": {
@@ -2167,7 +2151,6 @@
         "plugin-tokyonight": "plugin-tokyonight",
         "plugin-trouble": "plugin-trouble",
         "plugin-ts-error-translator": "plugin-ts-error-translator",
-        "plugin-typst-preview-nvim": "plugin-typst-preview-nvim",
         "plugin-vim-dirtytalk": "plugin-vim-dirtytalk",
         "plugin-vim-fugitive": "plugin-vim-fugitive",
         "plugin-vim-illuminate": "plugin-vim-illuminate",

flake.nix

@@ -206,11 +206,6 @@
       flake = false;
     };
 
-    plugin-typst-preview-nvim = {
-      url = "github:chomosuke/typst-preview.nvim";
-      flake = false;
-    };
-
     plugin-nvim-metals = {
       url = "github:scalameta/nvim-metals";
       flake = false;

modules/neovim/mappings/options.nix

@@ -32,7 +32,7 @@
       mapConfigOptions
       // {
         key = mkOption {
-          type = nullOr str;
+          type = str;
           description = "The key that triggers this keybind.";
         };
         mode = mkOption {

modules/plugins/comments/comment-nvim/config.nix

@@ -24,7 +24,6 @@ in {
                       or '<Plug>(comment_toggle_linewise_count)'
             end
           '' {
-            lua = true;
             expr = true;
             desc = mappings.toggleCurrentLine.description;
           })
@@ -34,7 +33,6 @@ in {
                       or '<Plug>(comment_toggle_blockwise_count)'
             end
           '' {
-            lua = true;
             expr = true;
             desc = mappings.toggleCurrentBlock.description;
           })

modules/plugins/debugger/nvim-dap/config.nix

@@ -11,10 +11,6 @@
   inherit (lib.nvim.dag) entryAnywhere entryAfter;
 
   cfg = config.vim.debugger.nvim-dap;
-  opt = {
-    silent = true;
-    lua = true;
-  };
   inherit (options.vim.debugger.nvim-dap) mappings;
 in {
   config = mkMerge [
@@ -33,23 +29,23 @@ in {
           // mapAttrs (_: v: (entryAfter ["nvim-dap"] v)) cfg.sources;
 
         keymaps = [
-          (mkKeymap "n" cfg.mappings.continue "require('dap').continue" (opt // {desc = mappings.continue.description;}))
-          (mkKeymap "n" cfg.mappings.restart "require('dap').restart" (opt // {desc = mappings.restart.description;}))
-          (mkKeymap "n" cfg.mappings.terminate "require('dap').terminate" (opt // {desc = mappings.terminate.description;}))
-          (mkKeymap "n" cfg.mappings.runLast "require('dap').run_last" (opt // {desc = mappings.runLast.description;}))
+          (mkKeymap "n" cfg.mappings.continue "require('dap').continue" {desc = mappings.continue.description;})
+          (mkKeymap "n" cfg.mappings.restart "require('dap').restart" {desc = mappings.restart.description;})
+          (mkKeymap "n" cfg.mappings.terminate "require('dap').terminate" {desc = mappings.terminate.description;})
+          (mkKeymap "n" cfg.mappings.runLast "require('dap').run_last" {desc = mappings.runLast.description;})
 
-          (mkKeymap "n" cfg.mappings.toggleRepl "require('dap').repl.toggle" (opt // {desc = mappings.toggleRepl.description;}))
-          (mkKeymap "n" cfg.mappings.hover "require('dap.ui.widgets').hover" (opt // {desc = mappings.hover.description;}))
-          (mkKeymap "n" cfg.mappings.toggleBreakpoint "require('dap').toggle_breakpoint" (opt // {desc = mappings.toggleBreakpoint.description;}))
+          (mkKeymap "n" cfg.mappings.toggleRepl "require('dap').repl.toggle" {desc = mappings.toggleRepl.description;})
+          (mkKeymap "n" cfg.mappings.hover "require('dap.ui.widgets').hover" {desc = mappings.hover.description;})
+          (mkKeymap "n" cfg.mappings.toggleBreakpoint "require('dap').toggle_breakpoint" {desc = mappings.toggleBreakpoint.description;})
 
-          (mkKeymap "n" cfg.mappings.runToCursor "require('dap').run_to_cursor" (opt // {desc = mappings.runToCursor.description;}))
-          (mkKeymap "n" cfg.mappings.stepInto "require('dap').step_into" (opt // {desc = mappings.stepInto.description;}))
-          (mkKeymap "n" cfg.mappings.stepOut "require('dap').step_out" (opt // {desc = mappings.stepOut.description;}))
-          (mkKeymap "n" cfg.mappings.stepOver "require('dap').step_over" (opt // {desc = mappings.stepOver.description;}))
-          (mkKeymap "n" cfg.mappings.stepBack "require('dap').step_back" (opt // {desc = mappings.stepBack.description;}))
+          (mkKeymap "n" cfg.mappings.runToCursor "require('dap').run_to_cursor" {desc = mappings.runToCursor.description;})
+          (mkKeymap "n" cfg.mappings.stepInto "require('dap').step_into" {desc = mappings.stepInto.description;})
+          (mkKeymap "n" cfg.mappings.stepOut "require('dap').step_out" {desc = mappings.stepOut.description;})
+          (mkKeymap "n" cfg.mappings.stepOver "require('dap').step_over" {desc = mappings.stepOver.description;})
+          (mkKeymap "n" cfg.mappings.stepBack "require('dap').step_back" {desc = mappings.stepBack.description;})
 
-          (mkKeymap "n" cfg.mappings.goUp "require('dap').up" (opt // {desc = mappings.goUp.description;}))
-          (mkKeymap "n" cfg.mappings.goDown "require('dap').down" (opt // {desc = mappings.goDown.description;}))
+          (mkKeymap "n" cfg.mappings.goUp "require('dap').up" {desc = mappings.goUp.description;})
+          (mkKeymap "n" cfg.mappings.goDown "require('dap').down" {desc = mappings.goDown.description;})
         ];
       };
     })
@@ -63,7 +59,7 @@ in {
           inherit (cfg.ui) setupOpts;
 
           keys = [
-            (mkKeymap "n" cfg.mappings.toggleDapUI "function() require('dapui').toggle() end" (opt // {desc = mappings.toggleDapUI.description;}))
+            (mkKeymap "n" cfg.mappings.toggleDapUI "function() require('dapui').toggle() end" {desc = mappings.toggleDapUI.description;})
           ];
         };
 

modules/plugins/languages/typst.nix

@@ -7,13 +7,10 @@
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
-  inherit (lib.types) nullOr enum either attrsOf listOf package str;
+  inherit (lib.types) enum either listOf package str;
   inherit (lib.attrsets) attrNames;
-  inherit (lib.generators) mkLuaInline;
-  inherit (lib.meta) getExe;
-  inherit (lib.nvim.lua) expToLua toLuaObject;
-  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
-  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.types) mkGrammarOption;
 
   cfg = config.vim.languages.typst;
 
@@ -36,7 +33,6 @@
         }
       '';
     };
-
     tinymist = {
       package = pkgs.tinymist;
       lspConfig = ''
@@ -124,50 +120,6 @@ in {
         default = formats.${cfg.format.type}.package;
       };
     };
-
-    extensions = {
-      typst-preview-nvim = {
-        enable =
-          mkEnableOption ''
-            [typst-preview.nvim]: https://github.com/chomosuke/typst-preview.nvim
-
-            Low latency typst preview for Neovim via [typst-preview.nvim]
-          ''
-          // {default = true;};
-
-        setupOpts = mkPluginSetupOption "typst-preview-nvim" {
-          open_cmd = mkOption {
-            type = nullOr str;
-            default = null;
-            example = "firefox %s -P typst-preview --class typst-preview";
-            description = ''
-              Custom format string to open the output link provided with `%s`
-            '';
-          };
-
-          dependencies_bin = mkOption {
-            type = attrsOf str;
-            default = {
-              "tinymist" = getExe servers.tinymist.package;
-              "websocat" = getExe pkgs.websocat;
-            };
-
-            description = ''
-              Provide the path to binaries for dependencies. Setting this
-              to a non-null value will skip the download of the binary by
-              the plugin.
-            '';
-          };
-
-          extra_args = mkOption {
-            type = nullOr (listOf str);
-            default = null;
-            example = ["--input=ver=draft" "--ignore-system-fonts"];
-            description = "A list of extra arguments (or `null`) to be passed to previewer";
-          };
-        };
-      };
-    };
   };
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
@@ -184,13 +136,5 @@ in {
       vim.lsp.lspconfig.enable = true;
       vim.lsp.lspconfig.sources.typst-lsp = servers.${cfg.lsp.server}.lspConfig;
     })
-
-    # Extensions
-    (mkIf cfg.extensions.typst-preview-nvim.enable {
-      vim.startPlugins = ["typst-preview-nvim"];
-      vim.pluginRC.typst-preview-nvim = entryAnywhere ''
-        require("typst-preview").setup(${toLuaObject cfg.extensions.typst-preview-nvim.setupOpts})
-      '';
-    })
   ]);
 }

modules/plugins/lsp/lightbulb/config.nix

@@ -5,7 +5,6 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.lsp;
 in {
@@ -17,7 +16,7 @@ in {
         vim.api.nvim_command('autocmd CursorHold,CursorHoldI * lua require\'nvim-lightbulb\'.update_lightbulb()')
 
         -- Enable trouble diagnostics viewer
-        require'nvim-lightbulb'.setup(${toLuaObject cfg.lightbulb.setupOpts})
+        require'nvim-lightbulb'.setup()
       '';
     };
   };

modules/plugins/lsp/lightbulb/lightbulb.nix

@@ -1,11 +1,9 @@
 {lib, ...}: let
   inherit (lib.options) mkEnableOption;
-  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.lsp = {
     lightbulb = {
       enable = mkEnableOption "Lightbulb for code actions. Requires an emoji font";
-      setupOpts = mkPluginSetupOption "nvim-lightbulb" {};
     };
   };
 }

modules/plugins/statusline/lualine/lualine.nix

@@ -13,43 +13,41 @@
   builtin_themes = [
     "auto"
     "16color"
+    "gruvbox"
     "ayu_dark"
     "ayu_light"
     "ayu_mirage"
     "ayu"
-    "base16"
     "codedark"
     "dracula"
     "everforest"
     "gruvbox"
     "gruvbox_dark"
     "gruvbox_light"
-    "gruvbox-material"
+    "gruvbox_material"
     "horizon"
     "iceberg_dark"
     "iceberg_light"
     "iceberg"
     "jellybeans"
     "material"
-    "modus-vivendi"
+    "modus_vivendi"
     "molokai"
     "moonfly"
     "nightfly"
     "nord"
-    "OceanicNext"
+    "oceanicnext"
     "onedark"
     "onelight"
     "palenight"
     "papercolor_dark"
     "papercolor_light"
-    "PaperColor"
     "powerline_dark"
     "powerline"
-    "pywal"
     "seoul256"
     "solarized_dark"
     "solarized_light"
-    "Tomorrow"
+    "tomorrow"
     "wombat"
   ];
 in {

modules/plugins/visuals/indent-blankline/indent-blankline.nix

@@ -6,7 +6,6 @@
   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 {
@@ -16,7 +15,7 @@ in {
 
   options.vim.visuals.indent-blankline = {
     enable = mkEnableOption "indentation guides [indent-blankline]";
-    setupOpts = mkPluginSetupOption "indent-blankline" {
+    setupOpts = {
       debounce = mkOption {
         type = int;
         description = "Debounce time in milliseconds";

modules/wrapper/rc/config.nix

@@ -5,7 +5,7 @@
 }: let
   inherit (builtins) map mapAttrs filter;
   inherit (lib.attrsets) mapAttrsToList;
-  inherit (lib.strings) concatLines concatMapStringsSep;
+  inherit (lib.strings) concatLines concatMapStringsSep optionalString;
   inherit (lib.trivial) showWarnings;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.dag) entryAfter mkLuarcSection resolveDag entryAnywhere;
@@ -43,7 +43,7 @@ in {
 
     toLuaKeymap = bind: "vim.keymap.set(${toLuaObject bind.mode}, ${toLuaObject bind.key}, ${toLuaObject (getAction bind)}, ${toLuaObject (getOpts bind)})";
 
-    keymaps = concatLines (map toLuaKeymap (filter (x: x.key != null) cfg.keymaps));
+    keymaps = concatLines (map toLuaKeymap cfg.keymaps);
   in {
     vim = {
       luaConfigRC = {

modules/wrapper/rc/options.nix

@@ -6,7 +6,6 @@
   inherit (lib.options) mkOption mkEnableOption literalMD literalExpression;
   inherit (lib.strings) optionalString;
   inherit (lib.types) str bool int enum attrsOf lines listOf either path submodule anything;
-  inherit (lib.trivial) isBool;
   inherit (lib.nvim.languages) toVimBool;
   inherit (lib.nvim.types) dagOf;
   inherit (lib.nvim.lua) listToLuaTable;
@@ -14,28 +13,22 @@
   cfg = config.vim;
 in {
   options.vim = {
-    enableLuaLoader = mkOption {
-      type = bool;
-      default = false;
-      example = true;
-      description = ''
-        [{option}`official documentation`]: https://neovim.io/doc/user/lua.html#vim.loader.enable()
+    enableLuaLoader = mkEnableOption ''
+      [{option}`official documentation`]: https://neovim.io/doc/user/lua.html#vim.loader.enable()
 
-        the experimental Lua module loader to speed up the start up process
+      the experimental Lua module loader to speed up the start up process
 
-        If `true`, this will enable the experimental Lua module loader which:
-          - overrides loadfile
-          - adds the lua loader using the byte-compilation cache
-          - adds the libs loader
-          - removes the default Neovim loader
+      If `true`, this will enable the experimental Lua module loader which:
+        - overrides loadfile
+        - adds the lua loader using the byte-compilation cache
+        - adds the libs loader
+        - removes the default Neovim loader
 
-        ::: {.note}
-        The Lua module loader is *disabled* by default. Before setting this option, please
-        take a look at the [{option}`official documentation`]. This option may be enabled by
-        default in the future.
-        :::
-      '';
-    };
+      ::: {.note}
+      This is disabled by default. Before setting this option, please
+      take a look at the [{option}`official documentation`].
+      :::
+    '';
 
     additionalRuntimePaths = mkOption {
       type = listOf (either path str);
@@ -231,12 +224,9 @@ in {
           };
 
           signcolumn = mkOption {
-            type = either str bool;
+            type = bool;
             default = true;
-            apply = x:
-              if isBool x
-              then toVimBool x # convert to a yes/no str
-              else x;
+            apply = x: toVimBool x; # convert to a yes/no str
             description = "Show the sign column";
           };
         };

release.json

@@ -1,4 +1,4 @@
 {
-	"release": "v0.8",
-	"isReleaseBranch": false
+	"release": "v0.7",
+	"isReleaseBranch": true
 }