refactor: clean up FIXMEs and overlays

lib/default.nix

@@ -18,4 +18,4 @@ in
   {inherit lib mkVersion capitalise;}
   // (import ./inputs.nix lib lock)
   // optionalAttrs (inputs != {}) (import ./flake-lib.nix inputs)
-  // optionalAttrs (pkgs != {}) (import ./pkgs.nix pkgs mkVersion capitalise self)
+  // optionalAttrs (pkgs != {}) (import ./pkgs.nix {inherit pkgs mkVersion capitalise self;})

lib/flake-lib.nix

@@ -13,6 +13,7 @@ inputs: rec {
       };
     };
 
+  # Enable use of `nixpkgs.overlays` on both NixOS and NixOnDroid
   allowModularOverrides = {
     cudaSupport ? false,
     system,
@@ -77,6 +78,7 @@ inputs: rec {
             };
 
             config.environment.packages = config.environment.systemPackages;
+
             # This disables the assertion that fails because of nixpkgs.overlays
             config._module.args.isFlake = mkForce false;
           })

lib/pkgs.nix

@@ -1,4 +1,9 @@
-pkgs: mkVersion: capitalise: self: {
+{
+  capitalise,
+  mkVersion,
+  pkgs,
+  self,
+}: {
   buildPlugin = pname: src:
     pkgs.vimUtils.buildVimPlugin {
       inherit pname src;