fixup! Refactor lib use

rake5k · Jan 3, 2024 · 89de3f1 · 89de3f1
1 parent d492a6a
commit 89de3f1
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/flake.nix b/flake.nix
@@ -88,27 +88,27 @@
         inherit inputs;
       };
       inherit (inputs.flake-utils.lib.system) aarch64-darwin aarch64-linux x86_64-linux;
-      inherit (nixpkgs) lib;
+      inherit (nixpkgs.lib) composeManyExtensions getExe listToAttrs mkForce recursiveUpdate;
     in
     with nixcfgLib;
     {
       lib = { inputs }:
         import ./lib { inputs = inputs // self.inputs; };
 
-      darwinConfigurations = lib.listToAttrs [
+      darwinConfigurations = listToAttrs [
         (mkNixDarwin aarch64-darwin "macos")
       ];
 
-      homeConfigurations = lib.listToAttrs [
+      homeConfigurations = listToAttrs [
         (mkHome x86_64-linux "christian@non-nixos")
         (mkHome x86_64-linux "demo@non-nixos")
       ];
 
-      nixosConfigurations = lib.listToAttrs [
+      nixosConfigurations = listToAttrs [
         (mkNixos x86_64-linux "nixos")
       ];
 
-      nixOnDroidConfigurations = lib.listToAttrs [
+      nixOnDroidConfigurations = listToAttrs [
         (mkNixOnDroid aarch64-linux "nix-on-droid")
       ];
 
@@ -142,17 +142,17 @@
         })
       ];
 
-      overlays.default = lib.composeManyExtensions [
+      overlays.default = composeManyExtensions [
         (final: prev: {
           shellcheckPicky = prev.writeShellScriptBin "shellcheck" ''
-            ${inputs.nixpkgs.lib.getExe prev.shellcheck} \
+            ${getExe prev.shellcheck} \
             --check-sourced --enable all --external-sources \
             "$@"
           '';
         })
       ];
 
-      checks = lib.recursiveUpdate
+      checks = recursiveUpdate
         (mkForEachSystem [
           (mkGeneric "pre-commit-check" (system:
             let
@@ -167,7 +167,7 @@
                 nixpkgs-fmt.enable = true;
                 shellcheck = {
                   enable = true;
-                  entry = lib.mkForce "${lib.getExe pkgs.shellcheckPicky}";
+                  entry = mkForce "${getExe pkgs.shellcheckPicky}";
                 };
                 statix.enable = true;
               };