diff --git a/flake.lock b/flake.lock index 4acbf03..9b71c41 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1756115622, - "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "bafad29f89e83b2d861b493aa23034ea16595560", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1755060532, - "narHash": "sha256-wDDEjn0kJ089hKSqRvwj9kssYBCH2GeTuvrHY6oj6Ho=", + "lastModified": 1757995518, + "narHash": "sha256-QS0Inbhtu5tDAQ/d+lYoMnIfyUt97vQi38A07bzaVO0=", "ref": "main", - "rev": "ace72de1d38b5beb2d215ef1b241e3f7c1ecfdba", - "revCount": 64, + "rev": "4baae6ecd54f20cc17a9d9e9cf21cf5c0327eb7f", + "revCount": 71, "type": "git", "url": "https://git.sudoer777.dev/me/nix-flake-base.git" }, @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -128,11 +128,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1755960406, - "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", + "lastModified": 1757974173, + "narHash": "sha256-4DpXmct/2rcLgScT1CXOLr0TUeIlrBB1rnFqCOf5MUw=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", + "rev": "302af509428169db34f268324162712d10559f74", "type": "github" }, "original": { @@ -259,11 +259,11 @@ ] }, "locked": { - "lastModified": 1756125573, + "lastModified": 1756511062, "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", - "rev": "1c906dd92e032bcb5a27f98cf53833cae889537f", + "rev": "3f09a5eb772e02d98bb8878ab687d5b721f00d16", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/1c906dd92e032bcb5a27f98cf53833cae889537f.tar.gz?rev=1c906dd92e032bcb5a27f98cf53833cae889537f" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3f09a5eb772e02d98bb8878ab687d5b721f00d16.tar.gz?rev=3f09a5eb772e02d98bb8878ab687d5b721f00d16" }, "original": { "type": "tarball", @@ -294,11 +294,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { @@ -342,11 +342,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1756381814, - "narHash": "sha256-tzo7YvAsGlzo4WiIHT0ooR59VHu+aKRQdHk7sIyoia4=", + "lastModified": 1757873102, + "narHash": "sha256-kYhNxLlYyJcUouNRazBufVfBInMWMyF+44xG/xar2yE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aca2499b79170038df0dbaec8bf2f689b506ad32", + "rev": "88cef159e47c0dc56f151593e044453a39a6e547", "type": "github" }, "original": { @@ -384,11 +384,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1756451480, - "narHash": "sha256-XhTmZQcFni4y58BRhdH0y3QfKLWvQTi9b3BHXNT1VmE=", + "lastModified": 1757995555, + "narHash": "sha256-EBWdyEIzoN6RAuERELpZBTdwHIjit7Qms+DZTb9ivbg=", "ref": "main", - "rev": "2947e642fc5fd562a08d45841a43f509fcf5e2e6", - "revCount": 63, + "rev": "a084af08619a00fda420f5899ac0186c2d5624e0", + "revCount": 68, "type": "git", "url": "https://git.sudoer777.dev/me/nix-typst-resume.git" }, @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1758425756, + "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1756688979, - "narHash": "sha256-bVeg9CSlKrAzhwnJBgoPLNhm3GeO64HrLXHDQ4PSnsM=", + "lastModified": 1758285369, + "narHash": "sha256-WdkeIbq2Bo6l0tzBSCxMDeDMSKBp1iiOX7EdOHrsJCQ=", "owner": "numtide", "repo": "srvos", - "rev": "d6cdf08adfdb0b7f6e4d95075799f59dc6197681", + "rev": "30e6b4c2e5e7b235c7d0a266994a0c93e86bcf69", "type": "github" }, "original": { @@ -483,11 +483,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1755934250, - "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { diff --git a/targets/.terraform.lock.hcl b/targets/.terraform.lock.hcl index ea61208..6a5b3ea 100644 --- a/targets/.terraform.lock.hcl +++ b/targets/.terraform.lock.hcl @@ -2,36 +2,36 @@ # Manual edits may be lost in future updates. provider "registry.opentofu.org/cloudflare/cloudflare" { - version = "5.8.4" + version = "5.9.0" hashes = [ - "h1:wASpbo3Tol/fEpS/OyiE3GsS8t59mHVuCuf6IzNFap0=", + "h1:QhbZqHS2HlaiPhXI7g87hjrQcjXPa1uucuc2t/1bmaE=", ] } provider "registry.opentofu.org/hashicorp/external" { version = "2.3.5" hashes = [ - "h1:AGafpmdyJv4fnVGW0j8YtPd28xruAiO0EP3SaN3dNjM=", + "h1:dmkkU4HWegswy6mBlw/4BYlt2f3bj+XwtgW1gL/Z0DA=", ] } provider "registry.opentofu.org/hashicorp/local" { version = "2.5.3" hashes = [ - "h1:9E3hEY+IGg74z1S454Y64Cw8SVNu8pgbvnNUsB9FuiU=", + "h1:AIl2WkNGKY5muDxw7HspmrDhBkCK+749dkkcNOF6Nr4=", ] } provider "registry.opentofu.org/hashicorp/null" { version = "3.2.4" hashes = [ - "h1:LdLP3hw3OC6YW5sE0hzhr3G+Kf79IgYEXph2RTD64c4=", + "h1:9vGaqswdqRRRQIHr++4IcYOdk2M/GTb2HGlerhB2V6A=", ] } provider "registry.opentofu.org/hetznercloud/hcloud" { version = "1.52.0" hashes = [ - "h1:26qJSKc5UFRMx6Et3pqn40GlGocbvPe7CUD4Y7yWuN0=", + "h1:mMi8sKs23kBw/EfbWFe+RhwguNp210j9z+B64OkvbpQ=", ] } diff --git a/targets/admins/terraform.tf b/targets/admins/terraform.tf index 6ec1b48..a543555 100644 --- a/targets/admins/terraform.tf +++ b/targets/admins/terraform.tf @@ -1,6 +1,8 @@ module "vpn" { source = "../../terraform/admins" ssh_keys = { - sudoer777 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWUVBj2uBVfXGjWwXmOTQmqP1oc2ZfDtylhTEox6JBm ssh@sudoer777.dev" + asahi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWUVBj2uBVfXGjWwXmOTQmqP1oc2ZfDtylhTEox6JBm ssh@sudoer777.dev" + nix-on-droid = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOHumcpMW1hlppKQ+yC/L+mothO4Yr79RIl4iqu8ATpE nix-on-droid@localhost" + hpenvy = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPADv+67M3y3Fec9OukCCs7sj4G4iGx7U9FNvBhmDLm2 root@hpenvy" } } diff --git a/targets/vpn/configuration.nix b/targets/vpn/configuration.nix index c265918..9361396 100644 --- a/targets/vpn/configuration.nix +++ b/targets/vpn/configuration.nix @@ -91,7 +91,7 @@ in enable = true; package = pkgs.caddy.withPlugins { plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ]; - hash = "sha256-AcWko5513hO8I0lvbCLqVbM1eWegAhoM0J0qXoWL/vI="; + hash = "sha256-j+xUy8OAjEo+bdMOkQ1kVqDnEkzKGTBIbMDVL7YDwDY="; }; globalConfig = '' dns cloudflare {env.CLOUDFLARE_API_TOKEN} diff --git a/targets/vpn/nixos-vars.json b/targets/vpn/nixos-vars.json index b05ccae..fff9e4e 100644 --- a/targets/vpn/nixos-vars.json +++ b/targets/vpn/nixos-vars.json @@ -1 +1 @@ -{"domain_netname":"sudoer777.dev","domain_realname":"ethanreece.com","hostname":"vpn","ipv4_address":"5.78.133.184","ipv6_address":"2a01:4ff:1f0:ce35::1","ssh_keys":["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWUVBj2uBVfXGjWwXmOTQmqP1oc2ZfDtylhTEox6JBm ssh@sudoer777.dev"]} \ No newline at end of file +{"domain_netname":"sudoer777.dev","domain_realname":"ethanreece.com","hostname":"vpn","ipv4_address":"5.78.133.184","ipv6_address":"2a01:4ff:1f0:ce35::1","ssh_keys":["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOHumcpMW1hlppKQ+yC/L+mothO4Yr79RIl4iqu8ATpE nix-on-droid@localhost","ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWUVBj2uBVfXGjWwXmOTQmqP1oc2ZfDtylhTEox6JBm ssh@sudoer777.dev","ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPADv+67M3y3Fec9OukCCs7sj4G4iGx7U9FNvBhmDLm2 root@hpenvy"]} \ No newline at end of file