From 586a7cd6c088060d519153c748332b8d88c37440 Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Wed, 18 Mar 2026 10:35:49 -0400 Subject: [PATCH 1/4] Use Lix --- flake.nix | 5 ++++- modules/profiles/core/nix-config.nix | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) 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/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; From 066ce7ea85c508273f5a32b53a855ccee7c1d347 Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Wed, 18 Mar 2026 10:37:17 -0400 Subject: [PATCH 2/4] Use Lix in CI --- .github/workflows/build.yml | 12 ++++++------ .github/workflows/check.yml | 6 +++--- modules/development/ci.nix | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6955d7b..93b0058 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 with: - extra-conf: 'accept-flake-config = true + extra_nix_config: 'accept-flake-config = true max-jobs = auto @@ -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 with: - extra-conf: 'accept-flake-config = true + extra_nix_config: 'accept-flake-config = true max-jobs = auto diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 160c5c5..83a33e3 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 with: - extra-conf: 'accept-flake-config = true + extra_nix_config: 'accept-flake-config = true max-jobs = auto diff --git a/modules/development/ci.nix b/modules/development/ci.nix index af809bf..aa0ce09 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"; "with" = { - extra-conf = '' + extra_nix_config = '' accept-flake-config = true max-jobs = auto ''; From 929b05551ce18ceb10fb59a5a570c8180fecacb0 Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Wed, 18 Mar 2026 10:38:40 -0400 Subject: [PATCH 3/4] [build] Use correct Lix action ref --- .github/workflows/build.yml | 4 ++-- .github/workflows/check.yml | 2 +- modules/development/ci.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93b0058..1c054ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4.2.1 - name: Install Lix - uses: samueldr/lix-gha-installer-action + uses: samueldr/lix-gha-installer-action@latest with: extra_nix_config: 'accept-flake-config = true @@ -55,7 +55,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4.2.1 - name: Install Lix - uses: samueldr/lix-gha-installer-action + uses: samueldr/lix-gha-installer-action@latest with: extra_nix_config: 'accept-flake-config = true diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 83a33e3..024e317 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -6,7 +6,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4.2.1 - name: Install Lix - uses: samueldr/lix-gha-installer-action + uses: samueldr/lix-gha-installer-action@latest with: extra_nix_config: 'accept-flake-config = true diff --git a/modules/development/ci.nix b/modules/development/ci.nix index aa0ce09..21f429d 100644 --- a/modules/development/ci.nix +++ b/modules/development/ci.nix @@ -10,7 +10,7 @@ in { } { name = "Install Lix"; - uses = "samueldr/lix-gha-installer-action"; + uses = "samueldr/lix-gha-installer-action@latest"; "with" = { extra_nix_config = '' accept-flake-config = true From b27a68f9cd8498de7d578ecdaeb98118715345a1 Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Wed, 18 Mar 2026 10:50:31 -0400 Subject: [PATCH 4/4] [build] Use `nix profile install` for Cachix --- .github/workflows/build.yml | 4 ++-- .github/workflows/check.yml | 2 +- modules/development/ci.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c054ef..1e3080a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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 024e317..e499c0f 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -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/modules/development/ci.nix b/modules/development/ci.nix index 21f429d..b9da8a1 100644 --- a/modules/development/ci.nix +++ b/modules/development/ci.nix @@ -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"; }; } ];