Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
5 changes: 4 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; })
];
};
};
};
Expand Down
8 changes: 4 additions & 4 deletions modules/development/ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
'';
Expand All @@ -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";
};
}
];
Expand Down
8 changes: 6 additions & 2 deletions modules/profiles/core/nix-config.nix
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading