From 4233c3dabf65c5fa4afb16e6cfb85b7400afdcad Mon Sep 17 00:00:00 2001 From: Joakim Repomaa Date: Wed, 23 Jul 2025 14:37:31 +0300 Subject: [PATCH] simplify mkConfiguration --- flake.nix | 18 ++++++------------ hosts/turny/default.nix | 1 + 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 9a75621..cf43fb8 100644 --- a/flake.nix +++ b/flake.nix @@ -99,26 +99,20 @@ nixosConfigurations = let mkConfiguration = - { - name, - extraModules ? [ ], - }: + name: nixpkgs.lib.nixosSystem { inherit specialArgs; modules = [ ./modules ./hosts/${name} - ] ++ extraModules; + ]; }; in { - radish = mkConfiguration { name = "radish"; }; - freun-dev = mkConfiguration { name = "freun-dev"; }; - apu = mkConfiguration { name = "apu"; }; - turny = mkConfiguration { - name = "turny"; - extraModules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ]; - }; + radish = mkConfiguration "radish"; + freun-dev = mkConfiguration "freun-dev"; + apu = mkConfiguration "apu"; + turny = mkConfiguration "turny"; }; images.turny = self.nixosConfigurations.turny.config.system.build.sdImage; diff --git a/hosts/turny/default.nix b/hosts/turny/default.nix index 44d08a4..1fa9a33 100644 --- a/hosts/turny/default.nix +++ b/hosts/turny/default.nix @@ -5,5 +5,6 @@ ./configuration.nix ./secrets.nix inputs.nixos-hardware.nixosModules.raspberry-pi-3 + "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ]; }