From 59180328cda59817d71cd58c8f48ead047375064 Mon Sep 17 00:00:00 2001 From: azahi Date: Mon, 17 Feb 2025 02:21:56 +0300 Subject: 2025-02-17 --- configurations/default.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'configurations/default.nix') diff --git a/configurations/default.nix b/configurations/default.nix index 312ca9f..4d60b8e 100644 --- a/configurations/default.nix +++ b/configurations/default.nix @@ -1,26 +1,27 @@ { inputs, lib, ... }: -with lib; let mkConfiguration = name: { modules ? [ ], configuration ? ./${name}, - this ? my.configurations.${name}, + this ? lib.my.configurations.${name}, }: - nameValuePair name (nixosSystem { - inherit (this) system; - modules = - modules - ++ attrValues inputs.self.nixosModules - ++ attrValues inputs.nix-topology.nixosModules - ++ optional (configuration != null) (import configuration); - specialArgs = { - inherit inputs lib this; - }; - }); + lib.nameValuePair name ( + lib.nixosSystem { + inherit (this) system; + modules = + modules + ++ lib.attrValues inputs.self.nixosModules + ++ lib.attrValues inputs.nix-topology.nixosModules + ++ lib.optional (configuration != null) (import configuration); + specialArgs = { + inherit inputs lib this; + }; + } + ); in -mapAttrs' mkConfiguration ( +lib.mapAttrs' mkConfiguration ( let mkTest = this: { modules = with inputs; [ -- cgit 1.4.1