base: remove nixpkgs from closure of non-interactive systems

This commit is contained in:
Tim Schubert 2024-06-01 10:48:13 +02:00
parent 71e92dd437
commit 192734c323
Signed by: dadada
SSH key fingerprint: SHA256:bFAjFH3hR8zRBaJjzQDjc3o4jqoq5EZ87l+KXEjxIz0
3 changed files with 7 additions and 6 deletions

View file

@ -12,8 +12,7 @@ let
inherit system;
modules = [{
# Add flakes to registry and nix path.
dadada.inputs = inputs // { dadada = self; };
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
}] ++ (nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules;
};
@ -26,6 +25,7 @@ in
{
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
dadada.pkgs = self.packages.${system};
dadada.inputs = inputs // { dadada = self; };
}
nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1

View file

@ -16,10 +16,6 @@ in
time.timeZone = mkDefault "Europe/Berlin";
nix.nixPath = lib.mapAttrsToList (name: value: "${name}=${value}") inputs;
nix.registry = lib.mapAttrs' (name: value: lib.nameValuePair name { flake = value; }) inputs;
nix.settings.flake-registry = "${config.dadada.inputs.flake-registry}/flake-registry.json";
nix.settings.substituters = [ https://cache.nixos.org/ ];
nix.settings.trusted-public-keys = [

View file

@ -4,6 +4,7 @@
, ...
}:
let
inputs = config.dadada.inputs;
secretsPath = config.dadada.secrets.path;
in
with lib; {
@ -19,6 +20,10 @@ with lib; {
programs.ssh.enableAskPassword = true;
programs.nix-ld.enable = true;
nix.nixPath = lib.mapAttrsToList (name: value: "${name}=${value}") inputs;
nix.registry = lib.mapAttrs' (name: value: lib.nameValuePair name { flake = value; }) inputs;
nix.settings.flake-registry = "${config.dadada.inputs.flake-registry}/flake-registry.json";
age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
fonts.packages = mkDefault (with pkgs; [