Compare commits
3 commits
324d2d94f3
...
245dd2c657
| Author | SHA1 | Date | |
|---|---|---|---|
| 245dd2c657 | |||
| 3b65c63912 | |||
| 4b86ff5e7b |
1 changed files with 14 additions and 17 deletions
31
flake.nix
31
flake.nix
|
|
@ -81,21 +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.
|
||||||
inherit
|
deployRsPackages = import nixpkgs {
|
||||||
(import nixpkgs {
|
inherit system;
|
||||||
inherit system;
|
overlays = [
|
||||||
overlays = [
|
inputs.deploy-rs.overlays.default
|
||||||
inputs.deploy-rs.overlays.default
|
(final: prev: {
|
||||||
(_: prev: {
|
deploy-rs = {
|
||||||
deploy-rs = {
|
inherit (nixpkgs.legacyPackages.${system}) deploy-rs;
|
||||||
inherit (nixpkgs.legacyPackages.${system}) deploy-rs;
|
inherit (prev.deploy-rs) lib;
|
||||||
inherit (prev.deploy-rs) lib;
|
};
|
||||||
};
|
})
|
||||||
})
|
];
|
||||||
];
|
};
|
||||||
})
|
|
||||||
deploy-rs
|
|
||||||
;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
##################
|
##################
|
||||||
|
|
@ -123,7 +120,7 @@
|
||||||
|
|
||||||
profiles.system = {
|
profiles.system = {
|
||||||
user = "root";
|
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";
|
sshUser = "tlater";
|
||||||
|
|
@ -177,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;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue