diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6955d7b..1e3080a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,10 +10,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4.2.1 - - name: Install Nix - uses: NixOS/nix-installer-action@main + - name: Install Lix + uses: samueldr/lix-gha-installer-action@latest with: - extra-conf: 'accept-flake-config = true + extra_nix_config: 'accept-flake-config = true max-jobs = auto @@ -32,7 +32,7 @@ jobs: uses: cachix/cachix-action@master with: authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - installCommand: nix profile add github:NixOS/nixpkgs/nixpkgs-unstable#cachix + installCommand: nix profile install github:NixOS/nixpkgs/nixpkgs-unstable#cachix name: e10 - run: 'nix build .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel --accept-flake-config --show-trace @@ -54,10 +54,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4.2.1 - - name: Install Nix - uses: NixOS/nix-installer-action@main + - name: Install Lix + uses: samueldr/lix-gha-installer-action@latest with: - extra-conf: 'accept-flake-config = true + extra_nix_config: 'accept-flake-config = true max-jobs = auto @@ -76,7 +76,7 @@ jobs: uses: cachix/cachix-action@master with: authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - installCommand: nix profile add github:NixOS/nixpkgs/nixpkgs-unstable#cachix + installCommand: nix profile install github:NixOS/nixpkgs/nixpkgs-unstable#cachix name: e10 - name: Clean up storage run: 'sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 160c5c5..e499c0f 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -5,10 +5,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4.2.1 - - name: Install Nix - uses: NixOS/nix-installer-action@main + - name: Install Lix + uses: samueldr/lix-gha-installer-action@latest with: - extra-conf: 'accept-flake-config = true + extra_nix_config: 'accept-flake-config = true max-jobs = auto @@ -27,7 +27,7 @@ jobs: uses: cachix/cachix-action@master with: authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - installCommand: nix profile add github:NixOS/nixpkgs/nixpkgs-unstable#cachix + installCommand: nix profile install github:NixOS/nixpkgs/nixpkgs-unstable#cachix name: e10 - run: 'nix flake check --impure --accept-flake-config --show-trace diff --git a/flake.nix b/flake.nix index d2216e6..60f61f4 100644 --- a/flake.nix +++ b/flake.nix @@ -96,7 +96,10 @@ [ "dotnet-sdk-6.0.428" "aspnetcore-runtime-6.0.36" ]; }; - overlays = [ self.overlays.default ]; + overlays = [ + self.overlays.default + (_final: prev: { inherit (prev.lixPackageSets.stable) colmena; }) + ]; }; }; }; diff --git a/modules/development/ci.nix b/modules/development/ci.nix index af809bf..b9da8a1 100644 --- a/modules/development/ci.nix +++ b/modules/development/ci.nix @@ -9,10 +9,10 @@ in { uses = "actions/checkout@v4.2.1"; } { - name = "Install Nix"; - uses = "NixOS/nix-installer-action@main"; + name = "Install Lix"; + uses = "samueldr/lix-gha-installer-action@latest"; "with" = { - extra-conf = '' + extra_nix_config = '' accept-flake-config = true max-jobs = auto ''; @@ -39,7 +39,7 @@ in { authToken = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; name = "e10"; installCommand = - "nix profile add github:NixOS/nixpkgs/nixpkgs-unstable#cachix"; + "nix profile install github:NixOS/nixpkgs/nixpkgs-unstable#cachix"; }; } ]; diff --git a/modules/profiles/core/nix-config.nix b/modules/profiles/core/nix-config.nix index d862c0a..18229fc 100644 --- a/modules/profiles/core/nix-config.nix +++ b/modules/profiles/core/nix-config.nix @@ -1,14 +1,18 @@ -{ flake, lib, ... }: { +{ flake, pkgs, lib, ... }: { nixpkgs = { config = { allowUnfree = true; permittedInsecurePackages = [ "dotnet-sdk-6.0.428" "aspnetcore-runtime-6.0.36" ]; }; - overlays = [ flake.overlays.default ]; + overlays = [ + flake.overlays.default + (_final: prev: { inherit (prev.lixPackageSets.stable) colmena; }) + ]; }; nix = { + package = pkgs.lixPackageSets.stable.lix; optimise.automatic = true; gc = { automatic = lib.mkDefault true;