diff --git a/common/global/default.nix b/common/global/default.nix index 16d645a..bec37a8 100644 --- a/common/global/default.nix +++ b/common/global/default.nix @@ -18,7 +18,6 @@ ./programs.nix ./ssh.nix ./snapshot_manager.nix - ../../python ]; boot = { diff --git a/common/global/programs.nix b/common/global/programs.nix index bb69bd1..57d8819 100644 --- a/common/global/programs.nix +++ b/common/global/programs.nix @@ -2,5 +2,6 @@ { environment.systemPackages = with pkgs; [ git + my_python ]; } diff --git a/overlays/default.nix b/overlays/default.nix index 943263b..dded516 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -14,4 +14,24 @@ config.allowUnfree = true; }; }; + + python-env = final: _prev: { + my_python = final.python313.withPackages ( + ps: with ps; [ + apprise + apscheduler + mypy + polars + pyfakefs + pytest + pytest-cov + pytest-mock + pytest-xdist + requests + ruff + typer + types-requests + ] + ); + }; } diff --git a/python/default.nix b/python/default.nix deleted file mode 100644 index 57e8bc4..0000000 --- a/python/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = [ - (pkgs.python313.withPackages ( - ps: with ps; [ - apprise - apscheduler - mypy - polars - pyfakefs - pytest - pytest-cov - pytest-mock - pytest-xdist - requests - ruff - typer - types-requests - ] - )) - ]; -} diff --git a/systems/jeeves/runners/nix_builder.nix b/systems/jeeves/runners/nix_builder.nix index 8181bbd..8f27709 100644 --- a/systems/jeeves/runners/nix_builder.nix +++ b/systems/jeeves/runners/nix_builder.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + config, + lib, + outputs, + ... +}: with lib; @@ -69,6 +74,10 @@ in StrictHostKeyChecking no UserKnownHostsFile /dev/null ''; + nixpkgs = { + overlays = builtins.attrValues outputs.overlays; + config.allowUnfree = true; + }; services.github-runners.${name} = { enable = true; replace = true; @@ -83,6 +92,7 @@ in nixos-rebuild openssh treefmt + my_python ]; }; users = {