Update flake inputs #166

Merged
tlater merged 4 commits from tlater/update into master 2025-11-20 07:15:43 +00:00
Showing only changes of commit 92b257e1af - Show all commits

View file

@ -63,7 +63,6 @@
self, self,
nixpkgs, nixpkgs,
sops-nix, sops-nix,
deploy-rs,
... ...
}@inputs: }@inputs:
let let
@ -78,6 +77,25 @@
./configuration/hardware-specific/vm.nix ./configuration/hardware-specific/vm.nix
]; ];
}; };
# 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 {
inherit system;
overlays = [
inputs.deploy-rs.overlays.default
(_: prev: {
deploy-rs = {
inherit (nixpkgs.legacyPackages.${system}) deploy-rs;
inherit (prev.deploy-rs) lib;
};
})
];
})
deploy-rs
;
in in
{ {
################## ##################
@ -105,7 +123,7 @@
profiles.system = { profiles.system = {
user = "root"; user = "root";
path = deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.hetzner-1; path = deploy-rs.lib.activate.nixos self.nixosConfigurations.hetzner-1;
}; };
sshUser = "tlater"; sshUser = "tlater";
@ -159,7 +177,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.packages.${system}) default; inherit (deploy-rs) deploy-rs;
}; };
}; };