diff --git a/flake.lock b/flake.lock index 996f31a..57802dd 100644 --- a/flake.lock +++ b/flake.lock @@ -99,6 +99,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -195,9 +213,10 @@ "home-manager": "home-manager_2", "nixpkgs": "nixpkgs", "stable": "stable", - "tilde": "tilde", + "tasiaiso-vulpecula-zone": "tasiaiso-vulpecula-zone", "tildefriends": "tildefriends", - "vedirect-reader": "vedirect-reader" + "vedirect-reader": "vedirect-reader", + "vulpecula-zone": "vulpecula-zone" } }, "stable": { @@ -276,7 +295,22 @@ "type": "github" } }, - "tilde": { + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tasiaiso-vulpecula-zone": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ @@ -284,17 +318,17 @@ ] }, "locked": { - "lastModified": 1727957314, - "narHash": "sha256-2VEUOb4IsCnVq8fkRSOC2b8vAOXQJwRoqOwKAThaRTs=", - "ref": "refs/heads/master", - "rev": "1f5525d260d7ecddac2a13dce5a89b2789062816", - "revCount": 64, + "lastModified": 1727959305, + "narHash": "sha256-j+7pLGrjMIAuCvuyoS9aNESmXpwHniZV0mr0wAsZJfM=", + "ref": "refs/heads/main", + "rev": "faed0287bbbb2914bbd54ef835caa17469dec469", + "revCount": 66, "type": "git", - "url": "https://gitea.com/tasiaiso/tilde" + "url": "https://git.vulpecula.zone/tasiaiso/tasiaiso.vulpecula.zone" }, "original": { "type": "git", - "url": "https://gitea.com/tasiaiso/tilde" + "url": "https://git.vulpecula.zone/tasiaiso/tasiaiso.vulpecula.zone" } }, "tildefriends": { @@ -335,6 +369,27 @@ "type": "git", "url": "https://gitea.com/tasiaiso/vedirect-reader" } + }, + "vulpecula-zone": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "stable" + ] + }, + "locked": { + "lastModified": 1727959676, + "narHash": "sha256-fNSxDDY+B3Ov3KyCHDbpTGBo4GLCGkppJ+Bq714QcdE=", + "ref": "refs/heads/main", + "rev": "f2cbbd49717fafe605dad082552587d95c571910", + "revCount": 3, + "type": "git", + "url": "https://git.vulpecula.zone/tasiaiso/vulpecula.zone" + }, + "original": { + "type": "git", + "url": "https://git.vulpecula.zone/tasiaiso/vulpecula.zone" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 753f97c..7ddb671 100644 --- a/flake.nix +++ b/flake.nix @@ -20,8 +20,12 @@ tildefriends.url = "git+https://dev.tildefriends.net/cory/tildefriends?ref=main"; vedirect-reader.url = "git+https://gitea.com/tasiaiso/vedirect-reader"; - tilde = { - url = "git+https://gitea.com/tasiaiso/tilde"; + tasiaiso-vulpecula-zone = { + url = "git+https://git.vulpecula.zone/tasiaiso/tasiaiso.vulpecula.zone"; + inputs.nixpkgs.follows = "stable"; + }; + vulpecula-zone = { + url = "git+https://git.vulpecula.zone/tasiaiso/vulpecula.zone"; inputs.nixpkgs.follows = "stable"; }; # home-manager = { @@ -49,7 +53,8 @@ # nix-software-center, tildefriends, agenix, - tilde, + tasiaiso-vulpecula-zone, + vulpecula-zone, ... } @ inputs: let inherit (self) outputs; diff --git a/hosts/vulpecula/configuration.nix b/hosts/vulpecula/configuration.nix index b86af17..7f47b64 100644 --- a/hosts/vulpecula/configuration.nix +++ b/hosts/vulpecula/configuration.nix @@ -56,7 +56,12 @@ in { virtualHosts."vulpecula.zone" = { addSSL = true; enableACME = true; - root = inputs.tilde.packages.x86_64-linux.default; + root = inputs.vulpecula-zone; + }; + virtualHosts."tasiaiso.vulpecula.zone" = { + addSSL = true; + enableACME = true; + root = inputs.tasiaiso-vulpecula-zone; }; virtualHosts."git.vulpecula.zone" = { addSSL = true;