refactor: expose custom libs through self flake

lib/default.nix

@@ -1,20 +1,13 @@
 {
-  inputs ? {},
-  pkgs ? {},
-  self ? {},
+  perSystem,
+  inputs,
 }: let
-  lock = builtins.fromJSON (builtins.readFile ../flake.lock);
-
-  lib = import "${builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
-    sha256 = lock.nodes.nixpkgs.locked.narHash;
-  }}/lib";
-
-  inherit (lib) concatStringsSep optionalAttrs stringToCharacters substring tail toUpper;
+  inherit (inputs.nixpkgs.lib) concatStringsSep stringToCharacters substring tail toUpper;
 
   mkVersion = src: "0.0.0+" + src.shortRev;
   capitalise = str: (toUpper (substring 0 1 str) + (concatStringsSep "" (tail (stringToCharacters str))));
 in
-  {inherit lib mkVersion capitalise;}
-  // optionalAttrs (inputs != {}) (import ./flake-lib.nix inputs)
-  // optionalAttrs (pkgs != {}) (import ./pkgs.nix {inherit pkgs mkVersion capitalise self;})
+  {inherit mkVersion capitalise;}
+  // (import ./flake-lib.nix inputs)
+  // perSystem (pkgs:
+    import ./pkgs.nix {inherit pkgs mkVersion capitalise inputs;})

lib/flake-lib.nix

@@ -45,7 +45,7 @@ inputs: rec {
         ++ extraModules;
     };
 
-  mkNixOnDroid = mods: let
+  mkNixOnDroid = extraModules: let
     system = "aarch64-linux";
   in
     inputs.nix-on-droid.lib.nixOnDroidConfiguration rec {
@@ -88,6 +88,6 @@ inputs: rec {
 
           ../common/nix-on-droid.nix
         ]
-        ++ mods;
+        ++ extraModules;
     };
 }

lib/pkgs.nix

@@ -2,7 +2,7 @@
   capitalise,
   mkVersion,
   pkgs,
-  self,
+  inputs,
 }: {
   buildPlugin = pname: src:
     pkgs.vimUtils.buildVimPlugin {
@@ -51,7 +51,7 @@
     "${configPath}${optionalString (length packages == 1) "/${toLower (elemAt withGirNames 0).girName}"}".source =
       pkgs.callPackage
       ./mk-types {
-        inherit (self.inputs) ts-for-gir-src;
+        inherit (inputs) ts-for-gir-src;
         inherit pname withGirNames;
       };
   };