diff --git a/flake.lock b/flake.lock index 8f37317..ec6c98f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1770019181, - "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=", + "lastModified": 1785116464, + "narHash": "sha256-O5bnHIzOkp2SQl0eCqKIqKzjgy2u0GXirTKSUdwER4Q=", "owner": "serokell", "repo": "deploy-rs", - "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171", + "rev": "4f4179edae9a9dd31339284c8334072e3a110528", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1780290312, - "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=", + "lastModified": 1781152676, + "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", "owner": "nix-community", "repo": "disko", - "rev": "115e5211780054d8a890b41f0b7734cafad54dfe", + "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", "type": "github" }, "original": { @@ -74,39 +74,25 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1780203844, - "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=", + "lastModified": 1785090369, + "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4", + "rev": "624af665418d3c65d544145b4d34ad696439570e", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-26.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1778672786, - "narHash": "sha256-Tf7q8/0aIwg4Btd/GUMNHXDTqlrWTr5o/vZ8euFUAQY=", - "rev": "eef00dfd8a712b34af845f9350bac681b1228bd1", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre997230.eef00dfd8a71/nixexprs.tar.xz?lastModified=1778672786&rev=eef00dfd8a712b34af845f9350bac681b1228bd1" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" - } - }, "root": { "inputs": { "deploy-rs": "deploy-rs", "disko": "disko", - "nixpkgs": "nixpkgs_2", - "tranquil": "tranquil" + "nixpkgs": "nixpkgs_2" } }, "systems": { @@ -124,25 +110,6 @@ "type": "github" } }, - "tranquil": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1780165382, - "narHash": "sha256-kGB5jFwghMsjlAoS4mj94s9peo7PL54UKTH/3TS567w=", - "ref": "v0.6.4", - "rev": "7e4c9e1daba4b72906d0a37c504302ec48228963", - "revCount": 388, - "type": "git", - "url": "https://tangled.org/tranquil.farm/tranquil-pds" - }, - "original": { - "ref": "v0.6.4", - "type": "git", - "url": "https://tangled.org/tranquil.farm/tranquil-pds" - } - }, "utils": { "inputs": { "systems": "systems" diff --git a/flake.nix b/flake.nix index f79c900..6132dd6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,11 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; deploy-rs.url = "github:serokell/deploy-rs"; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - tranquil.url = "git+https://tangled.org/tranquil.farm/tranquil-pds?ref=v0.6.4"; }; outputs = { @@ -14,7 +13,6 @@ nixpkgs, deploy-rs, disko, - tranquil, ... }: let lib = nixpkgs.lib; @@ -47,7 +45,6 @@ hosts = { seer = { modules = [ - tranquil.nixosModules.default ./hosts/seer/services/caddy.nix ./hosts/seer/services/tranquil.nix ./hosts/seer/services/uptime-kuma.nix diff --git a/hosts/seer/services/caddy.nix b/hosts/seer/services/caddy.nix index cb8b39b..3fb26c5 100644 --- a/hosts/seer/services/caddy.nix +++ b/hosts/seer/services/caddy.nix @@ -6,7 +6,7 @@ "github.com/caddy-dns/porkbun@v0.3.1" "tangled.org/vvill.dev/caddy-atproto-auth@v0.0.0-20260325082745-9a8362340d91" ]; - hash = "sha256-aNCpwjyE6aLIu9WF9zYtDtCJRBClmbtebnXQkd6Je80="; + hash = "sha256-Q1dCjziReFDIFnDhYeEpu4WRfGBkIDD+FCf2F7rNwtg="; }; environmentFile = "/var/secrets/caddy.env"; globalConfig = ''