From 2b841f6af5632a81836ead7dd10b9c008c4102f3 Mon Sep 17 00:00:00 2001 From: mtgmonkey Date: Thu, 18 Dec 2025 11:06:04 +0100 Subject: [PATCH] update Hauptseite --- flake.lock | 66 ++++++++++++++++++++++++++++++++++----------- flake.nix | 5 +++- services/ferron.nix | 3 ++- 3 files changed, 56 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 4dea6c9..0c77e25 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "andromeda-nook": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1766051731, + "narHash": "sha256-D4xdcXOdSa+PclNb9QbxOXHNCGAHjksGriLBcFc+UQ8=", + "ref": "refs/heads/master", + "rev": "73af6c13d7c710df50994ea967ab6ae6cf8c2b47", + "revCount": 2, + "type": "git", + "url": "https://git.mtgmonkey.net/Andromeda/nook" + }, + "original": { + "type": "git", + "url": "https://git.mtgmonkey.net/Andromeda/nook" + } + }, "blobs": { "flake": false, "locked": { @@ -18,7 +36,7 @@ }, "blog": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1766012874, @@ -118,7 +136,7 @@ }, "jank-client": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1749606892, @@ -136,7 +154,7 @@ }, "math-project": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1750258769, @@ -154,16 +172,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1765934234, + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "type": "indirect" } }, @@ -184,6 +202,21 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1749285348, "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", @@ -198,7 +231,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1748889542, "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", @@ -213,7 +246,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1765472234, "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", @@ -228,7 +261,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1714253743, "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", @@ -244,7 +277,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1759036355, "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", @@ -260,7 +293,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1760524057, "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", @@ -278,7 +311,7 @@ }, "noshell": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1717396029, @@ -296,10 +329,11 @@ }, "root": { "inputs": { + "andromeda-nook": "andromeda-nook", "blog": "blog", "jank-client": "jank-client", "math-project": "math-project", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "noshell": "noshell", "simple-nixos-mailserver": "simple-nixos-mailserver", "spacebar-server": "spacebar-server" @@ -310,7 +344,7 @@ "blobs": "blobs", "flake-compat": "flake-compat", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { @@ -331,7 +365,7 @@ "spacebar-server": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1761916341, diff --git a/flake.nix b/flake.nix index 5ca6a6d..7e45961 100755 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ noshell.url = "github:viperML/noshell"; spacebar-server.url = "github:spacebarchat/server"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + andromeda-nook.url = "git+https://git.mtgmonkey.net/Andromeda/nook"; blog.url = "git+https://git.mtgmonkey.net/Andromeda/blog"; jank-client.url = "git+https://git.mtgmonkey.net/Andromeda/jank-client-fork"; math-project.url = "git+https://git.mtgmonkey.net/Andromeda/math-project"; @@ -16,6 +17,7 @@ noshell, spacebar-server, simple-nixos-mailserver, + andromeda-nook, jank-client, math-project, blog, @@ -31,6 +33,7 @@ inherit spacebar-server; inherit simple-nixos-mailserver; inherit math-project; + inherit andromeda-nook; inherit blog; ssh-pub-keys = import ./ssh-pub-keys.nix; }; @@ -38,7 +41,7 @@ ./configuration.nix ./services/blog.nix - ./services/elmskell.nix + # ./services/elmskell.nix ./services/ferron.nix ./services/gitea.nix # ./services/mailserver.nix diff --git a/services/ferron.nix b/services/ferron.nix index 7f89953..4ac01f4 100755 --- a/services/ferron.nix +++ b/services/ferron.nix @@ -1,6 +1,7 @@ { lib, pkgs, + andromeda-nook, ... }: let ferron-conf-nix = { @@ -15,7 +16,7 @@ hosts = [ { domain = "mtgmonkey.net"; - proxyTo = "http://localhost:9080/"; + wwwroot = "${andromeda-nook}/wwwroot"; } { domain = "blog.mtgmonkey.net";