lazy: update example

* remove unused

* maps: fix missing description

.github/CONTRIBUTING.md

@@ -16,7 +16,7 @@ If you have any questions regarding those files, feel free to open an issue or [
 
 ## Contributing
 
-The contribution process is mostly documented in the [pull request template](pull_request_template.md). You will find a checklist of items to complete before submitting a pull request. Please make sure you complete it before submitting a pull request. If you are unsure about any of the items, please ask.
+The contribution process is mostly documented in the [pull request template](.github/pull_request_template.md). You will find a checklist of items to complete before submitting a pull request. Please make sure you complete it before submitting a pull request. If you are unsure about any of the items, please ask.
 
 ### Guidelines
 

.github/README.md

@@ -33,9 +33,10 @@
 
 <div align="center">
   <a>
-    nvf is a highly modular, configurable, extensible and easy to use Neovim configuration
+    A highly modular, configurable, extensible and easy to use Neovim configuration 
-    in Nix. Designed for flexibility and ease of use, nvf allows you to easily configure
+    framework in Nix. Designed for flexibility and ease of use, this flake 
-    your fully featured Neovim instance with a few lines of Nix.
+    allows you to easily configure your Neovim instance with a few lines of 
+    Nix code.
   </a>
 </div>
 
@@ -43,7 +44,6 @@
 
 <div align="center"><p>
 
-[Features]: #features
 [Get Started]: #get-started
 [Documentation]: #documentation
 [Help]: #help
@@ -51,150 +51,119 @@
 [FAQ]: #faq
 [Credits]: #credits
 
-**[<kbd><br> Features <br></kbd>][Features]**
+**[<kbd> <br> Get Started <br> </kbd>][Get Started]**
-**[<kbd><br> Get Started <br></kbd>][Get Started]**
+**[<kbd> <br> Documentation <br> </kbd>][Documentation]**
-**[<kbd><br> Documentation <br></kbd>][Documentation]**
+**[<kbd> <br> Help <br> </kbd>][Help]**
-**[<kbd><br> Help <br></kbd>][Help]**
+**[<kbd> <br> Contribute <br> </kbd>][Contribute]**
-**[<kbd><br> Contribute <br></kbd>][Contribute]**
+**[<kbd> <br> FAQ <br> </kbd>][Faq]**
-**[<kbd><br> FAQ <br></kbd>][Faq]** **[<kbd><br> Credits <br></kbd>][Credits]**
+**[<kbd> <br> Credits <br> </kbd>][Credits]**
 
 </p></div>
 
 ---
 
-## Features
-
-- **Reproducible**: Your configuration will behave the same _anywhere_. No
-  surprises, promise!
-- **Portable**: nvf depends _solely_ on your Nix store, and nothing else. No
-  more global binaries! Works on all platforms, without hassle.
-- **Customizable**: There are _almost no defaults_ to annoy you. nvf is fully
-  customizable through the Nix module system.
-- **Well-documented**: Documentation is priority. You will _never_ face
-  undocumented, obscure behaviour.
-- **Idiomatic**: nvf does things ✨ _the right way_ ✨ - the codebase is, and
-  will, remain maintainable for myself and any contributors.
-
 ## Get Started
 
-[nvf manual]: https://notashelf.github.io/nvf/
+### Using `nix` CLI
-[issue tracker]: https://github.com/NotAShelf/nvf/issues
 
-If you are not sold on the concepts of **nvf**, and would like to try out the
+If you would like to try out the configuration before even thinking about
-default configuration before even _thinking about_ installing it, you may run
+installing it, you can run the following command
-the following in order to take **nvf** out for a spin.
 
-```bash
+```console
-# Run the default package
 nix run github:notashelf/nvf
 ```
 
-This will get you a feel for the base configuration and UI design. Though, none
+This will get you a feel for the base configuration and UI design.
-of the configuration options are final as **nvf** is designed to be modular and
+The flake exposes `#nix` as the default package, providing minimal
-configurable.
+language support and various utilities.You may also use `#nix`,
+`#tidal` or `#maximal` to get try out different configurations.
 
-> [!TIP]
+It is as simple as changing the target output to get a different
-> The flake exposes `#nix` as the default package, providing minimal language
+configuration. For example, to get a configuration with `tidal` support, run:
-> support and various utilities. You may also use the `#nix` or `#maximal`
-> packages provided by the this flake to get try out different configurations.
 
-It is as simple as changing the target output to get a different configuration.
+```console
-For example, to get a configuration with large language coverage, run:
+nix run github:notashelf/nvf#tidal
-
-```bash
-# Run the maximal package
-nix run github:notashelf/nvf#maximal
 ```
 
 Similar instructions will apply for `nix profile install`. However, you are
 recommended to instead use the module system as described in the manual.
 
 > [!NOTE]  
-> The `maximal` configuration is quite large, and might take a while to build.
+> The `maximal` configuration is _massive_ and will take a while to build.
-> To get a feel for the configuration, use the default `nix` configuration.
+> To get a feel for the configuration, use the default `nix` or `tidal`
-> Should you choose to try out the `maximal` configuration, using the binary
+> configurations. Should you choose to try out the `maximal` configuration,
-> cache as described in the manual is _strongly_ recommended.
+> using the binary cache as described in the manual is _strongly_ recommended.
-
-If you are convinced, proceed to the next section to view the installation
-instructions.
 
 ## Documentation
 
-The _recommended_ way of installing **nvf** is using either the NixOS or the
+See the [**nvf** Manual](https://notashelf.github.io/nvf/) for
-Home-Manager module, though it is completely possible and no less supported to
+detailed installation guides, configurations, available options, release notes
-install **nvf** as a standalone package, or a flake output.
+and more. Tips for installing userspace plugins is also contained in the
+documentation.
 
-See the [**nvf** manual] for detailed and up-to-date installation guides,
+If you want to dive right into trying **nvf** you can get a fully
-configurations, available options, release notes and more. Tips for installing
+featured configuration with `nix` language support by running:
-userspace plugins is also contained in the documentation.
 
-Please create an issue on the [issue tracker] if you find the documentation
+```console
-lacking or confusing. Any improvements to the documentation through pull
+nix run github:notashelf/nvf#nix
-requests are also welcome, and appreciated.
+```
+
+[Issues]: https://github.com/NotAShelf/nvf/issues
+
+Please create an issue on the [issue tracker](issues) if you find
+the documentation lacking or confusing. I also appreciate any contributions
+to the documentation.
 
 ## Help
 
-You can create an issue on the [issue tracker] to ask questions or report bugs.
+You can create an issue on the [issue tracker](issues) to ask questions
-I am not yet on spaces like matrix or IRC, so please use the issue tracker for
+or report bugs. I am not yet on spaces like matrix or IRC, so please use the issue
-now.
+tracker for now.
 
 ## Contributing
 
 I am always looking for new ways to help improve this flake. If you would like
 to contribute, please read the [contributing guide](CONTRIBUTING.md) before
-submitting a pull request. You can also create an issue on the [issue tracker]
+submitting a pull request. You can also create an issue on the
-before submitting a pull request if you would like to discuss a feature or bug
+[issue tracker](issues) before submitting a pull request if you would
-fix.
+like to discuss a feature or bug fix.
 
 ## FAQ
 
-[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
-
 **Q**: Can you add _X_?
-<br/> **A**: Maybe! It is not one of our goals to support each and every Neovim
+<br/>
-plugin, however, I am always open to new modules and plugin setup additions to
+**A**: Maybe! It is not one of our goals to support each and every Neovim
-**nvf**. Use the [appropriate issue template] and I will consider a module
+plugin, however, I am always open to new modules and plugin setup additions
-addition. As mentioned before, PRs adding new features are also welcome.
+to **nvf**. Use the [appropritate issue template](issues/new/choose) and I will
+consider a module addition.
 
 **Q**: A plugin I need is not available in **nvf**. What to do?
-<br/> **A**: **nvf** exposes several APIs for you to be able to add your own
+<br/>
-plugin configurations! Please see the documentation on how you may do this.
+**A**: **nvf** exposes several APIs for you to be able to add your own
+plugin configurations! Please see the documentation on how you may do
+this.
 
 **Q**: Main branch is awfully silent, is the project dead?
-<br/> **A**: No! Sometimes we branch out (e.g. `v0.6`) to avoid breaking
+<br/>
-userspace and work in a separate branch until we make sure the new additions are
+**A**: No! Sometimes we branch out (e.g. v0.6) to avoid breaking userspace
-implemented in the most comfortable way possible for the end user. If you have
+and work in a separate branch until we make sure the new additions are
-not noticed any activity on the main branch, consider taking a look at the
+implemented in the most comfortable way available to the end user. If you have
-[list of branches] or the [list of open pull requests]. You may also consider
+not noticed any activity on the main branch, consider taking a look at the [list
-_testing_ those release branches to get access to new features ahead of time and
+of branches](https://github.com/NotAShelf/nvf/branches=) or the [list of open
-better prepare to breaking changes.
+pull requests](https://github.com/NotAShelf/nvf)
 
 ## Credits
 
 ### Contributors
 
-Special, heart-felt thanks to
+Special thanks to
 
 - [@fufexan](https://github.com/fufexan) - For the transition to flake-parts
-- [@FlafyDev](https://github.com/FlafyDev) - For getting the home-manager to
+- [@FlafyDev](https://github.com/FlafyDev) - For getting the home-manager to work
-  work
+- [@n3oney](https://github.com/n3oney) - For making custom keybinds finally possible
-- [@n3oney](https://github.com/n3oney) - For making custom keybinds finally
+- [@horriblename](https://github.com/horriblename) - For actively implementing planned features and quality of life updates
-  possible
-- [@horriblename](https://github.com/horriblename) - For actively implementing
-  planned features and quality of life updates
 - [@Yavko](https://github.com/Yavko) - For the amazing **nvf** logo
-- [@FrothyMarrow](https://github.com/FrothyMarrow) - For seeing mistakes that I
+- [@FrothyMarrow](https://github.com/FrothyMarrow) - For seeing mistakes that I could not
-  could not
-- [@Diniamo](https://github.com/Diniamo) - For actively submitting PRs, pull
-  requests and overall assistence
-- [@Gerg-l](https://github.com/gerg-l) - For the modern Neovim wrapper, mnw and
-  occasional code improvements
 
 and everyone who has submitted issues or pull requests!
 
@@ -203,18 +172,10 @@ and everyone who has submitted issues or pull requests!
 This configuration borrows from and is based on a few other configurations,
 including:
 
-- [@jordanisaacs's](https://github.com/jordanisaacs)
+- [@jordanisaacs's](https://github.com/jordanisaacs) [neovim-flake](https://github.com/jordanisaacs/neovim-flake) that this flake is originally based on.
-  [neovim-flake](https://github.com/jordanisaacs/neovim-flake) that this flake
+- [@sioodmy's](https://github.com/sioodmy) [dotfiles](https://github.com/sioodmy/dotfiles) that inspired the design choices.
-  is originally based on.
+- [@wiltaylor's](https://github.com/wiltaylor) [neovim-flake](https://github.com/wiltaylor/neovim-flake) for plugin and design ideas.
-- [@sioodmy's](https://github.com/sioodmy)
+- [@gvolpe's](https://github.com/gvolpe) [neovim-flake](https://github.com/gvolpe/neovim-flake) for plugin, design and nix concepts.
-  [dotfiles](https://github.com/sioodmy/dotfiles) that inspired the design
-  choices.
-- [@wiltaylor's](https://github.com/wiltaylor)
-  [neovim-flake](https://github.com/wiltaylor/neovim-flake) for plugin and
-  design ideas.
-- [@gvolpe's](https://github.com/gvolpe)
-  [neovim-flake](https://github.com/gvolpe/neovim-flake) for plugin, design and
-  nix concepts.
 
 I am grateful for their previous work and inspiration, and I wholeheartedly
 recommend checking their work out.
@@ -222,14 +183,11 @@ recommend checking their work out.
 
 ## License
 
-Following the license of the
+Following the license of the [original neovim-flake](https://github.com/jordanisaacs/neovim-flake),
-[original neovim-flake](https://github.com/jordanisaacs/neovim-flake), **nvf**
+**nvf** has been made available under the [**MIT License**](LICENSE). However, all assets
-has been made available under the [**MIT License**](LICENSE). However, all
+and documentation are published under the 
-assets and documentation are published under the
 [**CC BY License**](https://github.com/NotAShelf/nvf/blob/main/.github/assets/LICENSE).
 
-<h6 align="center">Yes, this includes the logo work too. Stop taking artwork that is not yours!</h6>
-
 ---
 
 <div align="right">

.github/workflows/cleanup.yml

@@ -1,22 +0,0 @@
-name: Cleanup
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 4 1 * *" # 4AM on 1st of every month
-    - cron: "0 4 15 * *" # 4AM on the 15th of every month
-jobs:
-  branches:
-    name: Cleanup old branches
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v4
-
-      - name: "Delete old branches"
-        uses: beatlabs/delete-old-branches-action@v0.0.10
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          date: "1 months ago"
-          dry_run: false
-          delete_tags: false
-          exclude_open_pr_branches: true

.github/workflows/manual.yml

@@ -1,5 +1,4 @@
 name: "Build and deploy documentation"
-
 on:
   workflow_dispatch:
   push:
@@ -8,7 +7,6 @@ on:
     paths:
       # build the manuals only when docs directory is updated
       - docs/**
-      - modules/**
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
@@ -22,34 +20,23 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  check_date:
-    runs-on: ubuntu-latest
-    name: Check latest commit
-    outputs:
-      should_run: ${{ steps.should_run.outputs.should_run }}
-    steps:
-      - uses: actions/checkout@v4.1.7
-      - name: print latest_commit
-        run: echo ${{ github.sha }}
-
-      - id: should_run
-        continue-on-error: true
-        name: check latest commit is less than a day
-        if: ${{ github.event_name == 'schedule' }}
-        run: test -z $(git rev-list --after="24 hours" ${{ github.sha }}) && echo "::set-output name=should_run::false"
-
   publish:
-    needs: check_date
-    if: ${{ needs.check_date.outputs.should_run != 'false' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.7
+      - name: Checkout
-      - uses: DeterminateSystems/nix-installer-action@main
+        uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
-      - run: |
+
-          nix build .#docs
+      - name: Build
+        run: |
+          nix build '.#docs'
           cp -r result/share/doc/nvf public
-      - uses: peaceiris/actions-gh-pages@v4
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./public

configuration.nix

@@ -17,9 +17,9 @@ isMaximal: {
       lspkind.enable = false;
       lightbulb.enable = true;
       lspsaga.enable = false;
+      nvimCodeActionMenu.enable = isMaximal;
       trouble.enable = true;
       lspSignature.enable = true;
-      otter-nvim.enable = isMaximal;
       lsplines.enable = isMaximal;
       nvim-docs-view.enable = isMaximal;
     };
@@ -60,7 +60,6 @@ isMaximal: {
       python.enable = isMaximal;
       dart.enable = isMaximal;
       bash.enable = isMaximal;
-      r.enable = isMaximal;
       tailwind.enable = isMaximal;
       typst.enable = isMaximal;
       clang = {
@@ -156,7 +155,7 @@ isMaximal: {
     };
 
     utility = {
-      ccc.enable = false;
+      ccc.enable = isMaximal;
       vim-wakatime.enable = false;
       icon-picker.enable = isMaximal;
       surround.enable = isMaximal;
@@ -205,7 +204,6 @@ isMaximal: {
           go = ["90" "130"];
         };
       };
-      fastaction.enable = true;
     };
 
     assistant = {

docs/default.nix

@@ -2,24 +2,19 @@
   inputs,
   pkgs,
   lib,
+  manpageUrls ? pkgs.path + "/doc/manpage-urls.json",
+  ...
 }: let
-  inherit ((lib.importJSON ../release.json)) release;
+  inherit (lib.modules) mkForce evalModules;
+  inherit (lib.strings) hasPrefix removePrefix;
+  inherit (lib.attrsets) isAttrs mapAttrs optionalAttrs recursiveUpdate isDerivation;
+  inherit (builtins) fromJSON readFile;
 
-  nvimModuleDocs = pkgs.nixosOptionsDoc {
+  # release data
-    variablelistId = "nvf-options";
+  release-config = fromJSON (readFile ../release.json);
-    warningsAreErrors = true;
+  revision = release-config.release;
 
-    inherit
+  # From home-manager:
-      (
-        (lib.evalModules {
-          modules =
-            import ../modules/modules.nix {
-              inherit lib pkgs;
-            }
-            ++ [
-              (
-                let
-                  # From nixpkgs:
   #
   # Recursively replace each derivation in the given attribute set
   # with the same derivation but with the `outPath` attribute set to
@@ -33,73 +28,131 @@
   # Caveat: even if the package is reached by a different means, the
   # path above will be shown and not e.g.
   # `${config.services.foo.package}`.
-                  scrubDerivations = namePrefix: pkgSet:
+  scrubDerivations = prefixPath: attrs: let
-                    builtins.mapAttrs (
+    scrubDerivation = name: value: let
-                      name: value: let
+      pkgAttrName = prefixPath + "." + name;
-                        wholeName = "${namePrefix}.${name}";
     in
-                        if builtins.isAttrs value
+      if isAttrs value
       then
-                          scrubDerivations wholeName value
+        scrubDerivations pkgAttrName value
-                          // lib.optionalAttrs (lib.isDerivation value) {
+        // optionalAttrs (isDerivation value) {
-                            inherit (value) drvPath;
+          outPath = "\${${pkgAttrName}}";
-                            outPath = "\${${wholeName}}";
         }
-                        else value
+      else value;
-                    )
+  in
-                    pkgSet;
+    mapAttrs scrubDerivation attrs;
-                in {
+
-                  _module = {
+  # Make sure the used package is scrubbed to avoid actually
-                    check = false;
+  # instantiating derivations.
-                    args.pkgs = lib.mkForce (scrubDerivations "pkgs" pkgs);
+  scrubbedPkgsModule = {
+    imports = [
+      {
+        _module.args = {
+          pkgs = mkForce (scrubDerivations "pkgs" pkgs);
+          pkgs_i686 = mkForce {};
         };
       }
-              )
     ];
-        })
+  };
-      )
+
-      options
+  # Specify the path to the module entrypoint
-      ;
+  nvimPath = toString ./..;
+  buildOptionsDocs = args @ {
+    modules,
+    includeModuleSystemOptions ? true,
+    warningsAreErrors ? true,
+    ...
+  }: let
+    inherit ((evalModules {inherit modules;})) options;
+
+    # Declaration of the Github site URL.
+    # Takes a user, repo, and subpath, and returns a declaration site
+    # as a string.
+    githubDeclaration = user: repo: subpath: let
+      urlRef = "github.com";
+      branch = "main";
+    in {
+      url = "https://${urlRef}/${user}/${repo}/blob/${branch}/${subpath}";
+      name = "<${repo}/${subpath}>";
+    };
+  in
+    pkgs.buildPackages.nixosOptionsDoc ({
+        inherit warningsAreErrors;
+
+        options =
+          if includeModuleSystemOptions
+          then options
+          else builtins.removeAttrs options ["_module"];
 
         transformOptions = opt:
-      opt
+          recursiveUpdate opt {
-      // {
+            # Clean up declaration sites to not refer to the nvf
-        declarations =
+            # source tree.
-          map (
+            declarations = map (decl:
-            decl:
+              if hasPrefix nvimPath (toString decl)
-              if lib.hasPrefix (toString ../.) (toString decl)
               then
-                lib.pipe decl [
+                githubDeclaration "notashelf" "nvf"
-                  toString
+                (removePrefix "/" (removePrefix nvimPath (toString decl)))
-                  (lib.removePrefix (toString ../.))
-                  (lib.removePrefix "/")
-                  (x: {
-                    url = "https://github.com/NotAShelf/nvf/blob/main/${x}";
-                    name = "<nvf/${x}>";
-                  })
-                ]
               else if decl == "lib/modules.nix"
-              then {
+              then
-                url = "https://github.com/NixOS/nixpkgs/blob/master/${decl}";
+                # TODO: handle this in a better way (may require upstream
-                name = "<nixpkgs/lib/modules.nix>";
+                # changes to nixpkgs)
-              }
+                githubDeclaration "NixOS" "nixpkgs" decl
-              else decl
+              else decl)
-          )
             opt.declarations;
           };
+      }
+      // builtins.removeAttrs args ["modules" "includeModuleSystemOptions"]);
+
+  nvimModuleDocs = buildOptionsDocs {
+    variablelistId = "nvf-options";
+
+    modules =
+      import ../modules/modules.nix {
+        inherit lib pkgs;
+        check = false;
+      }
+      ++ [scrubbedPkgsModule];
+  };
+
+  # Generate the `man home-configuration.nix` package
+  nvf-configuration-manual =
+    pkgs.runCommand "nvf-reference-manpage" {
+      nativeBuildInputs = [pkgs.buildPackages.installShellFiles pkgs.nixos-render-docs];
+      allowedReferences = ["out"];
+    } ''
+      # Generate manpages.
+      mkdir -p $out/share/man/man5
+      mkdir -p $out/share/man/man1
+
+      nixos-render-docs -j $NIX_BUILD_CORES options manpage \
+        --revision ${revision} \
+        --header ${./man/header.5} \
+        --footer ${./man/footer.5} \
+        ${nvimModuleDocs.optionsJSON}/share/doc/nixos/options.json \
+        $out/share/man/man5/nvf.5
+
+      cp ${./man/nvf.1} $out/share/man/man1/nvf.1
+    '';
+
+  # Generate the HTML manual pages
+  nvf-manual = pkgs.callPackage ./manual.nix {
+    inherit revision manpageUrls;
+    outputPath = "share/doc/nvf";
+    options = {
+      nvf = nvimModuleDocs.optionsJSON;
+    };
   };
 
-  # Generate the HTML manual pages
+  html = nvf-manual;
-  html = pkgs.callPackage ./manual.nix {
+  htmlOpenTool = pkgs.callPackage ./html-open-tool.nix {} {inherit html;};
-    inherit release;
-    inherit (nvimModuleDocs) optionsJSON;
-  };
 in {
   inherit (inputs) nmd;
 
+  options = {
     # TODO: Use `hmOptionsDocs.optionsJSON` directly once upstream
     # `nixosOptionsDoc` is more customizable.
-  options.json =
+    json =
       pkgs.runCommand "options.json" {
         meta.description = "List of nvf options in JSON format";
       } ''
@@ -112,31 +165,8 @@ in {
             '${nvimModuleDocs.optionsJSON}/share/doc/nixos' \
             "$out/share/doc/nvf"
       '';
-
-  # Generate the `man home-configuration.nix` package
-  manPages =
-    pkgs.runCommand "nvf-reference-manpage" {
-      nativeBuildInputs = [
-        pkgs.buildPackages.installShellFiles
-        pkgs.nixos-render-docs
-      ];
-      allowedReferences = ["out"];
-    } ''
-      # Generate manpages.
-      mkdir -p $out/share/man/{man5,man1}
-
-      nixos-render-docs -j $NIX_BUILD_CORES options manpage \
-        --revision ${release} \
-        --header ${./man/header.5} \
-        --footer ${./man/footer.5} \
-        ${nvimModuleDocs.optionsJSON}/share/doc/nixos/options.json \
-        $out/share/man/man5/nvf.5
-
-      cp ${./man/nvf.1} $out/share/man/man1/nvf.1
-    '';
-
-  manual = {
-    inherit html;
-    htmlOpenTool = pkgs.callPackage ./html-open-tool.nix {inherit html;};
   };
+
+  manPages = nvf-configuration-manual;
+  manual = {inherit html htmlOpenTool;};
 }

docs/html-open-tool.nix

@@ -2,9 +2,13 @@
   writeShellScriptBin,
   makeDesktopItem,
   symlinkJoin,
+}: {
   html,
+  pathName ? "nvf",
+  projectName ? pathName,
+  name ? "${pathName}-help",
 }: let
-  helpScript = writeShellScriptBin "nvf-help" ''
+  helpScript = writeShellScriptBin name ''
     set -euo pipefail
 
     if [[ ! -v BROWSER || -z $BROWSER ]]; then
@@ -20,23 +24,20 @@
       echo "$0: unable to start a web browser; please set \$BROWSER"
       exit 1
     else
-      exec "$BROWSER" "${html}/share/doc/nvf/index.xhtml"
+      exec "$BROWSER" "${html}/share/doc/${pathName}/index.xhtml"
     fi
   '';
 
   desktopItem = makeDesktopItem {
-    name = "nvf-manual";
+    name = "${pathName}-manual";
-    desktopName = "nvf Manual";
+    desktopName = "${projectName} Manual";
-    genericName = "View nvf documentation in a web browser";
+    genericName = "View ${projectName} documentation in a web browser";
     icon = "nix-snowflake";
-    exec = "${helpScript}/bin/nvf-help";
+    exec = "${helpScript}/bin/${name}";
     categories = ["System"];
   };
 in
   symlinkJoin {
-    name = "nvf-help";
+    inherit name;
-    paths = [
+    paths = [helpScript desktopItem];
-      helpScript
-      desktopItem
-    ];
   }

docs/manual.nix

@@ -4,10 +4,11 @@
   # build inputs
   nixos-render-docs,
   documentation-highlighter,
-  path,
   # nrd configuration
-  release,
+  manpageUrls,
-  optionsJSON,
+  revision,
+  options,
+  outputPath ? "share/doc/nvf",
 }:
 stdenvNoCC.mkDerivation {
   name = "nvf-manual";
@@ -19,11 +20,9 @@ stdenvNoCC.mkDerivation {
   nativeBuildInputs = [nixos-render-docs];
 
   buildPhase = ''
-    dest="$out/share/doc/nvf"
+    mkdir -p out/{highlightjs,media}
-    mkdir -p "$(dirname "$dest")"
-    mkdir -p $dest/{highlightjs,media}
 
-    cp -vt $dest/highlightjs \
+    cp -vt out/highlightjs \
       ${documentation-highlighter}/highlight.pack.js \
       ${documentation-highlighter}/LICENSE \
       ${documentation-highlighter}/mono-blue.css \
@@ -32,30 +31,36 @@ stdenvNoCC.mkDerivation {
     substituteInPlace ./options.md \
       --subst-var-by \
         OPTIONS_JSON \
-        ${optionsJSON}/share/doc/nixos/options.json
+        ${options.nvf}/share/doc/nixos/options.json
 
     substituteInPlace ./manual.md \
       --subst-var-by \
         NVF_VERSION \
-        ${release}
+        ${revision}
 
     # copy stylesheet
-    cp ${./static/style.css} "$dest/style.css"
+    cp ${./static/style.css} out/style.css
 
     # copy release notes
     cp -vr ${./release-notes} release-notes
 
     # generate manual from
     nixos-render-docs manual html \
-      --manpage-urls ${path + "/doc/manpage-urls.json"} \
+      --manpage-urls ${manpageUrls} \
-      --revision ${lib.trivial.revisionWithDefault release} \
+      --revision ${lib.trivial.revisionWithDefault revision} \
       --stylesheet style.css \
       --script highlightjs/highlight.pack.js \
       --script highlightjs/loader.js \
       --toc-depth 2 \
       --section-toc-depth 1 \
       manual.md \
-      "$dest/index.xhtml"
+      out/index.xhtml
+  '';
+
+  installPhase = ''
+    dest="$out/${outputPath}"
+    mkdir -p "$(dirname "$dest")"
+    mv out "$dest"
 
     mkdir -p $out/nix-support/
     echo "doc manual $dest index.html" >> $out/nix-support/hydra-build-products

docs/manual/configuring/custom-plugins.md

@@ -1,7 +1,7 @@
 # Custom Plugins {#ch-custom-plugins}
 
 **nvf**, by default, exposes a wide variety of plugins as module options
-for your convenience and bundles necessary dependencies into **nvf**'s runtime.
+for your convience and bundles necessary dependencies into **nvf**'s runtime.
 In case a plugin is not available in **nvf**, you may consider making a pull
 request to **nvf** to include it as a module or you may add it to your
 configuration locally.

docs/manual/configuring/dag-entries.md

@@ -5,19 +5,16 @@ can add code that relies on other code. However, if you don't know what the
 entries are called, it's hard to do that, so here is a list of the internal
 entries in nvf:
 
-## `vim.luaConfigRC` (top-level DAG) {#ch-vim-luaconfigrc}
+`vim.luaConfigRC` (top-level DAG):
 
 1. (`luaConfigPre`) - not a part of the actual DAG, instead, it's simply
    inserted before the rest of the DAG
 2. `globalsScript` - used to set globals defined in `vim.globals`
 3. `basic` - used to set basic configuration options
-4. `optionsScript` - used to set options defined in `vim.o`
+4. `theme` - used to set up the theme, which has to be done before other plugins
-5. `theme` (this is simply placed before `pluginConfigs`, meaning that
+5. `pluginConfigs` - the result of the nested `vim.pluginRC` (internal option,
-   surrounding entries don't depend on it) - used to set up the theme, which has
+   see the [Custom Plugins](/index.xhtml#ch-custom-plugins) page for adding your own
-   to be done before other plugins
+   plugins) DAG, used to set up internal plugins
-6. `pluginConfigs` - the result of the nested `vim.pluginRC` (internal option,
+6. `extraPluginConfigs` - the result of `vim.extraPlugins`, which is not a
-   see the [Custom Plugins](/index.xhtml#ch-custom-plugins) page for adding your
-   own plugins) DAG, used to set up internal plugins
-7. `extraPluginConfigs` - the result of `vim.extraPlugins`, which is not a
    direct DAG, but is converted to, and resolved as one internally
-8. `mappings` - the result of `vim.maps`
+7. `mappings` - the result of `vim.maps`

docs/release-notes/rl-0.7.md

@@ -48,18 +48,6 @@ vim.maps."<leader>m" = {
 };
 ```
 
-### `vim.lsp.nvimCodeActionMenu` removed in favor of `vim.ui.fastaction` {#sec-nvim-code-action-menu-deprecation}
-
-The nvim-code-action-menu plugin has been archived and broken for a long time,
-so it's being replaced with a young, but better alternative called
-fastaction.nvim. Simply remove everything set under
-`vim.lsp.nvimCodeActionMenu`, and set `vim.ui.fastaction.enable` to `true`.
-
-Note that we are looking to add more alternatives in the future like
-dressing.nvim and actions-preview.nvim, in case fastaction doesn't work for
-everyone.
-
-
 ## Changelog {#sec-release-0.7-changelog}
 
 [ItsSorae](https://github.com/ItsSorae):
@@ -89,7 +77,6 @@ everyone.
   longer filtered and thus should be used instead.
 - Add dap-go for better dap configurations
 - Make noice.nvim customizable
-- Standardize border style options and add custom borders
 
 [rust-tools.nvim]: https://github.com/simrat39/rust-tools.nvim
 [rustaceanvim]: https://github.com/mrcjkb/rustaceanvim
@@ -108,8 +95,7 @@ everyone.
 
 - Fix "Emac" typo
 
-- Add [new-file-template.nvim] to automatically fill new file contents using
+- Add [new-file-template.nvim] to automatically fill new file contents using templates.
-  templates.
 
 [diniamo](https://github.com/diniamo):
 
@@ -140,9 +126,6 @@ everyone.
     yourself by adding `vim.opt.listchars:append({ eol = '<char>' })` to your
     lua configuration
 
-- Replace `vim.lsp.nvimCodeActionMenu` with `vim.ui.fastaction`, see the
-  breaking changes section above for more details
-
 [Neovim documentation on `vim.cmd`]: https://neovim.io/doc/user/lua.html#vim.cmd()
 
 - Make Neovim's configuration file entirely Lua based. This comes with a few
@@ -189,43 +172,7 @@ everyone.
 - Add `nvf-print-config` & `nvf-print-config-path` helper scripts to Neovim
   closure. Both of those scripts have been automatically added to your PATH upon
   using neovimConfig or `programs.nvf.enable`.
-
   - `nvf-print-config` will display your `init.lua`, in full.
   - `nvf-print-config-path` will display the path to _a clone_ of your
     `init.lua`. This is not the path used by the Neovim wrapper, but an
     identical clone.
-
-- Add `vim.ui.breadcrumbs.lualine` to allow fine-tuning breadcrumbs behaviour on
-  Lualine. Only `vim.ui.breadcrumbs.lualine.winbar` is supported for the time
-  being.
-
-  - [](#opt-vim.ui.breadcrumbs.lualine.winbar.enable) has been added to allow
-    controlling the default behaviour of the `nvim-navic` component on Lualine,
-    which used to occupy `winbar.lualine_c` as long as breadcrumbs are enabled.
-  - `vim.ui.breadcrumbs.alwaysRender` has been renamed to
-    [](#opt-vim.ui.breadcrumbs.lualine.winbar.alwaysRender) to be conform to the
-    new format.
-
-- Add [basedpyright](https://github.com/detachhead/basedpyright) as a Python LSP
-  server and make it default.
-
-- Add [python-lsp-server](https://github.com/python-lsp/python-lsp-server) as an
-  additional Python LSP server.
-
-- Add [](#opt-vim.options) to set `vim.o` values in in your nvf configuration
-  without using additional Lua. See option documentation for more details.
-
-- Add [](#opt-vim.dashboard.dashboard-nvim.setupOpts) to allow user
-  configuration for [dashboard.nvim](https://github.com/nvimdev/dashboard-nvim)
-
-[ppenguin](https://github.com/ppenguin):
-
-- Telescope:
-  - Fixed `project-nvim` command and keybinding
-  - Added default ikeybind/command for `Telescope resume` (`<leader>fr`)
-
-[Soliprem](https://github.com/Soliprem)
-
-- 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

flake.lock

@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -36,13 +52,28 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "mnw": {
       "locked": {
-        "lastModified": 1726188505,
+        "lastModified": 1724456641,
-        "narHash": "sha256-3dkxJo6y/aKfwkAg6YnpdiQAoZKgHhWHz7ilGJHCoVU=",
+        "narHash": "sha256-SMgnviF6ofBPbyV3+rljPGcX0Hn9HBOhgXE10Cyjaic=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "ea00b3d2162d85dd085a6ba6d49aa2a186e588e7",
+        "rev": "c261925dbbf02f523af0e8add844df64fddf0359",
         "type": "github"
       },
       "original": {
@@ -98,11 +129,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726871744,
+        "lastModified": 1722141560,
-        "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
+        "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
+        "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
         "type": "github"
       },
       "original": {
@@ -140,6 +171,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1702350026,
+        "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9463103069725474698139ab10f17a9d125da859",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nmd": {
       "flake": false,
       "locked": {
@@ -524,22 +571,6 @@
         "type": "github"
       }
     },
-    "plugin-fastaction-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1721396662,
-        "narHash": "sha256-L7na78FsE+QHlEwxMpiwQcoOPhtmrknvdTZfzUoDANI=",
-        "owner": "Chaitanyabsprip",
-        "repo": "fastaction.nvim",
-        "rev": "2384dea7ba81d2709d0bee0e4bc7a8831ff13a9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Chaitanyabsprip",
-        "repo": "fastaction.nvim",
-        "type": "github"
-      }
-    },
     "plugin-fidget-nvim": {
       "flake": false,
       "locked": {
@@ -815,11 +846,11 @@
     "plugin-lz-n": {
       "flake": false,
       "locked": {
-        "lastModified": 1727574854,
+        "lastModified": 1724402266,
-        "narHash": "sha256-qDWNleR2NHFkiEKE/+LNVOBRwEeskMC4dWTl5BTyZuE=",
+        "narHash": "sha256-JLCJPiRUt0RFDR/WYZMjkm/keaDo+QNwTII2GyiDAhk=",
         "owner": "nvim-neorocks",
         "repo": "lz.n",
-        "rev": "470173e3cbef763c6d1b918f3f129b67db75e1f8",
+        "rev": "fc67ba432830f499c0afadd35f2942c8620aaf1a",
         "type": "github"
       },
       "original": {
@@ -895,11 +926,11 @@
     "plugin-neo-tree-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1726542367,
+        "lastModified": 1713050882,
-        "narHash": "sha256-Lqt0KJNT9HmpJwZoWChYeVBrDWhscRe8COqVCwgcTwk=",
+        "narHash": "sha256-cZwOVpdMT0NCtp6Ha592QA2RzKVS6LhXXcjfDBCQ+0k=",
         "owner": "nvim-neo-tree",
         "repo": "neo-tree.nvim",
-        "rev": "a77af2e764c5ed4038d27d1c463fa49cd4794e07",
+        "rev": "22e566aeb075c94f670f34077e05ba95190dfb4a",
         "type": "github"
       },
       "original": {
@@ -1053,6 +1084,22 @@
         "type": "github"
       }
     },
+    "plugin-nvim-code-action-menu": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1702287297,
+        "narHash": "sha256-pY+aP9iBuJhvDZzVEsOHZmnfaq3vUP7TfKEEQrj+Mo8=",
+        "owner": "weilbith",
+        "repo": "nvim-code-action-menu",
+        "rev": "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "weilbith",
+        "repo": "nvim-code-action-menu",
+        "type": "github"
+      }
+    },
     "plugin-nvim-colorizer-lua": {
       "flake": false,
       "locked": {
@@ -1168,11 +1215,11 @@
     "plugin-nvim-lspconfig": {
       "flake": false,
       "locked": {
-        "lastModified": 1727085470,
+        "lastModified": 1716498901,
-        "narHash": "sha256-IPpUZEMIL7+4mmqQLy9JeT0cW15/SH3Hx8kyksVcqC0=",
+        "narHash": "sha256-PMMqPDnq4Q8gWeKQ2WPE+pOf1R1G61wJ+bAWkHpQlzE=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "dd329912c8d446240584a2dbcd3802af3a19105a",
+        "rev": "b972e7154bc94ab4ecdbb38c8edbccac36f83996",
         "type": "github"
       },
       "original": {
@@ -1312,11 +1359,11 @@
     "plugin-nvim-treesitter-context": {
       "flake": false,
       "locked": {
-        "lastModified": 1726947805,
+        "lastModified": 1716388265,
-        "narHash": "sha256-5oN/vyhSqDqjLEzECj01A7A+Yq7U1H1HXLbzkC1Ljqw=",
+        "narHash": "sha256-EY5Si6t7LXcxOP3ubGAAMd3lgbeaCOCIybSKi1Ucx98=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter-context",
-        "rev": "3d5390c49e3f8fe457b376df2a49aa39d75b7911",
+        "rev": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683",
         "type": "github"
       },
       "original": {
@@ -1405,22 +1452,6 @@
         "type": "github"
       }
     },
-    "plugin-otter-nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1724585935,
-        "narHash": "sha256-euHwoK2WHLF/hrjLY2P4yGrIbYyBN38FL3q4CKNZmLY=",
-        "owner": "jmbuhr",
-        "repo": "otter.nvim",
-        "rev": "ca9ce67d0399380b659923381b58d174344c9ee7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jmbuhr",
-        "repo": "otter.nvim",
-        "type": "github"
-      }
-    },
     "plugin-oxocarbon": {
       "flake": false,
       "locked": {
@@ -1856,7 +1887,6 @@
         "plugin-dracula": "plugin-dracula",
         "plugin-dressing-nvim": "plugin-dressing-nvim",
         "plugin-elixir-tools": "plugin-elixir-tools",
-        "plugin-fastaction-nvim": "plugin-fastaction-nvim",
         "plugin-fidget-nvim": "plugin-fidget-nvim",
         "plugin-flutter-tools": "plugin-flutter-tools",
         "plugin-gesture-nvim": "plugin-gesture-nvim",
@@ -1889,6 +1919,7 @@
         "plugin-nvim-autopairs": "plugin-nvim-autopairs",
         "plugin-nvim-bufferline-lua": "plugin-nvim-bufferline-lua",
         "plugin-nvim-cmp": "plugin-nvim-cmp",
+        "plugin-nvim-code-action-menu": "plugin-nvim-code-action-menu",
         "plugin-nvim-colorizer-lua": "plugin-nvim-colorizer-lua",
         "plugin-nvim-cursorline": "plugin-nvim-cursorline",
         "plugin-nvim-dap": "plugin-nvim-dap",
@@ -1911,7 +1942,6 @@
         "plugin-obsidian-nvim": "plugin-obsidian-nvim",
         "plugin-onedark": "plugin-onedark",
         "plugin-orgmode-nvim": "plugin-orgmode-nvim",
-        "plugin-otter-nvim": "plugin-otter-nvim",
         "plugin-oxocarbon": "plugin-oxocarbon",
         "plugin-plenary-nvim": "plugin-plenary-nvim",
         "plugin-project-nvim": "plugin-project-nvim",
@@ -1937,7 +1967,8 @@
         "plugin-vim-vsnip": "plugin-vim-vsnip",
         "plugin-which-key": "plugin-which-key",
         "rnix-lsp": "rnix-lsp",
-        "systems": "systems_2"
+        "systems": "systems_2",
+        "zig": "zig"
       }
     },
     "rust-overlay": {
@@ -2009,6 +2040,26 @@
         "repo": "flake-utils",
         "type": "github"
       }
+    },
+    "zig": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1716725305,
+        "narHash": "sha256-LIz08gALt2wlutGXAEhNroEoIuPV5ePQB8LI4WzXcy8=",
+        "owner": "mitchellh",
+        "repo": "zig-overlay",
+        "rev": "93b02a697561ecd438cfa5779727b5a1c300cb4c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mitchellh",
+        "repo": "zig-overlay",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -13,8 +13,8 @@
       inherit inputs;
       specialArgs = {inherit lib;};
     } {
-      # Allow users to bring their own systems.
+      # provide overridable systems
-      # «https://github.com/nix-systems/nix-systems»
+      # https://github.com/nix-systems/nix-systems
       systems = import inputs.systems;
       imports = [
         ./flake/apps.nix
@@ -62,6 +62,7 @@
         pkgs,
         ...
       }: {
+        formatter = pkgs.alejandra;
         devShells = {
           default = self'.devShells.lsp;
           nvim-nix = pkgs.mkShell {packages = [config.packages.nix];};
@@ -69,21 +70,6 @@
             packages = with pkgs; [nil statix deadnix alejandra];
           };
         };
-
-        # Provide the default formatter. `nix fmt` in project root
-        # will format available files with the correct formatter.
-        # P.S: Please do not format with nixfmt! It messes with many
-        # syntax elements and results in unreadable code.
-        formatter = pkgs.alejandra;
-
-        # Check if codebase is properly formatted.
-        # This can be initiated with `nix build .#checks.<system>.nix-fmt`
-        # or with `nix flake check`
-        checks = {
-          nix-fmt = pkgs.runCommand "nix-fmt-check" {nativeBuildInputs = [pkgs.alejandra];} ''
-            alejandra --check ${self} < /dev/null | tee $out
-          '';
-        };
       };
     };
 
@@ -104,7 +90,10 @@
       flake = false;
     };
 
-    # Language servers (use master instead of nixpkgs)
+    # TODO: get zig from the zig overlay instead of nixpkgs
+    zig.url = "github:mitchellh/zig-overlay";
+
+    # Langauge server (use master instead of nixpkgs)
     rnix-lsp.url = "github:nix-community/rnix-lsp";
     nil = {
       url = "github:oxalica/nil";
@@ -155,8 +144,8 @@
       flake = false;
     };
 
-    plugin-fastaction-nvim = {
+    plugin-nvim-code-action-menu = {
-      url = "github:Chaitanyabsprip/fastaction.nvim";
+      url = "github:weilbith/nvim-code-action-menu";
       flake = false;
     };
 
@@ -181,12 +170,7 @@
       flake = false;
     };
 
-    plugin-otter-nvim = {
+    # language support
-      url = "github:jmbuhr/otter.nvim";
-      flake = false;
-    };
-
-    # Language support
     plugin-sqls-nvim = {
       url = "github:nanotee/sqls.nvim";
       flake = false;

flake/modules/home-manager.nix

@@ -67,6 +67,7 @@ in {
             formatOnSave = true;
             lightbulb.enable = true;
             lspsaga.enable = false;
+            nvimCodeActionMenu.enable = true;
             trouble.enable = true;
             lspSignature.enable = true;
             rust.enable = false;

flake/modules/nixos.nix

@@ -67,6 +67,7 @@ in {
             formatOnSave = true;
             lightbulb.enable = true;
             lspsaga.enable = false;
+            nvimCodeActionMenu.enable = true;
             trouble.enable = true;
             lspSignature.enable = true;
             rust.enable = false;

flake/packages.nix

@@ -8,7 +8,6 @@
     docs = import ../docs {inherit pkgs inputs lib;};
   in {
     packages = {
-      inherit (docs.manual) htmlOpenTool;
       # Documentation
       docs = docs.manual.html;
       docs-html = docs.manual.html;

lib/configuration.nix

@@ -0,0 +1,18 @@
+{
+  inputs,
+  lib,
+}: let
+  modulesWithInputs = import ../modules inputs;
+in
+  {
+    modules ? [],
+    pkgs,
+    check ? true,
+    extraSpecialArgs ? {},
+    extraModules ? [],
+    ...
+  }:
+    modulesWithInputs {
+      inherit pkgs lib check extraSpecialArgs extraModules;
+      configuration.imports = modules;
+    }

lib/default.nix

@@ -11,5 +11,5 @@
   languages = import ./languages.nix {inherit lib;};
   lists = import ./lists.nix {inherit lib;};
   lua = import ./lua.nix {inherit lib;};
-  neovimConfiguration = import ../modules {inherit inputs lib;};
+  neovimConfiguration = import ./configuration.nix {inherit inputs lib;};
 }

lib/types/default.nix

@@ -9,7 +9,7 @@
   typesCustom = import ./custom.nix {inherit lib;};
 in {
   inherit (typesDag) dagOf;
-  inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType borderType;
+  inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType;
   inherit (typesLanguage) diagnostics mkGrammarOption;
   inherit (typesCustom) anythingConcatLists char;
 }

lib/types/plugins.nix

@@ -6,7 +6,7 @@
   inherit (lib.options) mkOption;
   inherit (lib.attrsets) attrNames mapAttrs' filterAttrs nameValuePair;
   inherit (lib.strings) hasPrefix removePrefix;
-  inherit (lib.types) submodule either package enum str lines attrsOf anything listOf nullOr oneOf bool int;
+  inherit (lib.types) submodule either package enum str lines attrsOf anything listOf nullOr;
 
   # Get the names of all flake inputs that start with the given prefix.
   fromInputs = {
@@ -51,197 +51,9 @@
       };
     };
   };
-
-  borderPresets = ["none" "single" "double" "rounded" "solid" "shadow"];
-  luaInline = lib.mkOptionType {
-    name = "luaInline";
-    check = x: lib.nvim.lua.isLuaInline x;
-  };
-
-  lznKeysSpec = submodule {
-    options = {
-      desc = mkOption {
-        description = "Description of the key map";
-        type = nullOr str;
-        default = null;
-      };
-
-      noremap = mkOption {
-        description = "TBD";
-        type = bool;
-        default = false;
-      };
-
-      expr = mkOption {
-        description = "TBD";
-        type = bool;
-        default = false;
-      };
-
-      nowait = mkOption {
-        description = "TBD";
-        type = bool;
-        default = false;
-      };
-
-      ft = mkOption {
-        description = "TBD";
-        type = nullOr (listOf str);
-        default = null;
-      };
-
-      key = mkOption {
-        type = str;
-        description = "Key to bind to";
-      };
-
-      action = mkOption {
-        type = nullOr str;
-        default = null;
-        description = "Action to trigger.";
-      };
-
-      lua = mkOption {
-        type = bool;
-        default = false;
-        description = "If true the action is treated as a lua function instead of a vim command.";
-      };
-
-      mode = mkOption {
-        description = "Modes to bind in";
-        type = listOf str;
-        default = ["n" "x" "s" "o"];
-      };
-    };
-  };
-
-  lznPluginTableType = attrsOf lznPluginType;
-  lznPluginType = submodule {
-    options = {
-      ## Should probably infer from the actual plugin somehow
-      ## In general this is the name passed to packadd, so the dir name of the plugin
-      # name = mkOption {
-      #   type=  str;
-      # }
-
-      # Non-lz.n options
-
-      package = mkOption {
-        type = pluginType;
-        description = "Plugin package";
-      };
-
-      setupModule = mkOption {
-        type = nullOr str;
-        description = "Lua module to run setup function on.";
-        default = null;
-      };
-
-      setupOpts = mkOption {
-        type = submodule {freeformType = attrsOf anything;};
-        description = "Options to pass to the setup function";
-        default = {};
-      };
-
-      # lz.n options
-
-      enabled = mkOption {
-        type = nullOr (either bool str);
-        description = "When false, or if the lua function returns false, this plugin will not be included in the spec";
-        default = null;
-      };
-
-      beforeAll = mkOption {
-        type = nullOr str;
-        description = "Lua code to run before any plugins are loaded. This will be wrapped in a function.";
-        default = null;
-      };
-
-      before = mkOption {
-        type = nullOr str;
-        description = "Lua code to run before plugin is loaded. This will be wrapped in a function.";
-        default = null;
-      };
-
-      after = mkOption {
-        type = nullOr str;
-        description = "Lua code to run after plugin is loaded. This will be wrapped in a function.";
-        default = null;
-      };
-
-      event = mkOption {
-        description = "Lazy-load on event";
-        default = null;
-        type = let
-          event = submodule {
-            options = {
-              event = mkOption {
-                type = nullOr (either str (listOf str));
-                description = "Exact event name";
-                example = "BufEnter";
-              };
-              pattern = mkOption {
-                type = nullOr (either str (listOf str));
-                description = "Event pattern";
-                example = "BufEnter *.lua";
-              };
-            };
-          };
-        in
-          nullOr (oneOf [str (listOf str) event]);
-      };
-
-      cmd = mkOption {
-        description = "Lazy-load on command";
-        default = null;
-        type = nullOr (either str (listOf str));
-      };
-
-      ft = mkOption {
-        description = "Lazy-load on filetype";
-        default = null;
-        type = nullOr (either str (listOf str));
-      };
-
-      keys = mkOption {
-        description = "Lazy-load on key mapping";
-        default = null;
-        type = nullOr (oneOf [str (listOf lznKeysSpec) (listOf str)]);
-        example = ''
-          keys = [
-            {lhs = "<leader>s"; rhs = ":NvimTreeToggle<cr>"; desc = "Toggle NvimTree"}
-          ]
-        '';
-      };
-
-      colorscheme = mkOption {
-        description = "Lazy-load on colorscheme.";
-        type = nullOr (either str (listOf str));
-        default = null;
-      };
-
-      priority = mkOption {
-        type = nullOr int;
-        description = "Only useful for stat plugins (not lazy-loaded) to force loading certain plugins first.";
-        default = null;
-      };
-
-      load = mkOption {
-        type = nullOr str;
-        default = null;
-        description = ''
-          Lua code to override the `vim.g.lz_n.load()` function for a single plugin.
-
-          This will be wrapped in a function
-        '';
-      };
-    };
-  };
 in {
   inherit extraPluginType fromInputs pluginType;
 
-  borderType = either (enum borderPresets) (listOf (either str (listOf str)));
-
   pluginsOpt = {
     description,
     example,

modules/default.nix

@@ -1,13 +1,10 @@
-{
+inputs: {
-  inputs,
+  configuration,
-  lib,
-}: {
   pkgs,
+  lib,
+  check ? true,
   extraSpecialArgs ? {},
-  modules ? [],
-  # deprecated
   extraModules ? [],
-  configuration ? {},
 }: let
   inherit (pkgs) vimPlugins;
   inherit (lib.strings) isString toString;
@@ -16,25 +13,13 @@
   # import modules.nix with `check`, `pkgs` and `lib` as arguments
   # check can be disabled while calling this file is called
   # to avoid checking in all modules
-  nvimModules = import ./modules.nix {inherit pkgs lib;};
+  nvimModules = import ./modules.nix {inherit pkgs check lib;};
 
   # evaluate the extended library with the modules
   # optionally with any additional modules passed by the user
   module = lib.evalModules {
     specialArgs = extraSpecialArgs // {modulesPath = toString ./.;};
-    modules = concatLists [
+    modules = concatLists [[configuration] nvimModules extraModules];
-      nvimModules
-      modules
-      (lib.optional (configuration != {}) (lib.warn ''
-          nvf: passing 'configuration' to lib.neovimConfiguration is deprecated.
-        ''
-        configuration))
-
-      (lib.optionals (extraModules != []) (lib.warn ''
-          nvf: passing 'extraModules' to lib.neovimConfiguration is deprecated, use 'modules' instead.
-        ''
-        extraModules))
-    ];
   };
 
   # alias to the internal configuration

modules/extra/deprecations.nix

@@ -7,12 +7,5 @@ in {
       Tidalcycles language support has been removed as of 2024-06-06 as it was long unmaintained. If
       you depended on this functionality, please open an issue.
     '')
-
-    # 2024-07-20
-    (mkRemovedOptionModule ["vim" "lsp" "nvimCodeActionMenu"] ''
-      nvimCodeActionMenu has been deprecated and removed upstream. As of 0.7, fastaction will be
-      available under `vim.ui.fastaction` as a replacement. Simply remove everything under
-      `vim.lsp.nvimCodeActionMenu`, and set `vim.ui.fastaction.enable` to `true`.
-    '')
   ];
 }

modules/modules.nix

@@ -1,10 +1,11 @@
 {
+  check ? true,
   pkgs,
   lib,
 }: let
   inherit (lib.modules) mkDefault;
   inherit (lib.lists) concatLists;
-  allModules = let
+
   # The core neovim modules.
   # Contains configuration for core neovim features
   # such as spellchecking, mappings, and the init script (init.vim).
@@ -49,8 +50,8 @@
   wrapper = map (p: ./wrapper + "/${p}") [
     "build"
     "rc"
-      "warnings"
     "lazy"
+    "warnings"
   ];
 
   # Extra modules, such as deprecation warnings
@@ -58,16 +59,20 @@
   extra = map (p: ./extra + "/${p}") [
     "deprecations.nix"
   ];
-  in
+
-    concatLists [neovim plugins wrapper extra];
+  allModules = concatLists [neovim plugins wrapper extra];
-in
+
-  allModules
+  pkgsModule = {config, ...}: {
-  ++ [
+    config = {
-    {
+      _module = {
-      _module.args = {
+        inherit check;
+        args = {
           baseModules = allModules;
           pkgsPath = mkDefault pkgs.path;
           pkgs = mkDefault pkgs;
         };
-    }
+      };
-  ]
+    };
+  };
+in
+  allModules ++ [pkgsModule]

modules/neovim/init/basic.nix

@@ -3,13 +3,11 @@
   lib,
   ...
 }: let
-  inherit (lib.options) mkOption mkEnableOption literalExpression literalMD;
+  inherit (lib.options) mkOption literalExpression;
   inherit (lib.strings) optionalString;
-  inherit (lib.types) enum bool str int either;
+  inherit (lib.types) enum bool str int;
-  inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.dag) entryAfter;
   inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.types) luaInline;
 
   cfg = config.vim;
 in {
@@ -160,29 +158,9 @@ in {
       default = "sensitive";
       description = "Set the case sensitivity of search";
     };
-
-    undoFile = {
-      enable = mkEnableOption "undofile for persistent undo behaviour";
-      path = mkOption {
-        type = either str luaInline;
-        default = mkLuaInline "vim.fn.stdpath('state') .. '/undo'";
-        defaultText = literalMD ''
-          ```nix
-          mkLuaInline "vim.fn.stdpath('state') .. '/undo'"
-          ```
-        '';
-        example = literalMD ''
-          ```nix
-          mkLuaInline "os.getenv('XDG_DATA_HOME') .. '/nvf/undo'"
-          ```
-        '';
-        description = "Path to the directory in which undo history will be stored";
-      };
-    };
   };
 
-  config = {
+  config.vim.luaConfigRC.basic = entryAfter ["globalsScript"] ''
-    vim.luaConfigRC.basic = entryAfter ["globalsScript"] ''
     -- Settings that are set for everything
     vim.o.encoding = "utf-8"
     vim.o.hidden = true
@@ -200,11 +178,6 @@ in {
     vim.g.mapleader = ${toLuaObject cfg.leaderKey}
     vim.g.maplocalleader = ${toLuaObject cfg.leaderKey}
 
-      ${optionalString cfg.undoFile.enable ''
-        vim.o.undofile = true
-        vim.o.undodir = ${toLuaObject cfg.undoFile.path}
-      ''}
-
     ${optionalString cfg.splitBelow ''
       vim.o.splitbelow = true
     ''}
@@ -293,5 +266,4 @@ in {
       vim.o.ignorecase = false
     ''}
   '';
-  };
 }

modules/neovim/mappings/config.nix

@@ -3,32 +3,75 @@
   lib,
   ...
 }: let
-  inherit (lib.modules) mkIf;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.trivial) pipe;
+  inherit (lib.attrsets) mapAttrsToList;
+  inherit (lib.lists) flatten;
+
+  legacyMapModes = {
+    normal = ["n"];
+    insert = ["i"];
+    select = ["s"];
+    visual = ["v"];
+    terminal = ["t"];
+    normalVisualOp = ["n" "v" "o"];
+    visualOnly = ["n" "x"];
+    operator = ["o"];
+    insertCommand = ["i" "c"];
+    lang = ["l"];
+    command = ["c"];
+  };
 
   cfg = config.vim;
 in {
   config = {
-    vim.maps = mkIf cfg.disableArrows {
+    vim.keymaps = mkMerge [
-      "<up>" = {
+      (
+        mkIf cfg.disableArrows [
+          {
+            key = "<up>";
             mode = ["n" "i"];
             action = "<nop>";
             noremap = false;
-      };
+          }
-      "<down>" = {
+          {
+            key = "<down>";
             mode = ["n" "i"];
             action = "<nop>";
             noremap = false;
-      };
+          }
-      "<left>" = {
+          {
+            key = "<left>";
             mode = ["n" "i"];
             action = "<nop>";
             noremap = false;
-      };
+          }
-      "<right>" = {
+          {
+            key = "<right>";
             mode = ["n" "i"];
             action = "<nop>";
             noremap = false;
-      };
+          }
-    };
+        ]
+      )
+      (
+        pipe cfg.maps
+        [
+          (mapAttrsToList (
+            oldMode: keybinds:
+              mapAttrsToList (
+                key: bind:
+                  bind
+                  // {
+                    inherit key;
+                    mode = legacyMapModes.${oldMode};
+                  }
+              )
+              keybinds
+          ))
+          flatten
+        ]
+      )
+    ];
   };
 }

modules/neovim/mappings/options.nix

@@ -31,6 +31,12 @@
     options =
       mapConfigOptions
       // {
+        key = mkOption {
+          type = str;
+          description = ''
+            Key that triggers this keybind.
+          '';
+        };
         mode = mkOption {
           type = either str (listOf str);
           description = ''
@@ -38,27 +44,47 @@
 
             See `:help map-modes` for a list of modes.
           '';
+          example = ''"nvc" for normal, visual and command mode'';
         };
       };
   };
 
   # legacy stuff
-  mapOption = submodule {
+  legacyMapOption = submodule {
     options = mapConfigOptions;
   };
 
   mapOptions = mode:
     mkOption {
       description = "Mappings for ${mode} mode";
-      type = attrsOf mapOption;
+      type = attrsOf legacyMapOption;
       default = {};
     };
 in {
   options.vim = {
-    maps = mkOption {
+    keymaps = mkOption {
-      type = submodule {
+      type = listOf mapType;
-        freeformType = attrsOf mapType;
+      description = "Custom keybindings.";
-        options = {
+      example = ''
+        vim.keymaps = [
+          {
+            key = "<leader>m";
+            mode = "n";
+            silent = true;
+            action = ":make<CR>";
+          }
+          {
+            key = "<leader>l";
+            mode = ["n" "x"];
+            silent = true;
+            action = "<cmd>cnext<CR>";
+          }
+        ];
+      '';
+      default = {};
+    };
+
+    maps = {
       normal = mapOptions "normal";
       insert = mapOptions "insert";
       select = mapOptions "select";
@@ -73,17 +99,4 @@ in {
       command = mapOptions "command-line";
     };
   };
-      default = {};
-      description = "Custom keybindings.";
-      example = ''
-        maps = {
-          "<leader>m" = {
-            mode = "n";
-            silent = true;
-            action = "<cmd>make<CR>";
-          }; # Same as nnoremap <leader>m <silent> <cmd>make<CR>
-        };
-      '';
-    };
-  };
 }

modules/plugins/dashboard/dashboard-nvim/config.nix

@@ -5,17 +5,16 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.dashboard.dashboard-nvim;
 in {
   config = mkIf cfg.enable {
-    vim = {
+    vim.startPlugins = [
-      startPlugins = ["dashboard-nvim"];
+      "dashboard-nvim"
+    ];
 
-      pluginRC.dashboard-nvim = entryAnywhere ''
+    vim.pluginRC.dashboard-nvim = entryAnywhere ''
-        require("dashboard").setup(${toLuaObject cfg.setupOpts})
+      require("dashboard").setup{}
     '';
   };
-  };
 }

modules/plugins/dashboard/dashboard-nvim/dashboard-nvim.nix

@@ -1,9 +1,7 @@
 {lib, ...}: let
   inherit (lib.options) mkEnableOption;
-  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.dashboard.dashboard-nvim = {
     enable = mkEnableOption "Fancy and Blazing Fast start screen plugin of neovim [dashboard.nvim]";
-    setupOpts = mkPluginSetupOption "dashboard.nvim" {};
   };
 }

modules/plugins/languages/clang.nix

@@ -57,7 +57,7 @@
       dapConfig = ''
         dap.adapters.lldb = {
           type = 'executable',
-          command = '${cfg.dap.package}/bin/lldb-dap',
+          command = '${cfg.dap.package}/bin/lldb-vscode',
           name = 'lldb'
         }
         dap.configurations.cpp = {

modules/plugins/languages/default.nix

@@ -17,7 +17,6 @@ in {
     ./ocaml.nix
     ./php.nix
     ./python.nix
-    ./r.nix
     ./rust.nix
     ./sql.nix
     ./svelte.nix

modules/plugins/languages/python.nix

@@ -14,7 +14,7 @@
 
   cfg = config.vim.languages.python;
 
-  defaultServer = "basedpyright";
+  defaultServer = "pyright";
   servers = {
     pyright = {
       package = pkgs.pyright;
@@ -30,36 +30,6 @@
         }
       '';
     };
-
-    basedpyright = {
-      package = pkgs.basedpyright;
-      lspConfig = ''
-        lspconfig.basedpyright.setup{
-          capabilities = capabilities;
-          on_attach = default_on_attach;
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/basedpyright-langserver", "--stdio"}''
-        }
-        }
-      '';
-    };
-
-    python-lsp-server = {
-      package = pkgs.python-lsp-server;
-      lspConfig = ''
-        lspconfig.pylsp.setup{
-          capabilities = capabilities;
-          on_attach = default_on_attach;
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/pylsp"}''
-        }
-        }
-      '';
-    };
   };
 
   defaultFormat = "black";
@@ -91,12 +61,11 @@
     black-and-isort = {
       package = pkgs.writeShellApplication {
         name = "black";
-        runtimeInputs = [pkgs.black pkgs.isort];
         text = ''
           black --quiet - "$@" | isort --profile black -
         '';
+        runtimeInputs = [pkgs.black pkgs.isort];
       };
-
       nullConfig = ''
         table.insert(
           ls_sources,

modules/plugins/languages/r.nix

@@ -1,78 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (builtins) attrNames;
-  inherit (lib.options) mkEnableOption mkOption literalExpression;
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.lists) isList;
-  inherit (lib.types) enum either listOf package str;
-  inherit (lib.nvim.lua) expToLua;
-  inherit (lib.nvim.types) mkGrammarOption;
-
-  cfg = config.vim.languages.r;
-
-  r-with-languageserver = pkgs.rWrapper.override {
-    packages = with pkgs.rPackages; [languageserver];
-  };
-
-  defaultServer = "r_language_server";
-  servers = {
-    r_language_server = {
-      package = pkgs.writeShellScriptBin "r_lsp" ''
-        ${r-with-languageserver}/bin/R --slave -e "languageserver::run()"
-      '';
-      lspConfig = ''
-        lspconfig.r_language_server.setup{
-          capabilities = capabilities;
-          on_attach = default_on_attach;
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${lib.getExe cfg.lsp.package}"}''
-        }
-        }
-      '';
-    };
-  };
-in {
-  options.vim.languages.r = {
-    enable = mkEnableOption "R language support";
-
-    treesitter = {
-      enable = mkEnableOption "R treesitter" // {default = config.vim.languages.enableTreesitter;};
-      package = mkGrammarOption pkgs "r";
-    };
-
-    lsp = {
-      enable = mkEnableOption "R LSP support" // {default = config.vim.languages.enableLSP;};
-
-      server = mkOption {
-        description = "R LSP server to use";
-        type = enum (attrNames servers);
-        default = defaultServer;
-      };
-
-      package = mkOption {
-        description = "R LSP server package, or the command to run as a list of strings";
-        example = literalExpression "[ (lib.getExe pkgs.jdt-language-server) \"-data\" \"~/.cache/jdtls/workspace\" ]";
-        type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
-      };
-    };
-  };
-
-  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.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.r-lsp = servers.${cfg.lsp.server}.lspConfig;
-    })
-  ]);
-}

modules/plugins/languages/rust.nix

@@ -173,7 +173,7 @@ in {
             dap = {
               adapter = {
                 type = "executable",
-                command = "${cfg.dap.package}/bin/lldb-dap",
+                command = "${cfg.dap.package}/bin/lldb-vscode",
                 name = "rustacean_lldb",
               },
             },

modules/plugins/languages/ts.nix

@@ -17,12 +17,12 @@
 
   cfg = config.vim.languages.ts;
 
-  defaultServer = "ts_ls";
+  defaultServer = "tsserver";
   servers = {
-    ts_ls = {
+    tsserver = {
       package = pkgs.typescript-language-server;
       lspConfig = ''
-        lspconfig.ts_ls.setup {
+        lspconfig.tsserver.setup {
           capabilities = capabilities;
           on_attach = attach_keymaps,
           cmd = ${
@@ -49,24 +49,6 @@
         }
       '';
     };
-
-    # Here for backwards compatibility. Still consider tsserver a valid
-    # configuration in the enum, but assert if it's set to *properly*
-    # redirect the user to the correct server.
-    tsserver = {
-      package = pkgs.typescript-language-server;
-      lspConfig = ''
-        lspconfig.ts_ls.setup {
-          capabilities = capabilities;
-          on_attach = attach_keymaps,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/typescript-language-server", "--stdio"}''
-        }
-        }
-      '';
-    };
   };
 
   # TODO: specify packages
@@ -83,7 +65,6 @@
         )
       '';
     };
-
     prettierd = {
       package = pkgs.prettierd;
       nullConfig = ''
@@ -113,7 +94,6 @@
     };
   };
 in {
-  _file = ./ts.nix;
   options.vim.languages.ts = {
     enable = mkEnableOption "Typescript/Javascript language support";
 
@@ -210,32 +190,11 @@ in {
       };
     })
 
-    # Extensions
     (mkIf cfg.extensions."ts-error-translator".enable {
       vim.startPlugins = ["ts-error-translator"];
       vim.pluginRC.ts-error-translator = entryAnywhere ''
         require("ts-error-translator").setup(${toLuaObject cfg.extensions.ts-error-translator.setupOpts})
       '';
     })
-
-    # Warn the user if they have set the default server name to tsserver to match upstream (us)
-    # The name "tsserver" has been deprecated in lspconfig, and now should be called ts_ls. This
-    # is a purely cosmetic change, but emits a warning if not accounted for.
-    {
-      assertions = [
-        {
-          assertion = cfg.lsp.enable -> cfg.lsp.server != "tsserver";
-          message = ''
-            As of a recent lspconfig update, the `tsserver` configuration has been renamed
-            to `ts_ls` to match upstream behaviour of `lspconfig`, and the name `tsserver`
-            is no longer considered valid by nvf. Please set `vim.languages.ts.lsp.server`
-            to `"ts_ls"` instead of to `${cfg.lsp.server}`
-
-            Please see <https://github.com/neovim/nvim-lspconfig/pull/3232> for more details
-            about this change.
-          '';
-        }
-      ];
-    }
   ]);
 }

