Merge 55cdd6db48 into cb7ff874e2

.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,6 +17,7 @@ isMaximal: {
       lspkind.enable = false;
       lightbulb.enable = true;
       lspsaga.enable = false;
+      nvimCodeActionMenu.enable = isMaximal;
       trouble.enable = true;
       lspSignature.enable = true;
       lsplines.enable = isMaximal;
@@ -59,7 +60,6 @@ isMaximal: {
       python.enable = isMaximal;
       dart.enable = isMaximal;
       bash.enable = isMaximal;
-      r.enable = isMaximal;
       tailwind.enable = isMaximal;
       typst.enable = isMaximal;
       clang = {
@@ -205,7 +205,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/${decl}";
-                    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/release-notes/rl-0.7.md

@@ -4,8 +4,6 @@ Release notes for release 0.7
 
 ## Breaking Changes and Migration Guide {#sec-breaking-changes-and-migration-guide-0-7}
 
-### `vim.configRC` removed {#sec-vim-configrc-removed}
-
 In v0.7 we are removing `vim.configRC` in favor of making `vim.luaConfigRC` the
 top-level DAG, and thereby making the entire configuration Lua based. This
 change introduces a few breaking changes:
@@ -26,17 +24,6 @@ making good use of its extensive Lua API. Additionally, Vimscript is slow and
 brings unnecessary performance overhead while working with different
 configuration formats.
 
-### `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):
@@ -108,7 +95,6 @@ everyone.
   plugin's options can now be found under `indentBlankline.setupOpts`, the
   previous iteration of the module also included out of place/broken options,
   which have been removed for the time being. These are:
-
   - `listChar` - this was already unused
   - `fillChar` - this had nothing to do with the plugin, please configure it
     yourself by adding `vim.opt.listchars:append({ space = '<char>' })` to your
@@ -117,9 +103,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
@@ -192,7 +175,3 @@ everyone.
 - 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`.

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,6 +52,21 @@
         "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,
@@ -98,11 +129,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726871744,
+        "lastModified": 1726142289,
-        "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
+        "narHash": "sha256-Jks8O42La+nm5AMTSq/PvM5O+fUAhIy0Ce1QYqLkyZ4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
+        "rev": "280db3decab4cbeb22a4599bd472229ab74d25e1",
         "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": {
@@ -1021,6 +1052,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": {
@@ -1136,11 +1183,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": {
@@ -1280,11 +1327,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": {
@@ -1808,7 +1855,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",
@@ -1839,6 +1885,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",
@@ -1886,7 +1933,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": {
@@ -1958,6 +2006,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

@@ -90,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";
@@ -130,8 +133,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;
     };
 
@@ -156,7 +159,7 @@
       flake = false;
     };
 
-    # Language support
+    # 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;};
 }

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,14 +1,15 @@
 {
+  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).
-    neovim = map (p: "${./neovim}/${p}") [
+  neovim = map (p: ./neovim + "/${p}") [
     "init"
     "mappings"
   ];
@@ -16,7 +17,7 @@
   # Individual plugin modules, separated by the type of plugin.
   # While adding a new type, you must make sure your type is
   # included in the list below.
-    plugins = map (p: "${./plugins}/${p}") [
+  plugins = map (p: ./plugins + "/${p}") [
     "assistant"
     "autopairs"
     "comments"
@@ -46,7 +47,7 @@
 
   # The neovim wrapper, used to build a wrapped neovim package
   # using the configuration passed in `neovim` and `plugins` modules.
-    wrapper = map (p: "${./wrapper}/${p}") [
+  wrapper = map (p: ./wrapper + "/${p}") [
     "build"
     "rc"
     "warnings"
@@ -54,19 +55,23 @@
 
   # Extra modules, such as deprecation warnings
   # or renames in one place.
-    extra = map (p: "${./extra}/${p}") [
+  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/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/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/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, he `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,6 +10,7 @@
 
     # lsp plugins
     ./lspsaga
+    ./nvim-code-action-menu
     ./trouble
     ./lsp-signature
     ./lightbulb

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,38 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.binds) mkSetBinding addDescriptionsToMappings pushDownDefault;
+  inherit (lib.nvim.lua) toLuaObject;
+
+  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 = ${toLuaObject 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/ui/borders/borders.nix

@@ -43,7 +43,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/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/visuals/config.nix

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