Compare commits

..

2 commits

View file

@ -81,10 +81,18 @@
# deploy-rs unfortunately uses an `import nixpkgs`, and its # deploy-rs unfortunately uses an `import nixpkgs`, and its
# library functions depend on an instantiated nixpkgs, so we # library functions depend on an instantiated nixpkgs, so we
# can't get around multi-nixpkgs-eval. # can't get around multi-nixpkgs-eval.
deploy-rs = deployRsPackages = import nixpkgs {
(inputs.deploy-rs.overlays.default nixpkgs.legacyPackages.${system} inherit system;
nixpkgs.legacyPackages.${system} overlays = [
).deploy-rs; inputs.deploy-rs.overlays.default
(final: prev: {
deploy-rs = {
inherit (nixpkgs.legacyPackages.${system}) deploy-rs;
inherit (prev.deploy-rs) lib;
};
})
];
};
in in
{ {
################## ##################
@ -112,7 +120,7 @@
profiles.system = { profiles.system = {
user = "root"; user = "root";
path = deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.hetzner-1; path = deployRsPackages.deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.hetzner-1;
}; };
sshUser = "tlater"; sshUser = "tlater";
@ -166,7 +174,7 @@
packages = nixpkgs.lib.attrValues { packages = nixpkgs.lib.attrValues {
inherit (sops-nix.packages.${system}) sops-import-keys-hook sops-init-gpg-key; inherit (sops-nix.packages.${system}) sops-import-keys-hook sops-init-gpg-key;
inherit (deploy-rs) deploy-rs; inherit (deployRsPackages.deploy-rs) deploy-rs;
}; };
}; };