feat: derangement++

This commit is contained in:
Kat Inskip 2025-08-18 15:29:03 -07:00
parent c0e1ae5d62
commit d331480b42
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
3 changed files with 6 additions and 6 deletions

View file

@ -1,6 +1,5 @@
{ {
lib, lib,
channels,
config, config,
... ...
}: }:
@ -39,7 +38,7 @@ with lib; {
step.flake-update = { step.flake-update = {
name = "flake update build"; name = "flake update build";
order = 500; order = 500;
run = "${channels.nixpkgs.lix}/bin/nix run .#nf-update"; run = "nix run .#nf-update";
env = { env = {
CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}";
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";

View file

@ -39,7 +39,7 @@ in {
step.${name} = { step.${name} = {
name = "build system closure for ${name}"; name = "build system closure for ${name}";
order = 500; order = 500;
run = "${channels.nixpkgs.lix}/bin/nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS"; run = "nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS";
env = { env = {
CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}";
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
@ -54,7 +54,7 @@ in {
step.${name} = { step.${name} = {
name = "build home closure for ${name}"; name = "build home closure for ${name}";
order = 500; order = 500;
run = "${channels.nixpkgs.lix}/bin/nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home"; run = "nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home";
env = { env = {
CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}";
CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
@ -73,11 +73,11 @@ in {
jobs = let jobs = let
genericNixosBuildJob = name: _system: genericNixosBuildJob = name: _system:
nameValuePair "nixos-${name}" (_: { nameValuePair "nixos-${name}" (_: {
#imports = [ ./packages.nix ]; imports = [./packages.nix];
}); });
genericHomeBuildJob = name: _system: genericHomeBuildJob = name: _system:
nameValuePair "home-${name}" (_: { nameValuePair "home-${name}" (_: {
#imports = [ ./packages.nix ]; imports = [./packages.nix];
}); });
nixosBuildJobs = mapAttrs' genericNixosBuildJob enabledNixosSystems; nixosBuildJobs = mapAttrs' genericNixosBuildJob enabledNixosSystems;
homeBuildJobs = mapAttrs' genericHomeBuildJob enabledHomeSystems; homeBuildJobs = mapAttrs' genericHomeBuildJob enabledHomeSystems;

View file

@ -5,6 +5,7 @@ in {
devShell.inputs = with legacyPackages.x86_64-linux; [ devShell.inputs = with legacyPackages.x86_64-linux; [
deploy-rs deploy-rs
terraform terraform
lix
tflint tflint
alejandra alejandra
deadnix deadnix