From 269aa59fdbd54b8e3999400831bfa8d2a1e684e6 Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Wed, 29 Oct 2025 00:05:36 +0100 Subject: [PATCH] Revert --- package-lock.json | 6 ++-- server/default.nix | 70 ++++++++++++++++++++++++++++++++++++-- src/components/Nav.astro | 2 +- src/components/Track.astro | 34 ++++++------------ src/pages/tracks.astro | 11 +----- 5 files changed, 83 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5794fd0..d5e9aa4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5806,9 +5806,9 @@ } }, "node_modules/vite": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.0.tgz", - "integrity": "sha512-oLnWs9Hak/LOlKjeSpOwD6JMks8BeICEdYMJBf6P4Lac/pO9tKiv/XhXnAM7nNfSkZahjlCZu9sS50zL8fSnsw==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz", + "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==", "license": "MIT", "peer": true, "dependencies": { diff --git a/server/default.nix b/server/default.nix index 65aad47..f55c24c 100644 --- a/server/default.nix +++ b/server/default.nix @@ -1,4 +1,9 @@ -{ pkgs, config, ... }: +{ + pkgs, + config, + lib, + ... +}: { imports = [ ./hardware-configuration.nix @@ -53,6 +58,22 @@ proxyWebsockets = true; }; }; + "git.thilohohlt.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}"; + proxyWebsockets = true; + }; + }; + "music.thilohohlt.com" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://localhost:${toString config.services.navidrome.settings.Port}"; + proxyWebsockets = true; + }; + }; }; }; redlib = { @@ -60,8 +81,53 @@ port = 2222; address = "127.0.0.1"; }; + gitea = { + enable = true; + database = { + type = "postgres"; + host = "/run/postgresql"; + port = 5432; + }; + settings = { + server = { + HTTP_ADDR = "127.0.0.1"; + HTTP_PORT = 3333; + }; + service = { + DISABLE_REGISTRATION = true; + }; + session = { + COOKIE_SECURE = true; + }; + }; + }; + navidrome = { + enable = true; + settings = { + Port = 4444; + Address = "127.0.0.1"; + MusicFolder = "/home/thohlt/Music"; + }; + }; + postgresql = { + enable = true; + ensureDatabases = [ "gitea" ]; + ensureUsers = [ + { + name = "gitea"; + ensureDBOwnership = true; + } + ]; + }; }; + systemd.tmpfiles.rules = [ + "a /home/thohlt - - - - u:navidrome:--x" + "A /home/thohlt/Music - - - - u:navidrome:r-X,d:u:navidrome:r-X" + ]; + + systemd.services.navidrome.serviceConfig.ProtectHome = lib.mkForce false; + security = { acme = { acceptTerms = true; @@ -80,5 +146,5 @@ ]; }; - system.stateVersion = "25.10"; + system.stateVersion = "25.11"; } diff --git a/src/components/Nav.astro b/src/components/Nav.astro index 27c2ce1..b8d524a 100644 --- a/src/components/Nav.astro +++ b/src/components/Nav.astro @@ -6,7 +6,7 @@ import Button from "./Button.astro"; const routes = ["blog", "tracks", "services"]; --- -