Compare commits
3 commits
324d2d94f3
...
245dd2c657
| Author | SHA1 | Date | |
|---|---|---|---|
| 245dd2c657 | |||
| 3b65c63912 | |||
| 4b86ff5e7b |
1 changed files with 14 additions and 17 deletions
13
flake.nix
13
flake.nix
|
|
@ -81,21 +81,18 @@
|
|||
# deploy-rs unfortunately uses an `import nixpkgs`, and its
|
||||
# library functions depend on an instantiated nixpkgs, so we
|
||||
# can't get around multi-nixpkgs-eval.
|
||||
inherit
|
||||
(import nixpkgs {
|
||||
deployRsPackages = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
inputs.deploy-rs.overlays.default
|
||||
(_: prev: {
|
||||
(final: prev: {
|
||||
deploy-rs = {
|
||||
inherit (nixpkgs.legacyPackages.${system}) deploy-rs;
|
||||
inherit (prev.deploy-rs) lib;
|
||||
};
|
||||
})
|
||||
];
|
||||
})
|
||||
deploy-rs
|
||||
;
|
||||
};
|
||||
in
|
||||
{
|
||||
##################
|
||||
|
|
@ -123,7 +120,7 @@
|
|||
|
||||
profiles.system = {
|
||||
user = "root";
|
||||
path = deploy-rs.lib.activate.nixos self.nixosConfigurations.hetzner-1;
|
||||
path = deployRsPackages.deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.hetzner-1;
|
||||
};
|
||||
|
||||
sshUser = "tlater";
|
||||
|
|
@ -177,7 +174,7 @@
|
|||
|
||||
packages = nixpkgs.lib.attrValues {
|
||||
inherit (sops-nix.packages.${system}) sops-import-keys-hook sops-init-gpg-key;
|
||||
inherit (deploy-rs) deploy-rs;
|
||||
inherit (deployRsPackages.deploy-rs) deploy-rs;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue