diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix index 0cd3e271..6b7644be 100644 --- a/ci/flake-cron.nix +++ b/ci/flake-cron.nix @@ -1,6 +1,5 @@ { lib, - channels, config, ... }: @@ -39,7 +38,7 @@ with lib; { step.flake-update = { name = "flake update build"; order = 500; - run = "${channels.nixpkgs.lix}/bin/nix run .#nf-update"; + run = "nix run .#nf-update"; env = { CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; diff --git a/ci/nodes.nix b/ci/nodes.nix index 7a8109c3..a5ad3ba2 100644 --- a/ci/nodes.nix +++ b/ci/nodes.nix @@ -39,7 +39,7 @@ in { step.${name} = { name = "build system closure for ${name}"; 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 = { CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; @@ -54,7 +54,7 @@ in { step.${name} = { name = "build home closure for ${name}"; 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 = { CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; @@ -73,11 +73,11 @@ in { jobs = let genericNixosBuildJob = name: _system: nameValuePair "nixos-${name}" (_: { - #imports = [ ./packages.nix ]; + imports = [./packages.nix]; }); genericHomeBuildJob = name: _system: nameValuePair "home-${name}" (_: { - #imports = [ ./packages.nix ]; + imports = [./packages.nix]; }); nixosBuildJobs = mapAttrs' genericNixosBuildJob enabledNixosSystems; homeBuildJobs = mapAttrs' genericHomeBuildJob enabledHomeSystems; diff --git a/ci/packages.nix b/ci/packages.nix index 4303a340..5b96e4da 100644 --- a/ci/packages.nix +++ b/ci/packages.nix @@ -5,6 +5,7 @@ in { devShell.inputs = with legacyPackages.x86_64-linux; [ deploy-rs terraform + lix tflint alejandra deadnix