modules/plugins/lsp/default.nix

@@ -10,10 +10,10 @@
 
     # lsp plugins
     ./lspsaga
+    ./nvim-code-action-menu
     ./trouble
     ./lsp-signature
     ./lightbulb
-    ./otter
     ./lspkind
     ./lsplines
     ./nvim-docs-view

modules/plugins/lsp/lspconfig/config.nix

@@ -7,7 +7,6 @@
   inherit (lib.strings) optionalString;
   inherit (lib.attrsets) mapAttrs;
   inherit (lib.nvim.dag) entryAfter;
-  inherit (lib.nvim.lua) toLuaObject;
 
   cfg = config.vim.lsp;
 in {
@@ -23,7 +22,7 @@ in {
 
           ${
             optionalString config.vim.ui.borders.enable ''
-              require('lspconfig.ui.windows').default_options.border = ${toLuaObject config.vim.ui.borders.globalStyle}
+              require('lspconfig.ui.windows').default_options.border = '${config.vim.ui.borders.globalStyle}'
             ''
           }
         '';

modules/plugins/lsp/lspsaga/config.nix

@@ -36,7 +36,7 @@ in {
           (mkSetLuaBinding mappings.nextDiagnostic "require('lspsaga.diagnostic').navigate('next')")
           (mkSetLuaBinding mappings.previousDiagnostic "require('lspsaga.diagnostic').navigate('prev')")
 
-          (mkSetLuaBinding mappings.codeAction "require('lspsaga.codeaction').code_action")
+          (mkIf (!cfg.nvimCodeActionMenu.enable) (mkSetLuaBinding mappings.codeAction "require('lspsaga.codeaction').code_action"))
           (mkIf (!cfg.lspSignature.enable) (mkSetLuaBinding mappings.signatureHelp "require('lspsaga.signaturehelp').signature_help"))
         ];
       };

modules/plugins/lsp/nvim-code-action-menu/config.nix

@@ -0,0 +1,37 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.binds) mkSetBinding addDescriptionsToMappings pushDownDefault;
+
+  cfg = config.vim.lsp;
+
+  self = import ./nvim-code-action-menu.nix {inherit lib;};
+  mappingDefinitions = self.options.vim.lsp.nvimCodeActionMenu.mappings;
+  mappings = addDescriptionsToMappings cfg.nvimCodeActionMenu.mappings mappingDefinitions;
+in {
+  config = mkIf (cfg.enable && cfg.nvimCodeActionMenu.enable) {
+    vim = {
+      startPlugins = ["nvim-code-action-menu"];
+
+      maps.normal = mkSetBinding mappings.open ":CodeActionMenu<CR>";
+
+      binds.whichKey.register = pushDownDefault {
+        "<leader>c" = "+CodeAction";
+      };
+
+      pluginRC.code-action-menu = entryAnywhere ''
+        -- border configuration
+        vim.g.code_action_menu_window_border = '${config.vim.ui.borders.plugins.code-action-menu.style}'
+
+        -- show individual sections of the code action menu
+        ${lib.optionalString cfg.nvimCodeActionMenu.show.details "vim.g.code_action_menu_show_details = true"}
+        ${lib.optionalString cfg.nvimCodeActionMenu.show.diff "vim.g.code_action_menu_show_diff = true"}
+        ${lib.optionalString cfg.nvimCodeActionMenu.show.actionKind "vim.g.code_action_menu_show_action_kind = true"}
+      '';
+    };
+  };
+}

