diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 15d1619..d587829 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -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 diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index d2930a7..e97a380 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -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 = [ diff --git a/nixos/modules/profiles/laptop.nix b/nixos/modules/profiles/laptop.nix index 117bdf4..397c04a 100644 --- a/nixos/modules/profiles/laptop.nix +++ b/nixos/modules/profiles/laptop.nix @@ -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; [