整理 localLib 到一个文件中

local/lib/attrsToList.nix

@@ -1 +0,0 @@
-Attrs: builtins.map ( name: { inherit name; value = Attrs.${name}; } ) ( builtins.attrNames Attrs )

local/lib/default.nix

@@ -1,7 +1,64 @@
 lib:
 {
-	attrsToList = import ./attrsToList.nix;
-	mkConditional = import ./mkConditional.nix lib;
-	mkModules = import ./mkModules.nix;
-	stripeTabs = import ./stripeTabs.nix;
+	attrsToList = Attrs: builtins.map ( name: { inherit name; value = Attrs.${name}; } ) ( builtins.attrNames Attrs );
+	mkConditional = condition: trueResult: falseResult: let inherit (lib) mkMerge mkIf; in
+		mkMerge [ ( mkIf condition trueResult ) ( mkIf (!condition) falseResult ) ];
+
+	# Behaviors of these two NixOS modules would be different:
+	# { pkgs, ... }@inputs: { environment.systemPackages = [ pkgs.hello ]; }
+	# inputs: { environment.systemPackages = [ pkgs.hello ]; }
+	# The second one would failed to evaluate because nixpkgs would not pass pkgs to it.
+	# So that we wrote a wrapper to make it always works like the first one.
+	# Input a list of modules, allowed types are:
+	#	* attribute set
+	#	* file containing attribute set
+	#	* file containing lambda, which takes inputs as argument
+	#	* lambda, which takes inputs as argument
+	#	* list, first member is a lambda, 
+	mkModules = moduleList: { pkgs, ... }@inputs:
+	{
+		imports = builtins.map
+		(
+			let
+				handle = { module, customArgs }:
+					if ( builtins.typeOf module ) == "list"
+						then handle { module = builtins.elemAt module 0; customArgs = builtins.elemAt module 1; }
+					else if ( builtins.typeOf module ) == "path"
+						then handle { module = import module; inherit customArgs; }
+					else if ( builtins.typeOf module ) == "lambda" && customArgs != null # deprecated
+						then handle { module = module customArgs; customArgs = null; }
+					else if ( builtins.typeOf module ) == "lambda" then module inputs # deprecated
+					else module;
+				caller = module: handle { inherit module; customArgs = null; };
+			in caller
+		) moduleList;
+	};
+	# Behaviors of these two NixOS modules would be different:
+	# { pkgs, ... }@inputs: { environment.systemPackages = [ pkgs.hello ]; }
+	# inputs: { environment.systemPackages = [ pkgs.hello ]; }
+	# The second one would failed to evaluate because nixpkgs would not pass pkgs to it.
+	# So that we wrote a wrapper to make it always works like the first one.
+	# moduleList: { pkgs, ... }@inputs:
+	# {
+	# 	imports = builtins.map
+	# 	(
+	# 		handle = module:
+	# 			if ( builtins.typeOf module ) == "path" then handle import module
+	# 			else if ( builtins.typeOf module ) == "lambda" then module inputs
+	# 			else module;
+	# 	) moduleList;
+	# }
+
+	# from: https://github.com/NixOS/nix/issues/3759
+	stripeTabs = text:
+		let
+			# Whether all lines start with a tab (or is empty)
+			shouldStripTab = lines: builtins.all (line: (line == "") || (pkgs.lib.strings.hasPrefix "	" line)) lines;
+			# Strip a leading tab from all lines
+			stripTab = lines: builtins.map (line: pkgs.lib.strings.removePrefix "	" line) lines;
+			# Strip tabs recursively until there are none
+			stripTabs = lines: if (shouldStripTab lines) then (stripTabs (stripTab lines)) else lines;
+		in
+			# Split into lines. Strip leading tabs. Concat back to string.
+			builtins.concatStringsSep "\n" (stripTabs (pkgs.lib.strings.splitString "\n" text));
 }

local/lib/mkConditional.nix

@@ -1,2 +0,0 @@
-lib: condition: trueResult: falseResult: let inherit (lib) mkMerge mkIf; in
-  mkMerge [ ( mkIf condition trueResult ) ( mkIf (!condition) falseResult ) ]

local/lib/mkModules.nix

@@ -1,45 +0,0 @@
-# Behaviors of these two NixOS modules would be different:
-# { pkgs, ... }@inputs: { environment.systemPackages = [ pkgs.hello ]; }
-# inputs: { environment.systemPackages = [ pkgs.hello ]; }
-# The second one would failed to evaluate because nixpkgs would not pass pkgs to it.
-# So that we wrote a wrapper to make it always works like the first one.
-# Input a list of modules, allowed types are:
-#	* attribute set
-#	* file containing attribute set
-#	* file containing lambda, which takes inputs as argument
-#	* lambda, which takes inputs as argument
-#	* list, first member is a lambda, 
-moduleList: { pkgs, ... }@inputs:
-{
-	imports = builtins.map
-	(
-		let
-			handle = { module, customArgs }:
-				if ( builtins.typeOf module ) == "list"
-					then handle { module = builtins.elemAt module 0; customArgs = builtins.elemAt module 1; }
-				else if ( builtins.typeOf module ) == "path"
-					then handle { module = import module; inherit customArgs; }
-				else if ( builtins.typeOf module ) == "lambda" && customArgs != null # deprecated
-					then handle { module = module customArgs; customArgs = null; }
-				else if ( builtins.typeOf module ) == "lambda" then module inputs # deprecated
-				else module;
-			caller = module: handle { inherit module; customArgs = null; };
-		in caller
-	) moduleList;
-}
-
-# Behaviors of these two NixOS modules would be different:
-# { pkgs, ... }@inputs: { environment.systemPackages = [ pkgs.hello ]; }
-# inputs: { environment.systemPackages = [ pkgs.hello ]; }
-# The second one would failed to evaluate because nixpkgs would not pass pkgs to it.
-# So that we wrote a wrapper to make it always works like the first one.
-# moduleList: { pkgs, ... }@inputs:
-# {
-# 	imports = builtins.map
-# 	(
-# 		handle = module:
-# 			if ( builtins.typeOf module ) == "path" then handle import module
-# 			else if ( builtins.typeOf module ) == "lambda" then module inputs
-# 			else module;
-# 	) moduleList;
-# }

local/lib/stripeTabs.nix

@@ -1,11 +0,0 @@
-# from: https://github.com/NixOS/nix/issues/3759
-text: let
-	# Whether all lines start with a tab (or is empty)
-	shouldStripTab = lines: builtins.all (line: (line == "") || (pkgs.lib.strings.hasPrefix "	" line)) lines;
-	# Strip a leading tab from all lines
-	stripTab = lines: builtins.map (line: pkgs.lib.strings.removePrefix "	" line) lines;
-	# Strip tabs recursively until there are none
-	stripTabs = lines: if (shouldStripTab lines) then (stripTabs (stripTab lines)) else lines;
-in
-	# Split into lines. Strip leading tabs. Concat back to string.
-	builtins.concatStringsSep "\n" (stripTabs (pkgs.lib.strings.splitString "\n" text))