modules/plugins/lsp/nvim-code-action-menu/default.nix

@@ -1,6 +1,6 @@
 {
   imports = [
-    ./fastaction-nvim.nix
+    ./nvim-code-action-menu.nix
     ./config.nix
   ];
 }

modules/plugins/lsp/nvim-code-action-menu/nvim-code-action-menu.nix

@@ -0,0 +1,20 @@
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.nvim.binds) mkMappingOption;
+in {
+  options.vim.lsp = {
+    nvimCodeActionMenu = {
+      enable = mkEnableOption "nvim code action menu";
+
+      show = {
+        details = mkEnableOption "Show details" // {default = true;};
+        diff = mkEnableOption "Show diff" // {default = true;};
+        actionKind = mkEnableOption "Show action kind" // {default = true;};
+      };
+
+      mappings = {
+        open = mkMappingOption "Open code action menu [nvim-code-action-menu]" "<leader>ca";
+      };
+    };
+  };
+}

modules/plugins/lsp/otter/config.nix

@@ -1,39 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.lua) toLuaObject;
-  inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding;
-
-  cfg = config.vim.lsp;
-
-  self = import ./otter.nix {inherit lib;};
-  mappingDefinitions = self.options.vim.lsp.otter-nvim.mappings;
-  mappings = addDescriptionsToMappings cfg.otter-nvim.mappings mappingDefinitions;
-in {
-  config = mkIf (cfg.enable && cfg.otter-nvim.enable) {
-    assertions = [
-      {
-        assertion = !config.vim.utility.ccc.enable;
-        message = ''
-          ccc and otter have a breaking conflict. It's been reported upstream. Until it's fixed, disable one of them
-        '';
-      }
-    ];
-    vim = {
-      startPlugins = ["otter-nvim"];
-
-      maps.normal = mkMerge [
-        (mkSetBinding mappings.toggle "<cmd>lua require'otter'.activate()<CR>")
-      ];
-
-      pluginRC.otter-nvim = entryAnywhere ''
-        -- Enable otter diagnostics viewer
-        require("otter").setup({${toLuaObject cfg.otter-nvim.setupOpts}})
-      '';
-    };
-  };
-}

