From 1b3e1c5145f739228f515be61fc3efb48730acb1 Mon Sep 17 00:00:00 2001 From: jahanson Date: Sun, 26 May 2024 19:33:26 -0500 Subject: [PATCH 1/2] Remove unreachable code. --- flake.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/flake.nix b/flake.nix index 143ba4e..f45993b 100644 --- a/flake.nix +++ b/flake.nix @@ -13,21 +13,8 @@ }; }; - nixConfig = { - extra-substituters = [ - "https://nix-community.cachix.org" - "https://hsndev.cachix.org" - ]; - extra-trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "hsndev.cachix.org-1:vN1/XGBZtMLnTFYDmTLDrullgZHSUYY3Kqt+Yg/C+tE=" - ]; - trusted-users = ["root" "gitea-runner"]; - }; - outputs = { self, sops-nix, nixpkgs, srvos, disko, ... }@inputs: let - linuxMachineName = "linux"; lib = nixpkgs.lib; inherit (self) outputs; in { From 26219e1eafd8384f9a130682bb6bf9656953a0f2 Mon Sep 17 00:00:00 2001 From: jahanson Date: Sun, 26 May 2024 19:38:35 -0500 Subject: [PATCH 2/2] Add top for building --- flake.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/flake.nix b/flake.nix index f45993b..9fc8c89 100644 --- a/flake.nix +++ b/flake.nix @@ -90,5 +90,14 @@ }]; }; }; + # Convenience output that aggregates the outputs for home, nixos. + # Also used in ci to build targets generally. + top = + let + nixtop = nixpkgs.lib.genAttrs + (builtins.attrNames inputs.self.nixosConfigurations) + (attr: inputs.self.nixosConfigurations.${attr}.config.system.build.toplevel); + in + nixtop; }; }