From b90fdb0b8f1aeaaa9d8922b84566a99ecc8aad1a Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jsw@jsw.tf>
Date: Wed, 17 Sep 2025 09:00:12 +0000
Subject: [PATCH] Made pr worky

---
 hosts/lapserv/hardware-configuration.nix |  53 +++++++++++++----------
 secrets/jsw-bot.age                      | Bin 1425 -> 1427 bytes
 system/server/jsw-bot.nix                |   8 ++--
 system/server/lib/extractWebOptions.nix  |   6 +--
 4 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/hosts/lapserv/hardware-configuration.nix b/hosts/lapserv/hardware-configuration.nix
index 5d3b114..282444c 100644
--- a/hosts/lapserv/hardware-configuration.nix
+++ b/hosts/lapserv/hardware-configuration.nix
@@ -1,39 +1,44 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot = {
-    initrd.availableKernelModules = ["xhci_pci" "ahci" "sd_mod"];
-    initrd.kernelModules = [];
-    kernelModules = ["kvm-intel"];
-    extraModulePackages = [];
-  };
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
 
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/33b7e681-d92a-40db-a172-b797591a1e2e";
+  # fileSystems."/" =
+  #   { device = "/dev/disk/by-uuid/33b7e681-d92a-40db-a172-b797591a1e2e";
+  #     fsType = "ext4";
+  #   };
+  #
+  # fileSystems."/boot" =
+  #   { device = "/dev/disk/by-uuid/0BEA-7525";
+  #     fsType = "vfat";
+  #     options = [ "fmask=0022" "dmask=0022" ];
+  #   };
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/2ce4b2b1-0083-43b2-bd8d-0e8cd21b1ef6";
       fsType = "ext4";
     };
 
-    "/boot" = {
-      device = "/dev/disk/by-uuid/0BEA-7525";
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/AE71-FD70";
       fsType = "vfat";
-      options = ["fmask=0022" "dmask=0022"];
+      options = [ "fmask=0022" "dmask=0022" ];
     };
-  };
-  swapDevices = [];
 
