From ccb6890f9360c00de57b530c16d9646dd68ff65b Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Mon, 18 Aug 2025 15:35:45 -0700 Subject: [PATCH] feat: hmm? --- ci/flake-cron.nix | 2 +- ci/nodes.nix | 8 +++++--- home/profiles/common/nix.nix | 13 ++++++++----- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix index 6b7644be..032423d4 100644 --- a/ci/flake-cron.nix +++ b/ci/flake-cron.nix @@ -38,7 +38,7 @@ with lib; { step.flake-update = { name = "flake update build"; order = 500; - run = "nix run .#nf-update"; + run = "${channels.nixpkgs.lix}/bin/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 a5ad3ba2..d7318945 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 = "nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS"; + run = "${channels.nixpkgs.lix}/bin/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 = "nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home"; + run = "${channels.nixpkgs.lix}/bin/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 }}"; @@ -77,7 +77,9 @@ in { }); genericHomeBuildJob = name: _system: nameValuePair "home-${name}" (_: { - imports = [./packages.nix]; + imports = [ + ./packages.nix + ]; }); nixosBuildJobs = mapAttrs' genericNixosBuildJob enabledNixosSystems; homeBuildJobs = mapAttrs' genericHomeBuildJob enabledHomeSystems; diff --git a/home/profiles/common/nix.nix b/home/profiles/common/nix.nix index f65bf8eb..e2b3ca4a 100644 --- a/home/profiles/common/nix.nix +++ b/home/profiles/common/nix.nix @@ -1,9 +1,12 @@ -_: { +{pkgs, ...}: { # TODO: add the same treatment as the other nix gc script - nix.gc = { - automatic = true; - frequency = "weekly"; - persistent = true; + nix = { + gc = { + automatic = true; + frequency = "weekly"; + persistent = true; + }; + package = pkgs.lix; }; # adds to nixpkgs.overlay, made irrelevant due to `home-manager.useGlobalPkgs` #chaotic.nyx.overlay.enable = false;