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

Compare commits

base: tlaternet:324d2d94f3cbe99951626eb4d9b2b323ccd98d25
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:245dd2c6570e6e8332d7e8a2fb1a9652adfbfbcf
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

3 commits
324d2d94f3 ... 245dd2c657

Author SHA1 Message Date
Tristan Daniël Maat
245dd2c657
update: Update flake inputs 2025-11-20 14:49:28 +08:00
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 51 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

72
flake.lock generated
View file

@ -77,11 +77,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1756719547, "lastModified": 1762286984,
"narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=", "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2", "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -123,11 +123,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760701190, "lastModified": 1762276996,
"narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -145,11 +145,11 @@
"pyproject-nix": "pyproject-nix" "pyproject-nix": "pyproject-nix"
}, },
"locked": { "locked": {
"lastModified": 1763413832, "lastModified": 1735160684,
"narHash": "sha256-dkqBwDXiv8MPoFyIvOuC4bVubAP+TlVZUkVMB78TTSg=", "narHash": "sha256-n5CwhmqKxifuD4Sq4WuRP/h5LO6f23cGnSAuJemnd/4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "5658fba3a0b6b7d5cb0460b949651f64f644a743", "rev": "8ce6284ff58208ed8961681276f82c2f8f978ef4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -245,11 +245,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757786467, "lastModified": 1761916399,
"narHash": "sha256-gx3THVUlpycVrUFC9vGhAtYRLI7dJtHyo67Zdq5Hadc=", "narHash": "sha256-wLZ8km5ftKlIDdHJrFiDQivXc5b+7DRxmBp2347H5g8=",
"owner": "reckenrode", "owner": "reckenrode",
"repo": "nix-foundryvtt", "repo": "nix-foundryvtt",
"rev": "1bbc26a28d320fb336d94e9f3cc6b92c035fab20", "rev": "8cceb7af3dfbe465b5108db5c098b097edf85790",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -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": {
@ -366,11 +363,11 @@
"slimlock": "slimlock" "slimlock": "slimlock"
}, },
"locked": { "locked": {
"lastModified": 1750754571, "lastModified": 1728546539,
"narHash": "sha256-qquerCyD6WhVccAV0qI7NFGwSN7rXslhogPrTaFvWto=", "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=",
"owner": "thomashoneyman", "owner": "thomashoneyman",
"repo": "purescript-overlay", "repo": "purescript-overlay",
"rev": "81513816356c43c6ef604abdf5da41834306a2d5", "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -380,23 +377,18 @@
} }
}, },
"pyproject-nix": { "pyproject-nix": {
"inputs": { "flake": false,
"nixpkgs": [
"tlaternet-webserver",
"dream2nix",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1762427963, "lastModified": 1702448246,
"narHash": "sha256-CkPlAbIQ87wmjy5qHibfzk4DmMGBNqFer+lLfXjpP5M=", "narHash": "sha256-hFg5s/hoJFv7tDpiGvEvXP0UfFvFEDgTdyHIjDVHu1I=",
"owner": "pyproject-nix", "owner": "davhau",
"repo": "pyproject.nix", "repo": "pyproject.nix",
"rev": "4540ea004e04fcd12dd2738d51383d10f956f7b9", "rev": "5a06a2697b228c04dd2f35659b4b659ca74f7aeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "pyproject-nix", "owner": "davhau",
"ref": "dream2nix",
"repo": "pyproject.nix", "repo": "pyproject.nix",
"type": "github" "type": "github"
} }
@ -481,11 +473,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760393368, "lastModified": 1763607916,
"narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=", "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437", "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b",
"type": "github" "type": "github"
}, },
"original": { "original": {

23
flake.nix
View file

@ -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;
}; };
}; };