docs/manual/release-notes/rl-0.9.md

@@ -25,12 +25,6 @@
   - The `setupOpts.mappings` options were also removed. Use the built-in Neovim
     settings (nvf's {option}`vim.keymaps`)
 
-[Snoweuph](https://github.com/snoweuph)
-
-- Fix `vim.assistant.codecompanion-nvim.setupOpts.display.diff.provider` to only
-  allow valid options. `default` is no longer valid. `inline` and `split` are
-  two new valid options.
-
 ## Changelog {#sec-release-0-9-changelog}
 
 [taylrfnt](https://github.com/taylrfnt)

flake.lock

@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1769981889,
+        "lastModified": 1768701608,
-        "narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=",
+        "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "332fed8f43b77149c582f1782683d6aeee1f07cf",
+        "rev": "20d63a8a1ae400557c770052a46a9840e768926b",
         "type": "github"
       },
       "original": {

modules/plugins/assistant/codecompanion/codecompanion-nvim.nix

@@ -59,8 +59,8 @@ in {
             };
 
             provider = mkOption {
-              type = enum ["inline" "split" "mini_diff"];
+              type = enum ["default" "mini_diff"];
-              default = "inline";
+              default = "default";
               description = "The preferred kind of provider.";
             };
           };

modules/wrapper/build/config.nix

@@ -9,7 +9,7 @@
   inherit (lib.trivial) flip;
   inherit (builtins) filter isString hasAttr getAttr;
 
-  getPin = flip getAttr (inputs.mnw.lib.npinsToPluginsAttrs pkgs ../../../npins/sources.json);
+  getPin = flip getAttr (pkgs.callPackages ../../../npins/sources.nix {});
 
   # Build a Vim plugin with the given name and arguments.
   buildPlug = attrs: let

npins/sources.nix

@@ -0,0 +1,115 @@
+{
+  lib,
+  fetchurl,
+  fetchgit,
+  fetchzip,
+}:
+builtins.mapAttrs
+(
+  name: spec: let
+    mayOverride = name: path: let
+      envVarName = "NPINS_OVERRIDE_${saneName}";
+      saneName = builtins.concatStringsSep "_" (
+        builtins.concatLists (
+          builtins.filter (x: builtins.isList x && x != [""]) (builtins.split "([a-zA-Z0-9]*)" name)
+        )
+      );
+      ersatz = builtins.getEnv envVarName;
+    in
+      if ersatz == ""
+      then path
+      else
+        # this turns the string into an actual Nix path (for both absolute and
+        # relative paths)
+        builtins.trace "Overriding path of \"${name}\" with \"${ersatz}\" due to set \"${envVarName}\"" (
+          if builtins.substring 0 1 ersatz == "/"
+          then /. + ersatz
+          else /. + builtins.getEnv "PWD" + "/${ersatz}"
+        );
+
+    path =
+      rec {
+        GitRelease = Git;
+        Channel = Tarball;
+
+        Git =
+          if spec.url != null && !spec.submodules
+          then Tarball
+          else
+            fetchgit (
+              let
+                repo = spec.repository;
+                url =
+                  {
+                    Git = repo.url;
+                    GitHub = "https://github.com/${repo.owner}/${repo.repo}.git";
+                    GitLab = "${repo.server}/${repo.repo_path}.git";
+                    Forgejo = "${repo.server}/${repo.owner}/${repo.repo}.git";
+                  }
+                    .${
+                    repo.type
+                  } or (throw "Unrecognized repository type ${repo.type}");
+              in {
+                name = let
+                  matched = builtins.match "^.*/([^/]*)(\\.git)?$" url;
+                  appendShort =
+                    if (builtins.match "[a-f0-9]*" spec.revision) != null
+                    then "-${builtins.substring 0 7 spec.revision}"
+                    else "";
+                in "${
+                  if matched == null
+                  then "source"
+                  else builtins.head matched
+                }${appendShort}";
+                inherit url;
+
+                rev = spec.revision;
+                inherit (spec) hash;
+                fetchSubmodules = spec.submodules;
+              }
+            );
+
+        PyPi = fetchurl {
+          inherit (spec) url hash;
+        };
+
+        Tarball = fetchzip {
+          inherit (spec) url hash;
+          extension = "tar";
+        };
+      }
+        .${
+        spec.type
+      } or (builtins.throw "Unknown source type ${spec.type}");
+
+    version =
+      if spec ? revision
+      then builtins.substring 0 8 spec.revision
+      else "0";
+  in
+    spec
+    // {
+      name = "${name}-${version}";
+      pname = name;
+      inherit version;
+      outPath =
+        (
+          # Override logic won't do anything if we're in pure eval
+          if builtins ? currentSystem
+          then mayOverride name path
+          else path
+        ).overrideAttrs
+        {
+          pname = name;
+          name = "${name}-${version}";
+          inherit version;
+        };
+    }
+)
+(
+  let
+    json = lib.importJSON ./sources.json;
+  in
+    assert lib.assertMsg (json.version == 7) "Unsupported format version ${toString json.version} in sources.json. Try running `npins upgrade`";
+      json.pins
+)