From 86987ab8710b6bc927f84345557a89e2138ccfd1 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Fri, 21 Jul 2023 21:57:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=20local?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flake.nix              | 9 +++++----
 local/default.nix      | 4 ----
 local/lib/default.nix  | 1 +
 local/pkgs/default.nix | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 local/default.nix

diff --git a/flake.nix b/flake.nix
index 72e21b61..cf8edc4c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -95,7 +95,8 @@
 
 	outputs = inputs:
 		let
-			local = import ./local;
+			localLib = import ./local/lib inputs.nixpkgs.lib;
+			localPkgs = import ./local/pkgs;
 		in
 		{
 			nixosConfigurations =
@@ -103,7 +104,7 @@
 				"chn-PC" = inputs.nixpkgs.lib.nixosSystem
 				{
 					system = "x86_64-linux";
-					specialArgs = { topInputs = inputs; localLib = local.lib; };
+					specialArgs = { topInputs = inputs; inherit localLib; };
 					modules =
 					[
 						inputs.home-manager.nixosModules.home-manager
@@ -124,7 +125,7 @@
 										{
 											touchix = inputs.touchix.packages."${prev.system}";
 											nix-vscode-extensions = inputs.nix-vscode-extensions.extensions."${prev.system}";
-											localPackages = local.pkgs { pkgs = prev; };
+											localPackages = localPkgs { inherit (args) lib; pkgs = final; };
 										}
 									)
 									inputs.qchem.overlays.default
@@ -138,7 +139,7 @@
 							};
 						})
 						(
-							local.lib.mkModules
+							localLib.mkModules
 							[
 								./modules/fileSystems
 								./modules/kernel
diff --git a/local/default.nix b/local/default.nix
deleted file mode 100644
index 54825d77..00000000
--- a/local/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	lib = import ./lib;
-	pkgs = import ./pkgs;
-}
diff --git a/local/lib/default.nix b/local/lib/default.nix
index 51804361..aed5c354 100644
--- a/local/lib/default.nix
+++ b/local/lib/default.nix
@@ -1,3 +1,4 @@
+lib:
 {
 	mkModules = import ./mkModules.nix;
 	mkSystem = import ./mkSystems.nix;
diff --git a/local/pkgs/default.nix b/local/pkgs/default.nix
index 7379b5fe..c36a0286 100644
--- a/local/pkgs/default.nix
+++ b/local/pkgs/default.nix
@@ -1,4 +1,4 @@
-{ pkgs }: with pkgs;
+{ lib, pkgs }: with pkgs;
 {
 	typora = callPackage ./typora {};
 	upho = python3Packages.callPackage ./upho {};