Compare commits

...
Sign in to create a new pull request.

8 commits

Author SHA1 Message Date
cy
f0dfe176a7
flake lock 2025-03-30 22:29:42 -04:00
cy
78cd934c8b
Revert "no follows"
This reverts commit afd2a5474c.
2025-03-30 22:28:53 -04:00
cy
ef2cda9599
chown /nix 2025-03-30 22:01:34 -04:00
cy
db65c44d3e
try determinate installer 2025-03-30 21:53:30 -04:00
cy
3e93cbaf73
workflow: use nixpkgs#nixos-rebuild 2025-03-30 21:29:11 -04:00
cy
4f4dc67b05
remove treefmt properly 2025-03-30 21:04:03 -04:00
cy
ff2a4730d3
use release-2.92 branch for lix 2025-03-30 21:00:15 -04:00
cy
afd2a5474c
no follows 2025-03-30 20:58:31 -04:00
3 changed files with 20 additions and 42 deletions

View file

@ -23,10 +23,10 @@ jobs:
steps: steps:
- name: Maximize build disk space - name: Maximize build disk space
uses: easimon/maximize-build-space@v10 uses: easimon/maximize-build-space@master
with: with:
overprovision-lvm: true overprovision-lvm: false
swap-size-mb: 1024 # swap-size-mb: 1024
remove-dotnet: 'true' remove-dotnet: 'true'
remove-android: 'true' remove-android: 'true'
remove-haskell: 'true' remove-haskell: 'true'
@ -34,14 +34,17 @@ jobs:
remove-docker-images: 'true' remove-docker-images: 'true'
build-mount-path: /nix build-mount-path: /nix
- name: make root own /nix
run: sudo chown -R root:root /nix
- name: setup binary cache key - name: setup binary cache key
run: echo "${{ secrets.NIX_CACHE_SECRET_KEY }}" >> /home/runner/cache-priv-key.pem run: echo "${{ secrets.NIX_CACHE_SECRET_KEY }}" >> /home/runner/cache-priv-key.pem
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v30 uses: DeterminateSystems/nix-installer-action@main
with: with:
enable_kvm: true kvm: true
extra_nix_config: | extra-conf: |
show-trace = true show-trace = true
experimental-features = nix-command flakes experimental-features = nix-command flakes
accept-flake-config = true accept-flake-config = true
@ -67,8 +70,9 @@ jobs:
- name: build - name: build
run: | run: |
package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel" # package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel"
nix build -L "$package" # nix build -L "$package"
nix run nixpkgs#nixos-rebuild build -- --flake ".#${{ matrix.machine }}"
- name: cache - name: cache
# https://stackoverflow.com/a/58859404 # https://stackoverflow.com/a/58859404

16
flake.lock generated
View file

@ -566,11 +566,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1741888409, "lastModified": 1743274305,
"narHash": "sha256-gJ7QmlwsJ/QdwUjwTjifNo3v7OBQm2N6xa19l3mMWM4=", "narHash": "sha256-gsPA3AAGi3pucRpzJbhWWyyOBv2/2OjAjU/SlcSE8Vc=",
"rev": "20edd45ae816c73504ddfb9c678756e003ceeafd", "rev": "d169c092fc28838a253be136d17fe7de1292c728",
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@ -589,11 +589,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741894565, "lastModified": 1742945498,
"narHash": "sha256-2FD0NDJbEjUHloVrtEIms5miJsj1tvQCc/0YK5ambyc=", "narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a6da43f8193d9e329bba1795c42590c27966082e", "rev": "fa69ae26cc32dda178117b46487c2165c0e08316",
"revCount": 136, "revCount": 138,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },

View file

@ -125,35 +125,9 @@
flake-parts.lib.mkFlake { inherit inputs; } ( flake-parts.lib.mkFlake { inherit inputs; } (
{ ... }: { ... }:
{ {
imports = [
inputs.treefmt.flakeModule
];
systems = [ systems = [
"x86_64-linux" "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 = flake =
let let