tlaternet/tlaternet-server
1
0
Fork 0
Code Issues 8 Pull requests Activity

Compare commits

base: tlaternet:b6aee33d8b15f3d8f8f9a3c9d82d9ffb2eecb957
Branches Tags
tlaternet:master
tlaternet:tlater/ntfy-as-contact
tlaternet:tlater/vendor-webserver
tlaternet:tlater/authelia-attempt-3
tlaternet:tlater/authelia-2
tlaternet:tlater/crowdsec-whitelists
tlaternet:tlater/authelia
...
compare: tlaternet:3b65c63912cf902984ef2ec2a534f458376f9d1e
Branches Tags
tlaternet:master
tlaternet:tlater/ntfy-as-contact
tlaternet:tlater/vendor-webserver
tlaternet:tlater/authelia-attempt-3
tlaternet:tlater/authelia-2
tlaternet:tlater/crowdsec-whitelists
tlaternet:tlater/authelia

2 commits
b6aee33d8b ... 3b65c63912

Author SHA1 Message Date
Tristan Daniël Maat
3b65c63912
chore(flake): Switch to channel tarball for nixpkgs input 2025-11-20 14:48:43 +08:00
Tristan Daniël Maat
4b86ff5e7b
chore(devshell): Use deploy-rs from nixpkgs for binary caching 2025-11-20 14:48:43 +08:00
2 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
flake.lock generated
View file

@ -299,18 +299,15 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1760782625,
"narHash": "sha256-qeSmHF66cMiHObiBhm8IngmqDBEcqNdBSSoAjuE6tTw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f2ee78c4eb601be36a277e1779a7a87655419dad",
"type": "github"
"lastModified": 1763509821,
"narHash": "sha256-ibZr0ONEUA1W2WAdTzgm9/6jBE+tM20j1YW2FK4RZ/k=",
"rev": "659aa6fa27619d04de231b4cc0c938905dfa01e9",
"type": "tarball",
"url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.812929.659aa6fa2761/nixexprs.tar.xz?lastModified=1763509821&rev=659aa6fa27619d04de231b4cc0c938905dfa01e9"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05-small",
"repo": "nixpkgs",
"type": "github"
"type": "tarball",
"url": "https://channels.nixos.org/nixos-25.05-small/nixexprs.tar.xz"
}
},
"pre-commit-hooks": {

23
flake.nix
View file

@ -2,7 +2,7 @@
description = "tlater.net host configuration";
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
@ -63,7 +63,6 @@
self,
nixpkgs,
sops-nix,
deploy-rs,
...
}@inputs:
let
@ -78,6 +77,22 @@
./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
{
##################
@ -105,7 +120,7 @@
profiles.system = {
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";
@ -159,7 +174,7 @@
packages = nixpkgs.lib.attrValues {
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;
};
};