yeehaw

lib/default.nix

@@ -1,9 +1,10 @@
 {
+  self,
   inputs,
   lib,
   ...
 }: {
-  types = import ./types {inherit inputs lib;};
+  types = import ./types {inherit self inputs lib;};
 
   config = import ./config.nix {inherit lib;};
   binds = import ./binds.nix {inherit lib;};
@@ -12,5 +13,5 @@
   lists = import ./lists.nix {inherit lib;};
   attrsets = import ./attrsets.nix {inherit lib;};
   lua = import ./lua.nix {inherit lib;};
-  neovimConfiguration = import ../modules {inherit inputs lib;};
+  neovimConfiguration = import ../modules {inherit self inputs lib;};
 }

lib/stdlib-extended.nix

@@ -1,6 +1,10 @@
 # Convenience function that returns the given Nixpkgs standard library
 # extended with our functions using `lib.extend`.
-inputs:
+{
+  inputs,
+  self,
+  ...
+} @ args:
 inputs.nixpkgs.lib.extend (self: super: {
   # WARNING: New functions should not be added here, but to files
   # imported by `./default.nix` under their own categories. If your
@@ -12,7 +16,7 @@ inputs.nixpkgs.lib.extend (self: super: {
   # E.g. for an input called `nvf`, `inputs.nvf.lib.nvim` will return the set
   # below.
   nvim = import ./. {
-    inherit inputs;
+    inherit (args) inputs self;
     lib = self;
   };
 

lib/types/default.nix

@@ -1,10 +1,11 @@
 {
+  self,
   inputs,
   lib,
   ...
 }: let
   typesDag = import ./dag.nix {inherit lib;};
-  typesPlugin = import ./plugins.nix {inherit inputs lib;};
+  typesPlugin = import ./plugins.nix {inherit self inputs lib;};
   typesLanguage = import ./languages.nix {inherit lib;};
   customTypes = import ./custom.nix {inherit lib;};
 in {

lib/types/plugins.nix

@@ -1,12 +1,13 @@
 {
+  self,
   inputs,
   lib,
   ...
 }: let
   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;
+  inherit (lib.strings) hasPrefix removePrefix replaceStrings toLower;
+  inherit (lib.types) submodule either package enum str lines anything listOf nullOr;
 
   # Get the names of all flake inputs that start with the given prefix.
   fromInputs = {
@@ -16,10 +17,7 @@
     mapAttrs' (n: v: nameValuePair (removePrefix prefix n) {src = v;}) (filterAttrs (n: _: hasPrefix prefix n) inputs);
 
   #  Get the names of all flake inputs that start with the given prefix.
-  pluginInputNames = attrNames (fromInputs {
-    inherit inputs;
-    prefix = "plugin-";
-  });
+  pluginInputNames = map (pin: replaceStrings ["." "_"] ["-" "-"] (toLower pin)) (attrNames self.pins);
 
   # You can either use the name of the plugin or a package.
   pluginType = nullOr (