Compare commits
2 commits
b6aee33d8b
...
3b65c63912
| Author | SHA1 | Date | |
|---|---|---|---|
| 3b65c63912 | |||
| 4b86ff5e7b |
2 changed files with 26 additions and 14 deletions
17
flake.lock
generated
17
flake.lock
generated
|
|
@ -299,18 +299,15 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760782625,
|
"lastModified": 1763509821,
|
||||||
"narHash": "sha256-qeSmHF66cMiHObiBhm8IngmqDBEcqNdBSSoAjuE6tTw=",
|
"narHash": "sha256-ibZr0ONEUA1W2WAdTzgm9/6jBE+tM20j1YW2FK4RZ/k=",
|
||||||
"owner": "nixos",
|
"rev": "659aa6fa27619d04de231b4cc0c938905dfa01e9",
|
||||||
"repo": "nixpkgs",
|
"type": "tarball",
|
||||||
"rev": "f2ee78c4eb601be36a277e1779a7a87655419dad",
|
"url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.812929.659aa6fa2761/nixexprs.tar.xz?lastModified=1763509821&rev=659aa6fa27619d04de231b4cc0c938905dfa01e9"
|
||||||
"type": "github"
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"type": "tarball",
|
||||||
"ref": "nixos-25.05-small",
|
"url": "https://channels.nixos.org/nixos-25.05-small/nixexprs.tar.xz"
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"pre-commit-hooks": {
|
"pre-commit-hooks": {
|
||||||
|
|
|
||||||
23
flake.nix
23
flake.nix
|
|
@ -2,7 +2,7 @@
|
||||||
description = "tlater.net host configuration";
|
description = "tlater.net host configuration";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05-small";
|
nixpkgs.url = "https://channels.nixos.org/nixos-25.05-small/nixexprs.tar.xz";
|
||||||
|
|
||||||
## Nix/OS utilities
|
## Nix/OS utilities
|
||||||
|
|
||||||
|
|
@ -63,7 +63,6 @@
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
sops-nix,
|
sops-nix,
|
||||||
deploy-rs,
|
|
||||||
...
|
...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
let
|
let
|
||||||
|
|
@ -78,6 +77,22 @@
|
||||||
./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.
|
||||||
|
deployRsPackages = import nixpkgs {
|
||||||
|
inherit system;
|
||||||
|
overlays = [
|
||||||
|
inputs.deploy-rs.overlays.default
|
||||||
|
(final: prev: {
|
||||||
|
deploy-rs = {
|
||||||
|
inherit (nixpkgs.legacyPackages.${system}) deploy-rs;
|
||||||
|
inherit (prev.deploy-rs) lib;
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
##################
|
##################
|
||||||
|
|
@ -105,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";
|
||||||
|
|
@ -159,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.packages.${system}) default;
|
inherit (deployRsPackages.deploy-rs) deploy-rs;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue