From 91f1a9b55211312df22f760da34fe542a14a9b22 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 16 Jan 2025 18:48:33 -0500 Subject: [PATCH 1/2] make it nicer --- flake.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 3a449b9..15b79ed 100644 --- a/flake.nix +++ b/flake.nix @@ -87,14 +87,17 @@ }; }; - flake = { + flake = + let + pkgs = import nixpkgs { + config.allowUnfree = true; + system = "x86_64-linux"; + overlays = import ./overlay; + }; + in + { nixosConfigurations = let - pkgs = import nixpkgs { - config.allowUnfree = true; - system = "x86_64-linux"; - overlays = import ./overlay; - }; lib = nixpkgs.lib; in { @@ -140,10 +143,6 @@ }; homeConfigurations = let - pkgs = import nixpkgs { - config.allowUnfree = true; - system = "x86_64-linux"; - }; lib = home-manager.lib; in { From 38daf97f2a7df30d448ccea89e76e12a5cfdb945 Mon Sep 17 00:00:00 2001 From: cy Date: Thu, 16 Jan 2025 18:50:51 -0500 Subject: [PATCH 2/2] test building iso --- .github/workflows/build-and-cache.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index 8e5aaa3..cbab1ad 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -11,6 +11,7 @@ jobs: - .#attic-server - .#conduwuit - "github:cything/nixpkgs/9a35d495d2f49eee003b57265228844bb48c933e#nixosTests.garage.with-3node-replication1_x" + - ".#nixosConfigurations.ytnix.config.system.build.images.iso" runs-on: ubuntu-latest steps: - uses: DeterminateSystems/nix-installer-action@main @@ -28,4 +29,4 @@ jobs: cache: ${{ vars.ATTIC_CACHE }} token: ${{ secrets.ATTIC_TOKEN }} - uses: actions/checkout@v4 - - run: nix build '${{ matrix.package }}' + - run: nix build '${{ matrix.package }}' --show-trace -L