modules/plugins/lsp/otter/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./otter.nix
-    ./config.nix
-  ];
-}

modules/plugins/lsp/otter/otter.nix

@@ -1,64 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.nvim.binds) mkMappingOption;
-  inherit (lib.types) bool str listOf;
-  inherit (lib.nvim.types) mkPluginSetupOption;
-in {
-  options.vim.lsp = {
-    otter-nvim = {
-      enable = mkEnableOption ''
-        lsp features and a code completion source for code embedded in other documents [otter-nvim]
-      '';
-      mappings = {
-        toggle = mkMappingOption "Activate LSP on Cursor Position [otter-nvim]" "<leader>lo";
-      };
-      setupOpts = mkPluginSetupOption "otter.nvim" {
-        lsp = {
-          diagnostic_update_event = mkOption {
-            type = listOf str;
-            default = ["BufWritePost"];
-            description = ''
-              `:h events` that cause the diagnostic to update.
-              Set to: {"BufWritePost", "InsertLeave", "TextChanged" }
-              for less performant but more instant diagnostic updates
-            '';
-          };
-        };
-        buffers = {
-          set_filetype = mkOption {
-            type = bool;
-            default = false;
-            description = ''
-              if set to true, the filetype of the otterbuffers will be set. Other wide only
-              the autocommand of lspconfig that attaches the language server will be
-              executed without stting the filetype
-            '';
-          };
-          write_to_disk = mkOption {
-            type = bool;
-            default = false;
-            description = ''
-              write <path>.otter.<embedded language extension> files to disk on save of main buffer.
-              Useful for some linters that require actual files.
-              Otter files are deleted on quit or main buffer close
-            '';
-          };
-        };
-        strip_wrapping_quote_characters = mkOption {
-          type = listOf str;
-          default = ["'" ''"'' "`"];
-          description = ''
-          '';
-        };
-        handle_leading_whitespace = mkOption {
-          type = bool;
-          default = false;
-          description = ''
-            otter may not work the way you expect when entire code blocks are indented
-            (eg. in Org files) When true, otter handles these cases fully.
-          '';
-        };
-      };
-    };
-  };
-}

modules/plugins/statusline/lualine/config.nix

@@ -11,7 +11,7 @@
   inherit (lib.generators) mkLuaInline;
 
   cfg = config.vim.statusline.lualine;
-  bCfg = config.vim.ui.breadcrumbs;
+  breadcrumbsCfg = config.vim.ui.breadcrumbs;
 in {
   config = mkMerge [
     # TODO: move into nvim-tree file
@@ -20,14 +20,13 @@ in {
         extensions = ["nvim-tree"];
       };
     })
-
+    (mkIf (breadcrumbsCfg.enable && breadcrumbsCfg.source == "nvim-navic") {
-    (mkIf (bCfg.enable && bCfg.lualine.winbar.enable && bCfg.source == "nvim-navic") {
       vim.statusline.lualine.setupOpts = {
         # TODO: rewrite in new syntax
         winbar.lualine_c = mkDefault [
           [
             "navic"
-            (mkLuaInline "draw_empty = ${boolToString bCfg.lualine.winbar.alwaysRender}")
+            (mkLuaInline "draw_empty = ${boolToString config.vim.ui.breadcrumbs.alwaysRender}")
           ]
         ];
       };
@@ -35,6 +34,7 @@ in {
     (mkIf cfg.enable {
       vim = {
         startPlugins = ["lualine"];
+
         pluginRC.lualine = entryAnywhere ''
           local lualine = require('lualine')
           lualine.setup ${toLuaObject cfg.setupOpts}

modules/plugins/theme/supported-themes.nix

@@ -6,7 +6,7 @@
   inherit (lib.trivial) boolToString warnIf;
 in {
   onedark = {
-    setup = {style ? "dark", ...}: ''
+    setup = {style ? "dark"}: ''
       -- OneDark theme
       require('onedark').setup {
         style = "${style}"
@@ -30,7 +30,7 @@ in {
   };
 
   dracula = {
-    setup = {transparent, ...}: ''
+    setup = {transparent}: ''
       require('dracula').setup({
         transparent_bg = ${boolToString transparent},
       });

modules/plugins/theme/theme.nix

@@ -7,7 +7,7 @@
   inherit (lib.attrsets) attrNames;
   inherit (lib.types) bool lines enum;
   inherit (lib.modules) mkIf;
-  inherit (lib.nvim.dag) entryBefore;
+  inherit (lib.nvim.dag) entryAfter;
 
   cfg = config.vim.theme;
   supportedThemes = import ./supported-themes.nix {
@@ -45,7 +45,7 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = [cfg.name];
-      luaConfigRC.theme = entryBefore ["pluginConfigs"] ''
+      luaConfigRC.theme = entryAfter ["basic"] ''
         ${cfg.extraConfig}
         ${supportedThemes.${cfg.name}.setup {inherit (cfg) style transparent;}}
       '';

modules/plugins/ui/borders/borders.nix

@@ -4,34 +4,31 @@
   ...
 }: let
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.nvim.types) borderType;
+  inherit (lib.lists) optionals;
+  inherit (lib.types) enum;
 
   cfg = config.vim.ui.borders;
+
+  defaultStyles = ["none" "single" "double" "rounded"];
 in {
   options.vim.ui.borders = {
     enable = mkEnableOption "visible borders for most windows";
 
     globalStyle = mkOption {
-      type = borderType;
+      type = enum defaultStyles;
       default = "rounded";
       description = ''
         The global border style to use.
-
-        If a list is given, it should have a length of eight or any divisor of
-        eight. The array will specify the eight chars building up the border in
-        a clockwise fashion starting with the top-left corner. You can specify
-        a different highlight group for each character by passing a
-        [char, "YourHighlightGroup"] instead
       '';
-      example = ["╔" "═" "╗" "║" "╝" "═" "╚" "║"];
     };
 
+    # TODO: make per-plugin borders configurable
     plugins = let
       mkPluginStyleOption = name: {
         enable = mkEnableOption "borders for the ${name} plugin" // {default = cfg.enable;};
 
         style = mkOption {
-          type = borderType;
+          type = enum (defaultStyles ++ optionals (name != "which-key") ["shadow"]);
           default = cfg.globalStyle;
           description = "The border style to use for the ${name} plugin";
         };
@@ -43,7 +40,7 @@ in {
       lspsaga = mkPluginStyleOption "lspsaga";
       nvim-cmp = mkPluginStyleOption "nvim-cmp";
       lsp-signature = mkPluginStyleOption "lsp-signature";
-      fastaction = mkPluginStyleOption "fastaction";
+      code-action-menu = mkPluginStyleOption "code-actions-menu";
     };
   };
 }

modules/plugins/ui/breadcrumbs/breadcrumbs.nix

@@ -4,9 +4,9 @@
   ...
 }: let
   inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) nullOr listOf enum bool str int either;
+  inherit (lib.types) nullOr listOf enum bool str int;
   inherit (lib.modules) mkRenamedOptionModule;
-  inherit (lib.nvim.types) mkPluginSetupOption borderType;
+  inherit (lib.nvim.types) mkPluginSetupOption;
   mkSimpleIconOption = default:
     mkOption {
       inherit default;
@@ -31,8 +31,6 @@ in {
     (renameSetupOpt ["sourceBuffer" "scrolloff"] ["source_buffer" "scrolloff"])
     # TODO: every option under icon is renamed to first letter capitalized
     (renameSetupOpt ["icon"] ["icon"])
-
-    (mkRenamedOptionModule ["vim" "ui" "breadcrumbs" "alwaysRender"] ["vim" "ui" "breadcrumbs" "lualine" "winbar" "alwaysRender"])
   ];
 
   options.vim.ui.breadcrumbs = {
@@ -45,43 +43,17 @@ in {
       '';
     };
 
-    # Options for configuring Lualine integration of nvim-navic
+    # maybe this should be an option to *disable* alwaysRender optionally but oh well
-    lualine.winbar = {
+    # too late
-      enable = mkOption {
-        type = bool;
-        default = true; # for retaining previous behaviour
-        example = false;
-        description = ''
-          Whether to automatically configure a winbar component for
-          Lualine on the Winbar section.
-
-          ::: {.note}
-          This is **set to `true` by default**, which means nvim-navic
-          will occupy `winbar.lualine_c` for the breadcrumbs feature
-          unless this option is set to `false`.
-          :::
-        '';
-      };
-
     alwaysRender = mkOption {
       type = bool;
       default = true;
-        example = false;
+      description = "Whether to always display the breadcrumbs component on winbar (always renders winbar)";
-        description = ''
-          Whether to always display the breadcrumbs component
-          on winbar.
-
-          ::: {.note}
-          This will pass `draw_empty` to the `nvim_navic` winbar
-          component, which causes the component to be drawn even
-          if it's empty
-          :::
-        '';
-      };
     };
 
     navbuddy = {
       enable = mkEnableOption "navbuddy LSP helper UI. Enabling this option automatically loads and enables nvim-navic";
+
       mappings = {
         close = mkOption {
           type = str;
@@ -240,7 +212,8 @@ in {
           # position = {}
 
           border = mkOption {
-            type = borderType;
+            # TODO: let this type accept a custom string
+            type = enum ["single" "rounded" "double" "solid" "none"];
             default = config.vim.ui.borders.globalStyle;
             description = "border style to use";
           };
@@ -263,7 +236,8 @@ in {
               */
 
               border = mkOption {
-                type = borderType;
+                # TODO: let this type accept a custom string
+                type = nullOr (enum ["single" "rounded" "double" "solid" "none"]);
                 default = config.vim.ui.borders.globalStyle;
                 description = "border style to use for the left section of Navbuddy UI";
               };
@@ -280,7 +254,8 @@ in {
               */
 
               border = mkOption {
-                type = borderType;
+                # TODO: let this type accept a custom string
+                type = nullOr (enum ["single" "rounded" "double" "solid" "none"]);
                 default = config.vim.ui.borders.globalStyle;
                 description = "border style to use for the middle section of Navbuddy UI";
               };
@@ -290,7 +265,8 @@ in {
             # there is no size option for the right section, it fills the remaining space
             right = {
               border = mkOption {
-                type = borderType;
+                # TODO: let this type accept a custom string
+                type = nullOr (enum ["single" "rounded" "double" "solid" "none"]);
                 default = config.vim.ui.borders.globalStyle;
                 description = "border style to use for the right section of Navbuddy UI";
               };

modules/plugins/ui/default.nix

@@ -8,6 +8,5 @@
     ./illuminate
     ./breadcrumbs
     ./borders
-    ./fastaction
   ];
 }

modules/plugins/ui/fastaction/config.nix

@@ -1,24 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.modules) mkIf mkDefault;
-  inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.lua) toLuaObject;
-
-  cfg = config.vim.ui.fastaction;
-  borderCfg = config.vim.ui.borders.plugins.fastaction;
-in {
-  config = mkIf cfg.enable {
-    vim = {
-      ui.fastaction.setupOpts = {
-        register_ui_select = mkDefault true;
-        popup.border = mkIf borderCfg.enable borderCfg.style;
-      };
-
-      startPlugins = ["fastaction-nvim"];
-      pluginRC.fastaction = entryAnywhere "require('fastaction').setup(${toLuaObject cfg.setupOpts})";
-    };
-  };
-}

modules/plugins/ui/fastaction/fastaction-nvim.nix

@@ -1,9 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkEnableOption;
-  inherit (lib.nvim.types) mkPluginSetupOption;
-in {
-  options.vim.ui.fastaction = {
-    enable = mkEnableOption "overriding vim.ui.select with fastaction.nvim";
-    setupOpts = mkPluginSetupOption "fastaction" {};
-  };
-}

modules/plugins/utility/binds/which-key/config.nix

@@ -25,7 +25,7 @@ in {
 
         ${optionalString config.vim.ui.borders.plugins.which-key.enable ''
         window = {
-          border = ${toLuaObject config.vim.ui.borders.plugins.which-key.style},
+          border = "${config.vim.ui.borders.plugins.which-key.style}",
         },
       ''}
       })

modules/plugins/utility/telescope/config.nix

@@ -17,19 +17,17 @@
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
-    vim = {
+    vim.startPlugins = [
-      startPlugins = [
       "telescope"
       "plenary-nvim"
     ];
 
-      maps.normal = mkMerge [
+    vim.maps.normal = mkMerge [
       (mkSetBinding mappings.findFiles "<cmd> Telescope find_files<CR>")
       (mkSetBinding mappings.liveGrep "<cmd> Telescope live_grep<CR>")
       (mkSetBinding mappings.buffers "<cmd> Telescope buffers<CR>")
       (mkSetBinding mappings.helpTags "<cmd> Telescope help_tags<CR>")
       (mkSetBinding mappings.open "<cmd> Telescope<CR>")
-        (mkSetBinding mappings.resume "<cmd> Telescope resume<CR>")
 
       (mkSetBinding mappings.gitCommits "<cmd> Telescope git_commits<CR>")
       (mkSetBinding mappings.gitBufferCommits "<cmd> Telescope git_bcommits<CR>")
@@ -55,11 +53,11 @@ in {
 
       (
         mkIf config.vim.projects.project-nvim.enable
-          (mkSetBinding mappings.findProjects "<cmd> Telescope projects<CR>")
+        (mkSetBinding mappings.findProjects "<cmd Telescope projects<CR>")
       )
     ];
 
-      binds.whichKey.register = pushDownDefault {
+    vim.binds.whichKey.register = pushDownDefault {
       "<leader>f" = "+Telescope";
       "<leader>fl" = "Telescope LSP";
       "<leader>fm" = "Cellular Automaton";
@@ -67,7 +65,7 @@ in {
       "<leader>fvc" = "Commits";
     };
 
-      pluginRC.telescope = entryAnywhere ''
+    vim.pluginRC.telescope = entryAnywhere ''
       local telescope = require('telescope')
       telescope.setup(${toLuaObject cfg.setupOpts})
 
@@ -90,5 +88,4 @@ in {
       }
     '';
   };
-  };
 }

modules/plugins/utility/telescope/telescope.nix

@@ -150,13 +150,13 @@
 in {
   options.vim.telescope = {
     mappings = {
-      findProjects = mkMappingOption "Find projects [Telescope]" "<leader>fp";
+      findProjects = mkMappingOption "Find files [Telescope]" "<leader>fp";
+
       findFiles = mkMappingOption "Find files [Telescope]" "<leader>ff";
       liveGrep = mkMappingOption "Live grep [Telescope]" "<leader>fg";
       buffers = mkMappingOption "Buffers [Telescope]" "<leader>fb";
       helpTags = mkMappingOption "Help tags [Telescope]" "<leader>fh";
       open = mkMappingOption "Open [Telescope]" "<leader>ft";
-      resume = mkMappingOption "Resume (previous search) [Telescope]" "<leader>fr";
 
       gitCommits = mkMappingOption "Git commits [Telescope]" "<leader>fvcw";
       gitBufferCommits = mkMappingOption "Git buffer commits [Telescope]" "<leader>fvcb";

modules/plugins/visuals/config.nix

@@ -45,6 +45,8 @@ in {
               'noice',
               'NvimTree',
               'alpha',
+              'code-action-menu-menu',
+              'code-action-menu-warning-message',
               'notify',
               'Navbuddy'
             },

modules/plugins/visuals/fidget/fidget.nix

@@ -7,7 +7,7 @@
   inherit (lib.options) mkEnableOption mkOption literalExpression;
   inherit (lib.strings) toUpper;
   inherit (lib.types) int float bool str enum listOf attrsOf oneOf nullOr submodule;
-  inherit (lib.nvim.types) mkPluginSetupOption luaInline borderType;
+  inherit (lib.nvim.types) mkPluginSetupOption luaInline;
   inherit (lib.generators) mkLuaInline;
 in {
   imports = [
@@ -453,7 +453,7 @@ in {
           };
           border = mkOption {
             description = "Border style of the notification window";
-            type = borderType;
+            type = enum ["none" "single" "double" "rounded" "solid" "shadow"];
             default =
               if config.vim.ui.borders.enable
               then config.vim.ui.borders.globalStyle

modules/wrapper/rc/config.nix

@@ -3,8 +3,8 @@
   lib,
   ...
 }: let
-  inherit (builtins) map mapAttrs filter removeAttrs attrNames;
+  inherit (builtins) map mapAttrs filter;
-  inherit (lib.attrsets) mapAttrsToList filterAttrs attrsToList;
+  inherit (lib.attrsets) mapAttrsToList filterAttrs;
   inherit (lib.strings) concatLines concatMapStringsSep optionalString;
   inherit (lib.trivial) showWarnings;
   inherit (lib.generators) mkLuaInline;
@@ -14,11 +14,10 @@
   cfg = config.vim;
 in {
   config = let
+    filterNonNull = filterAttrs (_: value: value != null);
     globalsScript =
-      mapAttrsToList (name: value: "vim.g.${name} = ${toLuaObject value}") cfg.globals;
+      mapAttrsToList (name: value: "vim.g.${name} = ${toLuaObject value}")
-
+      (filterNonNull cfg.globals);
-    optionsScript =
-      mapAttrsToList (name: value: "vim.o.${name} = ${toLuaObject value}") cfg.options;
 
     extraPluginConfigs = resolveDag {
       name = "extra plugin configs";
@@ -41,49 +40,17 @@ in {
       inherit (keymap) desc silent nowait script expr unique noremap;
     };
 
-    toLuaKeymap = {
+    toLuaKeymap = bind: "vim.keymap.set(${toLuaObject bind.mode}, ${toLuaObject bind.key}, ${toLuaObject (getAction bind)}, ${toLuaObject (getOpts bind)})";
-      name,
-      value,
-    }: "vim.keymap.set(${toLuaObject value.mode}, ${toLuaObject name}, ${toLuaObject (getAction value)}, ${toLuaObject (getOpts value)})";
 
-    namedModes = {
+    maps = concatLines (map toLuaKeymap cfg.keymaps);
-      "normal" = ["n"];
-      "insert" = ["i"];
-      "select" = ["s"];
-      "visual" = ["v"];
-      "terminal" = ["t"];
-      "normalVisualOp" = ["n" "v" "o"];
-      "visualOnly" = ["n" "x"];
-      "operator" = ["o"];
-      "insertCommand" = ["i" "c"];
-      "lang" = ["l"];
-      "command" = ["c"];
-    };
 
-    maps =
+    keymaps = maps;
-      removeAttrs cfg.maps (attrNames namedModes)
-      // mapAttrs (_: legacyMap: legacyMap // {mode = namedModes.normal;}) cfg.maps.normal
-      // mapAttrs (_: legacyMap: legacyMap // {mode = namedModes.insert;}) cfg.maps.insert
-      // mapAttrs (_: legacyMap: legacyMap // {mode = namedModes.select;}) cfg.maps.select
-      // mapAttrs (_: legacyMap: legacyMap // {mode = namedModes.visual;}) cfg.maps.visual
-      // mapAttrs (_: legacyMap: legacyMap // {mode = namedModes.terminal;}) cfg.maps.terminal
-      // mapAttrs (_: legacyMap: legacyMap // {mode = namedModes.normalVisualOp;}) cfg.maps.normalVisualOp
-      // mapAttrs (_: legacyMap: legacyMap // {mode = namedModes.visualOnly;}) cfg.maps.visualOnly
-      // mapAttrs (_: legacyMap: legacyMap // {mode = namedModes.operator;}) cfg.maps.operator
-      // mapAttrs (_: legacyMap: legacyMap // {mode = namedModes.insertCommand;}) cfg.maps.insertCommand
-      // mapAttrs (_: legacyMap: legacyMap // {mode = namedModes.lang;}) cfg.maps.lang
-      // mapAttrs (_: legacyMap: legacyMap // {mode = namedModes.command;}) cfg.maps.command;
-
-    keymaps = concatLines (map toLuaKeymap (attrsToList (filterNonNull maps)));
   in {
     vim = {
       luaConfigRC = {
-        # `vim.g` and `vim.o`
         globalsScript = entryAnywhere (concatLines globalsScript);
-        optionsScript = entryAfter ["basic"] (concatLines optionsScript);
+        # basic, theme
-
+        pluginConfigs = entryAfter ["theme"] pluginConfigs;
-        # Basic
-        pluginConfigs = entryAfter ["optionsScript"] pluginConfigs;
         extraPluginConfigs = entryAfter ["pluginConfigs"] extraPluginConfigs;
         mappings = entryAfter ["extraPluginConfigs"] keymaps;
         # FIXME: put this somewhere less stupid

modules/wrapper/rc/options.nix

@@ -129,38 +129,16 @@ in {
     globals = mkOption {
       type = attrs;
       default = {};
-      example = {"some_variable" = 42;};
       description = ''
         An attribute set containing global variable values
         for storing vim variables as early as possible. If
         populated, this option will set vim variables in the
         built luaConfigRC as the first item.
 
-        ::: {.note}
+        E.g. {foo = "bar"} will set `vim.g.foo` to "bar" where
-        `{foo = "bar";}` will set `vim.g.foo` to "bar", where
+        the type of `bar` in the resulting vimscript will be
-        the type of `bar` in the resulting Lua value will be
+        infered from the type of the value in the `{name = value}`
-        inferred from the type of the value in the `{name = value;}`
+        pair.
-        pair passed to the option.
-        :::
-      '';
-    };
-
-    options = mkOption {
-      type = attrs;
-      default = {};
-      example = {visualbell = true;};
-      description = ''
-        An attribute set containing vim options to be set
-        as early as possible. If populated, this option will
-        set vim options in the built luaConfigRC after `basic`
-        and before `pluginConfigs` DAG entries.
-
-        ::: {.note}
-        `{foo = "bar";}` will set `vim.o.foo` to "bar", where
-        the type of `bar` in the resulting Lua value will be
-        inferred from the type of the value in the`{name = value;}`
-        pair passed to the option.
-        :::
       '';
     };