diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml index 7ede8d4..4f4e583 100644 --- a/.github/workflows/build-machines-and-homes.yml +++ b/.github/workflows/build-machines-and-homes.yml @@ -23,10 +23,10 @@ jobs: steps: - name: Maximize build disk space - uses: easimon/maximize-build-space@v10 + uses: easimon/maximize-build-space@master with: - overprovision-lvm: true - swap-size-mb: 1024 + overprovision-lvm: false + # swap-size-mb: 1024 remove-dotnet: 'true' remove-android: 'true' remove-haskell: 'true' @@ -34,14 +34,17 @@ jobs: remove-docker-images: 'true' build-mount-path: /nix + - name: make root own /nix + run: sudo chown -R root:root /nix + - name: setup binary cache key run: echo "${{ secrets.NIX_CACHE_SECRET_KEY }}" >> /home/runner/cache-priv-key.pem - name: Install Nix - uses: cachix/install-nix-action@v30 + uses: DeterminateSystems/nix-installer-action@main with: - enable_kvm: true - extra_nix_config: | + kvm: true + extra-conf: | show-trace = true experimental-features = nix-command flakes accept-flake-config = true @@ -67,8 +70,9 @@ jobs: - name: build run: | - package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel" - nix build -L "$package" + # package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel" + # nix build -L "$package" + nix run nixpkgs#nixos-rebuild build -- --flake ".#${{ matrix.machine }}" - name: cache # https://stackoverflow.com/a/58859404 diff --git a/flake.lock b/flake.lock index 20d9470..aa41ee6 100644 --- a/flake.lock +++ b/flake.lock @@ -566,11 +566,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1741888409, - "narHash": "sha256-gJ7QmlwsJ/QdwUjwTjifNo3v7OBQm2N6xa19l3mMWM4=", - "rev": "20edd45ae816c73504ddfb9c678756e003ceeafd", + "lastModified": 1743274305, + "narHash": "sha256-gsPA3AAGi3pucRpzJbhWWyyOBv2/2OjAjU/SlcSE8Vc=", + "rev": "d169c092fc28838a253be136d17fe7de1292c728", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/20edd45ae816c73504ddfb9c678756e003ceeafd.tar.gz?rev=20edd45ae816c73504ddfb9c678756e003ceeafd" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d169c092fc28838a253be136d17fe7de1292c728.tar.gz?rev=d169c092fc28838a253be136d17fe7de1292c728" }, "original": { "type": "tarball", @@ -589,11 +589,11 @@ ] }, "locked": { - "lastModified": 1741894565, - "narHash": "sha256-2FD0NDJbEjUHloVrtEIms5miJsj1tvQCc/0YK5ambyc=", + "lastModified": 1742945498, + "narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=", "ref": "refs/heads/main", - "rev": "a6da43f8193d9e329bba1795c42590c27966082e", - "revCount": 136, + "rev": "fa69ae26cc32dda178117b46487c2165c0e08316", + "revCount": 138, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, diff --git a/flake.nix b/flake.nix index b76d3e1..33a5c1d 100644 --- a/flake.nix +++ b/flake.nix @@ -125,35 +125,9 @@ flake-parts.lib.mkFlake { inherit inputs; } ( { ... }: { - imports = [ - inputs.treefmt.flakeModule - ]; systems = [ "x86_64-linux" ]; - perSystem = - { - inputs', - ... - }: - { - treefmt = { - projectRootFile = "flake.nix"; - programs.nixfmt.enable = true; - programs.typos.enable = true; - programs.shellcheck.enable = true; - - programs.yamlfmt = { - enable = true; - settings.retain_line_breaks = true; - }; - - settings.global.excludes = [ - "secrets/*" - "**/*.png" # tries to format a png file - ]; - }; - }; flake = let