From a94b2c9387379ad8f413c076d4e460ea0ad93ec9 Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jsw@jsw.tf>
Date: Tue, 30 Sep 2025 19:24:49 +0200
Subject: [PATCH 1/8] Updated path for derek-site start service

---
 system/server/derek-site.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/server/derek-site.nix b/system/server/derek-site.nix
index 97f6d43..dbb77b9 100644
--- a/system/server/derek-site.nix
+++ b/system/server/derek-site.nix
@@ -20,9 +20,10 @@
 
   path = builtins.concatStringsSep ":" (map (x: "${x}/bin/") [pkgs.coreutils pkgs.deno pkgs.git]);
   run = pkgs.writeShellScriptBin "geen-dolfijn" ''
-    cd "${programDir}"
+    export PATH="${path}"
     export $(grep -v '^#' "${config.age.secrets.${userGroup}.path}" | xargs)
 
+    cd "${programDir}"
     deno run preview
   '';
 in {

From ffa8959679f79086bf907d847896d5998fe32dd9 Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jsw@jsw.tf>
Date: Tue, 30 Sep 2025 19:37:44 +0200
Subject: [PATCH 2/8] derek-site added build command

---
 system/server/derek-site.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/server/derek-site.nix b/system/server/derek-site.nix
index dbb77b9..1893d28 100644
--- a/system/server/derek-site.nix
+++ b/system/server/derek-site.nix
@@ -56,7 +56,8 @@ in {
         git fetch
         git reset --hard origin/HEAD
 
-        DENO_DIR=${denoDir} deno i
+        DENO_DIR=${denoDir} deno i --allow-scripts=npm:workerd,npm:sharp
+        DENO_DIR=${denoDir} deno run build
       '';
 
       serviceConfig = {

From ba1a84fb7bf6904234782de21ff94eb284781ccd Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jsw@jsw.tf>
Date: Tue, 30 Sep 2025 20:00:51 +0200
Subject: [PATCH 3/8] Updated secret management for derek-site

---
 system/server/derek-site.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/server/derek-site.nix b/system/server/derek-site.nix
index 1893d28..4322d65 100644
--- a/system/server/derek-site.nix
+++ b/system/server/derek-site.nix
@@ -56,13 +56,15 @@ in {
         git fetch
         git reset --hard origin/HEAD
 
+        cp "${config.age.secrets.${userGroup}.path}" "./src/lib/secretData.json"
+
         DENO_DIR=${denoDir} deno i --allow-scripts=npm:workerd,npm:sharp
         DENO_DIR=${denoDir} deno run build
       '';
 
       serviceConfig = {
         StateDirectory = userGroup;
-        ExecStart = getExe run;
+        ExecStart = "${bash} -c 'cd ${programDir} && deno run previw'";
         User = userGroup;
         Group = userGroup;
         Restart = "always";

From 84a91f87f672393022e3ff3f7f4b1ef1ef3ace47 Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jsw@jsw.tf>
Date: Tue, 30 Sep 2025 20:27:02 +0200
Subject: [PATCH 4/8] Updated PATH and secret path for derek site

---
 system/server/derek-site.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/system/server/derek-site.nix b/system/server/derek-site.nix
index 4322d65..b6d709a 100644
--- a/system/server/derek-site.nix
+++ b/system/server/derek-site.nix
@@ -18,14 +18,7 @@
   programDir = "${mainDir}/program";
   denoDir = "${mainDir}/deno";
 
-  path = builtins.concatStringsSep ":" (map (x: "${x}/bin/") [pkgs.coreutils pkgs.deno pkgs.git]);
-  run = pkgs.writeShellScriptBin "geen-dolfijn" ''
-    export PATH="${path}"
-    export $(grep -v '^#' "${config.age.secrets.${userGroup}.path}" | xargs)
-
-    cd "${programDir}"
-    deno run preview
-  '';
+  path = builtins.concatStringsSep ":" (map (x: "${x}/bin/") [pkgs.coreutils pkgs.deno pkgs.git pkgs.nodejs]);
 in {
   options.niksos.server.${name}.enable = mkEnableOption name;
 
@@ -56,15 +49,15 @@ in {
         git fetch
         git reset --hard origin/HEAD
 
-        cp "${config.age.secrets.${userGroup}.path}" "./src/lib/secretData.json"
+        cp "${config.age.secrets.${userGroup}.path}" "./src/lib/secrets.json"
 
         DENO_DIR=${denoDir} deno i --allow-scripts=npm:workerd,npm:sharp
-        DENO_DIR=${denoDir} deno run build
+        DENO_DIR=${denoDir} deno run build || echo oopsie woopsie error
       '';
 
       serviceConfig = {
         StateDirectory = userGroup;
-        ExecStart = "${bash} -c 'cd ${programDir} && deno run previw'";
+        ExecStart = "${bash} -c 'cd ${programDir} && deno run preview --port 9010'";
         User = userGroup;
         Group = userGroup;
         Restart = "always";

From 97e86550fedee2d9fd13f733c9059427473732b0 Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jsw@jsw.tf>
Date: Tue, 30 Sep 2025 20:58:14 +0200
Subject: [PATCH 5/8] Updated derek-site secrets

---
 secrets/derek-site.age | Bin 995 -> 1022 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/secrets/derek-site.age b/secrets/derek-site.age
index bab4b4e3d1afd3708a965883cfc91512b76e8c85..83a3e347746bb18030263b07ddd0338154e025d6 100644
GIT binary patch
delta 935
zcmaFN{*QfvPQ7`uWl?yjyHk~=V_K$uibrXBRzQ@ePiAOQzOSKKMY3y3gt51Yc3wn!
zIag?2K~YdujzO@GWllzswwGT~gno{Xxo2ugs!wIGzIV7!j=pI?QGi#n1(&X!LUD11
zZfc5=si~o*f^S-od6=Vuv$IobiMLa3s<xlAYmiBJx|^?oiCa*PrGZ;zcz9q%rEi|Q
zM`=oyQ$SWWS9nf|zHe?`M1ZSDMvzaMzOP%jsauL?Wtw?vUa-EYr9owoai~FYN|K@H
z#E;_PrWK_I;YNNQA%^+dhAt+KWgbzP75UzIIa%JRK_U8OfvNdbp{{P`5f!0a1%9pp
zNr5Fn=7FVtfsW>0CZVO7+7&5*`QB+Jekp!gK>?|u6+VVxA+83K;~B-ny?pci{L71r
ze5=end@a*WiZZpG!pw`EQ?tzt%ZelQO^Z`g-1AGK!YV?!oE?KovP$z^Q`5{XtF%2L
z9FsC#0<v5@Jbay#OpH8@odN=alFSVv5;GzvpJf!U_f0k}%P(<ujxe<JFinigHVzB&
zcTWm14|l4n$Sh8;$j+;X2q+G7aSb-$%FfMmH+HOwO7RXTb;@yZGc<O0E^*FtOG$~c
z@Ggjq%n2|vHz*8sba!_|kAbkjN;88%g-k=wY*!;+*N_rVACG(wM}vBI4>zw+_hj$L
zKu=SnT*K6yLKBai(vpzOY_3f0@^W*da8KV-qmT&yfU1;mvn<bGj}ph!wDN3|0H3sC
z^ROhNtfZ8HY%X10U4<yG3{TITY)b>njQq5G%Rp28vgC+}^dyT6pRAIs9FL-6-=N&Q
z;ACH83ohFSN`;pb7FO2RI9&_r{CevDmB*JZtA1{1+^!w`Ojy*NXL?-xJ-f5g%qKd6
zb0-L#nxrWZ)6VyFU&nQ)_ne~H5g$&!z3=Gt(R`b>!>)?OHxkP%bD3q1|CiQ3#Z$R^
z?TR#CwkcN@apsj9Eqb`ps&oan$}WjTGp`E&mIzt5bN-UcjkjK!-0oAD^RWJ)V^CG7
zLEUndr*cNCKg$-}{xI!_!W0?vbBfg_3g(LatEMoAR2uB=YA`Wc8r_mQfxDdB{<g4f
zs#mo5v>gkW{=RX!xNU~krE6`KdI#*8;*Ebj=C^sfHvhWurEj5Z4<zJQq)W%>xZUmS
z6Y6}JWHE0CkNS6)+A~{hlfF1x`n(m9>#aTSIxWA_B%n&}*|zhO57oZC?3KwPzE9Xg
I?$~T&005?2F#rGn

delta 908
zcmeyz{+NA&PJK~CPO-C5R!L!iQ+i&RS!GaONm*rqW0FTorh#czl(%O|NP)g{qJ@*I
zD_3fuTbhe$YE^-UexXxXse6T?Np847Sg}ipiCbxEp>sw~rL&_;u6Klw1(&X!LUD11
zZfc5=si~o*f^S-od6=Vug;`WdM7VKip}$9xg-?WYu$yyfil=Evrk{nEMYwjEzL&Fp
zj-gqVXOxR4S5Sn$MMPkTQEotHYFV&fNkNv0wqs79kF!N`Nl->fnNg%^vU#CVkb!I9
z#E;_PM*9BYmM&)cx%y7N5#{B<t}Z62Mw#iESy=_nAr<<$j)tBA$%dsxZm#8AE~VOe
zp}zhu8AX{9g=JZWzP^T)&e?^=DH%RVg~^GY#;F#jIYwp9QI;l?;~B-nv(rqHGpe#H
ztICXw)62AjOZ_6vO-y_&DhmtEjDn&(5`CO=(k+Yp!m5(FJaco)a#DkfQ*%;HTtX~d
zyb|3^&9%K#d=k@&ii=Ewlhe|jLjxQ`3i3lIpJf!UcM8+@PYW?EtjKcBNhx*;b$3ki
zPjRwv3@R@v*UwHhGONf43rfy5(XUA6Dk~{VuPV-r42;O|@W>6;&NYk7b}R}haP`YF
zFz|9s5A`rfGtTx)bWSQpkAbkjN;88%g>*~fh|)qAUw8e2l2prr+_L&WN8glW^U6Yf
z7q{}@G*i!#H2unA$IQe~1FqEkVy|o?w;;=6S6}V)RMR}Os<2e^f;<y{PfPtk7pL6N
zaNj&1R}a@b6E0m{T?LOMm#`A&)QF&R)8e9nBJb4jjL4#LeUH#6<KW0r3lHzaipu=N
zu+r?Pd@g3UFGhZukyGj&yW7jxJz`>JzH7hr=UjHR15;;Z`f0ZxII!pvEBn3aYqr+3
za(;Y$P3=WdXlVH^hSfqRc-p=CwZ1%i&f9&&)@=3J9KKssDX&+boYL24xold~yfyE8
zdx8$>9AB(@*)~tAx#Y})v^2~Adk_4G+WUcvMfY}p3773R=J$Im{z;xVqf%cR+*`W8
zbKZLInk}vindDE|Oyty=uYC7F^polH9=uul=VdC-(<i?#q_UoESM2F_o65ozwk76y
zXf}g;hTpfhVytU3-!uyvRISk|mlwI%W@}crBhvnXzn3dVS7`9oAJe{{pRwTeoT)R!
huO!6$El~}hutUa4dz#we`WL@XYkrMVU_MbT2mp;6R|fz9


From 4a8d03dd57444b460bcaba4c42154bc9b69a0bf1 Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jsw@jsw.tf>
Date: Tue, 30 Sep 2025 20:59:58 +0200
Subject: [PATCH 6/8] Updated derek site port and changed to normal user
 temporarily

---
 hosts/lapserv/default.nix    | 1 +
 secrets/default.nix          | 2 +-
 system/server/derek-site.nix | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hosts/lapserv/default.nix b/hosts/lapserv/default.nix
index 4f334ec..0ef1e8c 100644
--- a/hosts/lapserv/default.nix
+++ b/hosts/lapserv/default.nix
@@ -10,6 +10,7 @@
     server = {
       baseDomain = "jsw.tf";
       derek-bot.enable = true;
+      derek-site.enable = true;
       forgejo = {
         enable = true;
         subDomain = "git";
diff --git a/secrets/default.nix b/secrets/default.nix
index ebb6d1c..1c8f789 100644
--- a/secrets/default.nix
+++ b/secrets/default.nix
@@ -23,7 +23,7 @@ in {
       owner = "derek-bot";
     };
     derek-site = isEnabled "derek-site" {
-      file = ./derek-bot.age;
+      file = ./derek-site.age;
       owner = "derek-site";
     };
     # matrix-registration = isEnabled "matrix" {
diff --git a/system/server/derek-site.nix b/system/server/derek-site.nix
index b6d709a..da9b058 100644
--- a/system/server/derek-site.nix
+++ b/system/server/derek-site.nix
@@ -48,6 +48,7 @@ in {
         cd "${programDir}"
         git fetch
         git reset --hard origin/HEAD
+        rm -rf build || echo no build here lol
 
         cp "${config.age.secrets.${userGroup}.path}" "./src/lib/secrets.json"
 
@@ -57,7 +58,7 @@ in {
 
       serviceConfig = {
         StateDirectory = userGroup;
-        ExecStart = "${bash} -c 'cd ${programDir} && deno run preview --port 9010'";
+        ExecStart = "${bash} -c 'cd ${programDir} && deno run preview --host --port 9010'";
         User = userGroup;
         Group = userGroup;
         Restart = "always";
@@ -68,7 +69,7 @@ in {
     users.groups.${userGroup} = {};
     users.users.${userGroup} = {
       group = userGroup;
-      isSystemUser = true;
+      isNormalUser = true;
     };
   };
 }

From 5bbb29bbab16bdeeaf895fbe47789880fdfa5dc6 Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jsw@jsw.tf>
Date: Tue, 30 Sep 2025 21:25:06 +0200
Subject: [PATCH 7/8] Added caddy to derek-site

---
 system/server/derek-site.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/system/server/derek-site.nix b/system/server/derek-site.nix
index da9b058..c98deb9 100644
--- a/system/server/derek-site.nix
+++ b/system/server/derek-site.nix
@@ -23,6 +23,9 @@ in {
   options.niksos.server.${name}.enable = mkEnableOption name;
 
   config = mkIf cfg {
+    services.caddy.virtualHosts."geen-dolfijn.nl".extraConfig = ''
+      reverse_proxy http://127.0.0.1:9010
+    '';
     systemd.services.${userGroup} = {
       enable = true;
       after = ["network.target"];

From 30e06f058f80c3bd630b13fffdb2027a84dc4b07 Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jsw@jsw.tf>
Date: Tue, 30 Sep 2025 21:28:17 +0200
Subject: [PATCH 8/8] Derek site remove maxruntime

---
 system/server/derek-site.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/server/derek-site.nix b/system/server/derek-site.nix
index c98deb9..377fdc2 100644
--- a/system/server/derek-site.nix
+++ b/system/server/derek-site.nix
@@ -65,7 +65,6 @@ in {
         User = userGroup;
         Group = userGroup;
         Restart = "always";
-        RuntimeMaxSec = 1 * 60 * 60; # 1h * 60min * 60s
       };
     };