From 3b6ae8212db3fe3dbce5f0002630392279818123 Mon Sep 17 00:00:00 2001
From: Dmitry Voronin <hi@voronind.com>
Date: Wed, 18 Dec 2024 08:32:43 +0300
Subject: [PATCH] Flake: Refactor a bit on pipes.

---
 Makefile       |  2 +-
 flake.nix      | 50 +++++++++++++++++++++++++++-----------------------
 system/Nix.nix |  1 +
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index c3d4b6bc..a5206337 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-options  = --option eval-cache false --fallback --print-build-logs --verbose
+options  = --option eval-cache false --fallback --print-build-logs --verbose --extra-experimental-features pipe-operators
 flake    = .
 hostname = $(shell hostname)
 
diff --git a/flake.nix b/flake.nix
index a621f8f3..5f2374c9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,7 +69,9 @@
 		self,
 		stylix,
 		...
-	} @inputs: {
+	} @inputs: let
+		lib = nixpkgs.lib;
+
 		const = {
 			droidStateVersion = "24.05";
 			stateVersion      = "24.11";
@@ -84,9 +86,8 @@
 				builtins.attrNames (builtins.readDir path)
 			)
 		);
-
+	in {
 		devShells = let
-			# lib    = nixpkgs.lib;
 			pkgs   = nixpkgs.legacyPackages.${system};
 			system = "x86_64-linux";
 		in {
@@ -102,14 +103,14 @@
 		};
 
 		nixosConfigurations = let
-			mkHost = { system, hostname }: nixpkgs.lib.nixosSystem {
+			mkHost = { system, hostname }: lib.nixosSystem {
 				inherit system;
 				modules = [
 					# Make a device hostname match the one from this config.
 					{ networking.hostName = hostname; }
 
 					# Specify current release version.
-					{ system.stateVersion = self.const.stateVersion; }
+					{ system.stateVersion = const.stateVersion; }
 
 					# Add Home Manager module.
 					home-manager.nixosModules.home-manager
@@ -120,18 +121,16 @@
 					# HM config.
 					./home/NixOs.nix
 				]
-				++ (self.ls ./host/${system}/${hostname})
-				++ (self.ls ./option)
-				++ (self.ls ./config)
-				++ (self.ls ./overlay)
-				++ (self.ls ./system)
+				++ (ls ./host/${system}/${hostname})
+				++ (ls ./option)
+				++ (ls ./config)
+				++ (ls ./overlay)
+				++ (ls ./system)
 				;
 				specialArgs = let
-					lib  = nixpkgs.lib;
 					util = import ./lib/Util.nix { inherit lib; };
 				in {
-					inherit (self) const __findFile;
-					inherit inputs self poetry2nixJobber util;
+					inherit const __findFile inputs self poetry2nixJobber util;
 					pkgsJobber   = nixpkgsJobber.legacyPackages.${system}.pkgs;
 					pkgsMaster   = nixpkgsMaster.legacyPackages.${system}.pkgs;
 					pkgsUnstable = nixpkgsUnstable.legacyPackages.${system}.pkgs;
@@ -140,15 +139,21 @@
 			};
 
 			mkSystem = system: hostname: { "${hostname}" = mkHost { inherit system hostname; }; };
-		in nixpkgs.lib.foldl' (acc: h: acc // h) { } (
-			map (system: nixpkgs.lib.foldl' (acc: h: acc // h) { } (
-				map (host: mkSystem system host) (builtins.attrNames (builtins.readDir ./host/${system}))
-			)) (builtins.attrNames (builtins.readDir ./host))
-		);
+
+			systems = builtins.attrNames (builtins.readDir ./host) |> map (system: {
+				inherit system;
+				hosts = builtins.attrNames (builtins.readDir ./host/${system});
+			});
+
+			hosts = map (system:
+				map (host: { inherit host; inherit (system) system; }) system.hosts
+			) systems |> lib.foldl' (acc: h: acc ++ h) [];
+
+			configurations = map (cfg: mkSystem cfg.system cfg.host) hosts;
+		in
+			lib.foldl' (result: cfg: result // cfg) {} configurations;
 
 		nixOnDroidConfigurations.default = let
-			# config       = self.nixOnDroidConfigurations.default.config;
-			lib          = nixpkgs.lib;
 			pkgs         = nixpkgs.legacyPackages.${system}.pkgs;
 			pkgsMaster   = nixpkgsMaster.legacyPackages.${system}.pkgs;
 			pkgsUnstable = nixpkgsUnstable.legacyPackages.${system}.pkgs;
@@ -160,11 +165,10 @@
 				{ home-manager.config.stylix.autoEnable = lib.mkForce false; }
 				./home/Android.nix
 			]
-			++ (self.ls ./option)
+			++ (ls ./option)
 			;
 			extraSpecialArgs = {
-				inherit inputs self pkgsMaster pkgsUnstable;
-				inherit (self) const __findFile;
+				inherit inputs self pkgsMaster pkgsUnstable const __findFile;
 				secret = import ./secret { };
 				util   = import ./lib/Util.nix { inherit lib; };
 			};
diff --git a/system/Nix.nix b/system/Nix.nix
index 436c758d..ad4767c9 100644
--- a/system/Nix.nix
+++ b/system/Nix.nix
@@ -13,6 +13,7 @@
 		experimental-features = [
 			"flakes"
 			"nix-command"
+			"pipe-operators"
 		];
 	};
 }