-  networking.useDHCP = lib.mkDefault true;
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/f5af06e8-e285-4565-abc3-fdd0ddde4736"; }
+    ];
+
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/secrets/jsw-bot.age b/secrets/jsw-bot.age
index 3e8c6a9e9ad3a0ef67e30611c4a5f9e57c4077f3..425482db78d0cd39ac23485018e42d0de87da0fb 100644
GIT binary patch
delta 1343
zcmbQpJ(+ugPJMZ3pucI5nPGaOPo`0Ed6G%GcT%!<ZiQc%X<0^blyP!mT84gvNp?;~
zGMA5wg|C-ErB9{4QIfg2TZxm0VW^kCS9VE+c6yReuurmfa%5Cisd0u+K9{bYLUD11
zZfc5=si~o*f^S-od6=Vue^P#Fa$=;VL4-xBVTwydm|Lh*xN&N>N2H;<p;>vVPi}Tf
zl(At!pi5Rcm#=e%zOhM8R(?T*X<C$bs$Z&+nV-3@PpWrDiI1~Kp<k%Cc1n6da-mb;
z#E;_P?v^IzVP?6xj+RAcC9bJa86~cT5$R6pMrH<%zM-ZePA-WSCFN;_Q7(a8PF}e=
z<t~MOUVg>i?yd%vIYt&qW*+7##qNd%enm+k1(n*y1%|o75t*Tr;~B-n%ff<F45Iv_
z3__FjGYee&%|pt}(=Bt2OmeD<DuODK+(O-gEeZnNEi!$%w986@L;YPns<O?>T--gi
z6VuH-%q>f`%R?hf%9BDo(u<PZikuz2Gs1l*pJf!U_cks~cTFmcs!S~m_AJdyOpJ1N
z4AhQDiA-_#FwAkwh{}n|FEK1jDl1Rt3eHO^Gf4_D_e%9G_N>r12&nWbaxQf<st7T5
z2~Q5La>)xajC2h4Ds#t(fv~_zGlM{dT+0yc<h&dY|0Iia(?Da-^m^AEKMUXdM3d4&
z=bWOf-~f|!6R)I-(x4n)uBbrmLPz(oz@Sn;r_zf2<T6*Ma_5{-b0=fBQqwYn44+Kn
z;6!i7#C#V6E?r$+h14Xoa38OfG}j83Y_G~f{iNLDP?y3ylVlhD<fIVis46EX=Yrh8
zved$4F8R{?7v-7)UF+wV>CV2|k`nz&bh$YDEv2od#s@btE-i^Z@Kyf0W!IgIrY*<B
z{)X8ye`#2_;z#Ks<q7tizFk~iE_lxO{SS`+ZQrsPn4$v~><ikX7rO9Q@U*zQWtz!n
zSW2$B#N3*7tmxZkt}LD}&+qJ+%B-ufYx%0no(9*YZr%8H$mQzx6Uq~fzt#J63hGJ=
z#N^#*GVQ1jxF^1A_QJwr{nHCFZDfyEh*gDXGwx~apK!Z_JxZunD0_dF&_i{%n1s`|
z@y3yNjyw{2#P59b!p1{}6;rCiWmw*wJR^|I^DHU5UU;_N%f)w=WFN|ZR^ETtyjf_%
zJugk(!kq7KZ*F7kO+1?Fry=3+SYu~>=9T4rpN0Jtg8%MOJ8=2>`|Pyb;`^01|5{$X
zcxk!o*~!{#r}qE9mR5W3$Z4O8KepX#TJ6B_&yM|!aBWZZr)pJBbH7#Ga<QTz;qP^-
z7cW=%@!66woJ-}1y5Px6LC3236xYjz%2>p*H%+KH(z3?5)O7Wc{l6v^Tk+Z+S*GW4
zV?%xT+Vl-;#k!YD3ATGz`u>)TH;p}+*VE0Ux5(kf4b}zO<<F%=`))cPdCuL$!8PgW
z<)hYeS6?pl<5A@1uG_arl5drgM@-SlLtFJWyLGJf{W6>R`-(lAXWo7|xw+mxb3tOC
zV~t;!LUHXi)$Y<V-5vLJTy|Ksd;NZ$$x|)z-FNek`nkc)B?84<GOtai#V)?d@uqMx
zSD?JY_9q*(gRecY{Wb4`&CCVqSvGtNbC)Sx;SwzBjQ_e`yvT7AXHM##RVS|Q3gvA$
zEM_jV#~~-~(x-D<Ht9ZDe@K`AU6-uwCn3+AH-D?S`o%-!INvZXi&%W$*W|?;fm2_O
z`ZB-2tDpUOt<*8I|GWBZG#A(|+<d%dLW7;QiR3)KPMbMv9zRVEm7lS~T+7@lY{u=q
VJTvbtooFJtk!x9Kd!1hP3IO?bB>n&Z

delta 1341
zcmbQtJ&}8YPJK$Ke`-onl}~u0fmfJ&W=g3=ke`Q(wxdyUp_`Lyd1kPYac+jbX{u9}
zBbUFWxns7uTcue>VNpm{aA8=0TY;BFMU|;zriGD#dxd^+L{WKUMYfT1B$uw8LUD11
zZfc5=si~o*f^S-od6=U@x`mHvdQeJ=iBnlonQxZ9v71v#WmJi?lTVg*p-+01OI3uM
zo3m-Ae|}gbSAkh@Wrm4kRIqEfmxX?mb4W<AiLZ~RNqA9?zp+PXO1i$UqmM;eYGl5}
z#E;_PWhJJ5$q{J*`k_W;ZZ1iwd2S}29wnX?`pK!em1QZG?#77*1=^u0+D4vS`jM8I
zL5^j4q5fV0=6U61kwtFK1r<JSMNX+^N!h+3k!2pH1_kMf;Yrz(;~B-neZpK)y?l!*
z0y0Y7J%e*Sqsjt(GXpXb9ZRDkoIJHHeZ3r0j6#wOf^#CdJX}2U3=I=2Oq~l|lC`5s
z%1pEi%Mv4s3%p7K!b>u}3XLn=%?q+EL$qBdpJf!U&-BhP%Qp58sjN(@%&m+v3QZ~v
z^{k30Pjd5cb+7OU^zyYxPc+QVvUIoLs)(ovF)~dp_jL{k3(C*42+_{ac5_aRstnK6
zH?)i@Otx?>_V-9BHa7D`kAbkjN;88%g=}N5)KWjoVoSsDk}A*e@TB^ZsxpfZ%kYSh
zu)K<>qLfra7xVNA!wBt6Pp%?=cUO}%!%U|vFE>X^_nZu4NAr;IDDU#T?5I>{$I_zg
zs<M)ZR0|)MaxPt6U4_gnOTWYjgP@?4qP!&M<PhJ|g2JdW@9^9bH<PTia-;IB;?&UM
z<ibKTU#_cFj(OtV@(1cw9jm^HuTtC4HbdzLOGaB~_jP_LmP&7T-+lUjSF8C>w#bgJ
zzxB9bwb-he(x#%^C(|X>LfO72hRL4U9QnUto`A{2)_vRD_B)FAWS?3(@qvTY#gHGT
z!hh*Y^i=*Syt30p^O2`?`qK#R$1M4C`tt8D{kJu6mw@B*pKCVm<KT0dSMPnlV9xep
znfSEDGf(MWc)q?RhD$c?)2jDUHMNsYeLdo|tm#Je8!6jZ-32-M+g{80Ii6Bqrf}~_
z-iPNl59QjHO?WJpn1AJ!u63jvk5YXP52KbWTgRflET#JB)2nYD;9h8P&>(Ma((#lk
znG!yq_d6<fS>+ke*{vB8SQa64wW+9nj*|S-s13VUe4OxoA6Hu4rTMqGH{E<7vCwJu
zy2U^H7Eh7M%wKAM!D*qNs_O)2<InAPedLmpwp}W?|8mk~X{}oCFul_=YKoatXQsS0
zEl=-W*%Wcd|9V2%kJ)cDxX!2Y?&Lr0y>oKMzZ|P=$7|NC+8?oFfn1i+_o&o4)7W}~
z=4aF=@ErEp@OrnjT#vp^9#>IMQu5{(nv&%@HaQ6uUPj@Hmd{;<IXr@2e-xQ`<yqW*
zKIKo%kKTU~7eD=X)-}h)`j2*O>9*bW@m+=&Ye3np|L;<E+CGZzdam&{wSDuo)J;`x
zk7lwzIFM`o)1&jrq53(Ak-iyIGe4<aS1_FOZSm$S|Lbk?gk72fp6zPlo^yiXS@}hi
ztFyw-Fn$zat~#6fkWoi+*}?hNF%$R8o)Ix$Q!Ucx!BJ@4vVE%7o<7w+#<kZrxu5d=
zn)Y-iFRSA@>(lpVKbH6;srRSmP~u<BgFzQwGB8iOX}tZ;#V@A>0v}hN`YGNksco&A
zpZc45>!Kx3Z+>5R&Sdh}FYzvGqlz>7SLj&1&$x0h@2LK+r`x6`|EhL~UH#LDp)dB=
V=3VFb`vO!}TkkLZG;hwizW_fgF984m

diff --git a/system/server/jsw-bot.nix b/system/server/jsw-bot.nix
index 3e6f25c..3ca37a4 100644
--- a/system/server/jsw-bot.nix
+++ b/system/server/jsw-bot.nix
@@ -13,7 +13,7 @@
 
   bash = getExe pkgs.bash;
 
-  mainDir = "/var/lib/dcbot/";
+  mainDir = "/var/lib/${name}/";
   programDir = mainDir + "program";
   dataDir = mainDir + "data";
   denoDir = mainDir + "deno";
@@ -71,12 +71,12 @@ in {
       };
     };
 
-    users.groups."dcbot" = {
+    users.groups.${name} = {
       members = optional nextcloud.enable "nextcloud"; #TODO: if config.niksos.server.nextcloud
       #NOTE: for nextcloud mounted folder
     };
-    users.users."dcbot" = {
-      group = "dcbot";
+    users.users.${name} = {
+      group = name;
       isSystemUser = true;
     };
   };
diff --git a/system/server/lib/extractWebOptions.nix b/system/server/lib/extractWebOptions.nix
index 3d2245c..805fea1 100644
--- a/system/server/lib/extractWebOptions.nix
+++ b/system/server/lib/extractWebOptions.nix
@@ -11,8 +11,8 @@
     then ""
     else "${cfg.subDomain}.";
 in
+  cfg // 
   {
-    domain = "${subDomain}.${baseDomain}";
-    inherit baseDomain;
+    domain = "${subDomain}${baseDomain}";
+    inherit baseDomain subDomain;
   }
-  // cfg