From 000003d479c50574eb9034e3c0bd0795ebf165d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 2 Jun 2023 11:41:18 +0200
Subject: [PATCH] flake: use lib from the module system not the inputs

---
 flake.nix | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index 318d64a..582d573 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,22 +9,19 @@
     };
   };
 
-  outputs = { nixos-modules, nixpkgs-lib, ... }:
-    let
-      inherit (nixpkgs-lib) lib;
-      ls = dir: lib.attrNames (builtins.readDir (./. + "/${dir}"));
-    in
-    {
-      nixosModule = { config, libS, ... }@args: {
-        _module.args.libS = lib.mkOverride 1001 (nixos-modules.lib { inherit lib config; });
+  outputs = { nixos-modules, ... }: {
+    nixosModule = { config, lib, libS, ... }@args: {
+      _module.args.libS = lib.mkOverride 1001 (nixos-modules.lib { inherit lib config; });
 
-        imports = [
-          nixos-modules.nixosModules.default
-        ] ++ (dir: map
-          (file: ./. + "/${dir}/${file}")
-          # assume that the nixos-modules repo is already imported if libS exists
-          (lib.remove (lib.optionalString (lib.hasAttr "libS" args) "default.nix") (ls dir))
-        ) "modules";
-      };
+      imports = [
+        nixos-modules.nixosModules.default
+      ] ++ (dir: let
+        ls = dir: lib.attrNames (builtins.readDir (./. + "/${dir}"));
+      in map
+        (file: ./. + "/${dir}/${file}")
+        # assume that the nixos-modules repo is already imported if libS exists
+        (lib.remove (lib.optionalString (lib.hasAttr "libS" args) "default.nix") (ls dir))
+      ) "modules";
     };
+  };
 }