From 5008dadfe6cc48cc0ac1447b5cf72660b8f5c615 Mon Sep 17 00:00:00 2001 From: batteredbunny Date: Sun, 27 Apr 2025 14:01:32 +0300 Subject: [PATCH] refactor: Use repo for kaya.ee website --- caddy.nix | 5 ++++- flake.lock | 23 ++++++++++++++++++++--- flake.nix | 5 +++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/caddy.nix b/caddy.nix index 7c447d3..83d1b14 100644 --- a/caddy.nix +++ b/caddy.nix @@ -30,7 +30,10 @@ resolvers 1.1.1.1 } - respond owo + root * ${inputs.kaya-website} + file_server browse { + hide .git + } ''; "http://syncthing.internal".extraConfig = '' @local remote_ip private_ranges 100.64.0.0/10 diff --git a/flake.lock b/flake.lock index 9795127..a483560 100644 --- a/flake.lock +++ b/flake.lock @@ -203,6 +203,22 @@ "type": "github" } }, + "kaya-website": { + "flake": false, + "locked": { + "lastModified": 1743667734, + "narHash": "sha256-UVWl4HsQdWMgAB7XdlqQxDQCQukx/ytDMTLK/5oeLoY=", + "ref": "refs/heads/main", + "rev": "464dc8fa1bd4cce584e516c4ee78ff0dfb49dd2e", + "revCount": 2, + "type": "git", + "url": "ssh://forgejo@forge.catnip.ee:2222/batteredbunny/kaya.ee" + }, + "original": { + "type": "git", + "url": "ssh://forgejo@forge.catnip.ee:2222/batteredbunny/kaya.ee" + } + }, "lastfm-status": { "inputs": { "flake-utils": "flake-utils_2", @@ -231,11 +247,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1745632480, - "narHash": "sha256-Rjr9Dh33zXciPbSgOSoYoOJ7gpvpJ+wy04WGIUOY+Nw=", + "lastModified": 1745719465, + "narHash": "sha256-7gBWRAyAmCEIi+U7RaAEBpw7c/0ldDYw0F5kJctkbhE=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "ad10d773fc3a39ace88f495c2c111a0bf7f5a481", + "rev": "4c1faad60f0a1a558983e45b2bfeeb6e194a9d28", "type": "github" }, "original": { @@ -335,6 +351,7 @@ "common-modules": "common-modules", "confess": "confess", "drasl": "drasl", + "kaya-website": "kaya-website", "lastfm-status": "lastfm-status", "nix-minecraft": "nix-minecraft", "nix-minecraft-plugin-upgrade": "nix-minecraft-plugin-upgrade", diff --git a/flake.nix b/flake.nix index 833203f..bd31057 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,11 @@ url = "git+ssh://forgejo@forge.catnip.ee:2222/batteredbunny/bsky.ee"; flake = false; }; + + kaya-website = { + url = "git+ssh://forgejo@forge.catnip.ee:2222/batteredbunny/kaya.ee"; + flake = false; + }; }; outputs =