From 9e54dd70cc87e4367f4814ab4f69887470be21d4 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Wed, 10 Sep 2025 22:06:48 -0400 Subject: [PATCH] fix CI --- .forgejo/workflows/main.yml | 2 +- dot_config/flake/flake.lock | 64 +++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/main.yml b/.forgejo/workflows/main.yml index 0ee11fe..d5bdf15 100644 --- a/.forgejo/workflows/main.yml +++ b/.forgejo/workflows/main.yml @@ -47,7 +47,7 @@ jobs: with: packages: nh script: | - nix build ./dot_config/flake#nixosConfigurations.${{matrix.hostname}} --cores 1 -j1 + nix build ./dot_config/flake#nixosConfigurations.${{matrix.hostname}}.config.system.build.toplevel --cores 1 -j1 # - uses: https://github.com/workflow/nix-shell-action@v3 # if: runner.os == 'macOS' diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index 8518473..1a952b2 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -145,6 +145,26 @@ "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" } }, + "helix": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1757513370, + "narHash": "sha256-uaTDniIFWEv6PXs6s9wRFAcoumBaUZCiZ4hzlNWeJAE=", + "owner": "helix-editor", + "repo": "helix", + "rev": "209558645a0a00660e74b0e14e6ec0a0b1fac590", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "rev": "209558645a0a00660e74b0e14e6ec0a0b1fac590", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -169,7 +189,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -335,6 +355,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1757347588, "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", @@ -350,7 +386,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1757408970, "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", @@ -434,14 +470,36 @@ "inputs": { "darwin": "darwin", "determinate": "determinate", + "helix": "helix", "home-manager": "home-manager", "niri": "niri", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "noctalia": "noctalia", "quickshell": "quickshell_2" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "helix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1740623427, + "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828,