From 2a7feaec520c9dc820e28b70d6d75a79fafb238a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Gro=C3=9Fmann?= <patrickdgro@gmail.com>
Date: Sun, 14 Jan 2024 02:20:01 +0100
Subject: [PATCH] final setup elisabeth

---
 hosts/desktopnix/net.nix                       |   7 -------
 .../secrets/vaultwarden/vaultwarden-env.age    | Bin 952 -> 1098 bytes
 modules/services/adguardhome.nix               |   5 +++--
 modules/services/gitea.nix                     |   4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/hosts/desktopnix/net.nix b/hosts/desktopnix/net.nix
index f9f94e5..7309a48 100644
--- a/hosts/desktopnix/net.nix
+++ b/hosts/desktopnix/net.nix
@@ -12,11 +12,4 @@
       };
     };
   };
-  networking.extraHosts = ''
-    192.168.178.2 lel.lol
-    192.168.178.2 pw.lel.lol
-    192.168.178.2 nc.lel.lol
-    192.168.178.2 adguardhome.lel.lol
-    192.168.178.2 git.lel.lol
-  '';
 }
diff --git a/hosts/elisabeth/secrets/vaultwarden/vaultwarden-env.age b/hosts/elisabeth/secrets/vaultwarden/vaultwarden-env.age
index 1ee2049a5d09380f1558245962da699e516b1293..43b954a63037e28e5421d7f379764ed9343732ba 100644
GIT binary patch
literal 1098
zcmZwC`%fDM007`EPK6rDMr0;LM+X_qoTZQJajkBX_IiDBJ$iS&wpKu{?Qy;9wY|32
z*CC0KNwT5QNnExVH?!;kB0dr^GqNmkZiBHQWP;8JY-S75F|&n0vXEuEAD8$SeEArT
z)v(D(rX<OHD%qIIaN4|HrP-qn8X!n-R=dzt+~~5k23<BgZxwynTp-J#mLMbKO)ik&
zbg%P(fM=s2gjN;9#*&n#{4rlV<dZ>4f)yH9vR)ly0+K0HCXGX~qL5q^BOVD7pVvqR
zs7W345pmk0wwNO&4)jSJ9H9lHhbWR573!i*B9V6Ex;P~<R)p~&Ig2Mjsh}8DAkA?K
z^rm&XTo%$M@`ea$g6*avt8L<hWSAE-Nf8$n&tq1|&hf5-+G3<7J`i*XEm~WKNg54s
zh5>;%=4}zW2pMC%7|h~632^I0UPaj4v8(`-egF=ebb8)OI1GrLRxqa6Vs_%9=+b-L
z1q&%*=wlX?Pk3cQZ4n}7%9eI_k+~cJAd1QD2_;)d)(Szvq}I(MR3aZkjIivE8B``O
zRpdz;({(uv&Vrbw6(WFwM!yLAOBl|gAskY=^zk$y{QpY_v?5-rRfu`~K1>P*XhSK;
zkx)p=5nea}+npRPr6ir!@26BEVnXa`jAFcL7^Pi0UkWv%NHnZuBA6VO$yO+(cw(MH
z#AbZ-$`Oi&%dkwARns!*Q~P#BI=w9_iAngJ7Fg#=ga7rSKoUxT7N7<7)3~uzFaS+h
zrodSFya@=I+?-0I(WrB><fL1jZYyJz^-U=WbEFe+Om+md4m?1zByBV&V1$wap@?dJ
z=f@8xFJAs`js;&_p@epE^zPfvu?;8lyAK})?__@cdJS0{mhUedJoH}i{1QGfG*s57
zDtoQ!WxY@$mlLk2s(oyw;>XUH1|DcPG8eA-uKsYMZMm`H;77YRz-;yYUm7~l!O_jr
zPXNKE;-I_w)=b?f%C<g4S65@b${2H}W^wueHuTo~^#}D=s(NlMjLz6=>!!wkW_}ws
ze}ANU{m-^Kd`m;~Ir9Nkue5o~)WVU^qG#t9Cv8hN$!F>-q3(-4vwu%a5e-6eqTDk?
zj-8o3yH3tHLc#6d^j8$Fl@D4P_6}Vt+gR0y?Wz1yE8b;o-3!N=d&l2>{@4P)uXwY1
z++l&7-5Tli;;SdG!-q#!em}akrtr_?{Y2r}pnre)>ZxXcj-qYZy`Q_MC#OE`J=BpO
zvF{t0UOYB_9=vcxM7AL{b5GuW1=KfxGV*5oTDo!BmHVLc)K9hdDozhxdPA(e@!XCu
z-7~@8md<P%7~aA3U%uLJ{c!G&j$KtZp5FGw&UcnJ%{I?hwAW9Dh^_1S#g(t(=R*Bs
R-~P4zh1mNi`m&Xy{{r!CscHZK

literal 952
zcmY+<>uVbY00407aIjD+xDP6d1d0rrW$7ikJP?PM+$Fioy>iJVcd<T_%jI(EJ#vrS
zr8h*SIAQ8w!_El$p~Y>u7kjx)3&Ly%Y7ytam5GJ1Y+99y=s<+k%0Bp^f5DGmO%j8m
zCYVzlTh_H*x+#Smz!%)@=fWTeB>kO=KqhfKZ-J3?R8R1E5HuOQTf{0fN3})RvXQzb
zqNz!b@OgMx?J;#0uEq0Qp0B2@Jg&y=aE)xC9E&4xCF#Y`@kGvH?+YE-33kF@%+Hky
zlPu(iRHB#ZRmvcxla-=tSID>!ld&lTvY?zH%1xY!V0c#px<=g>B^bDstB@HTZ<7tV
z%5fZA29mh|ZZrz6XVNT+G;_sl7`8T9)r=&gt{)0x3Bw44r6l3tQIU|bu8Jljd@7Vg
z@?AHd(i=SFMj9f;WPEP5Vr4S1Ou0@m)t;W?5uUajl~r4W0%WT;7*Qk_qB*?cZn8i}
zrR{<r8pjPU+>B_H=87^!FgaEXWP357CTpA`Wk{#Wks&xFpklyR>^j1@<*Ly}(S}Pc
z6AnO@qIzm61{J6Xo2GbKF2GpB#E4DS|1UF3tJQK50;*a=F9*bUtF1zkIL<Lmqa#FM
zCebW4bT#TAQC~0Vrdgw4Cy+Qz^#CbVcg(OB<MBkVC3HB~f}wmwh^lQzzi(mkj%+(9
znPSZn{lW`7z0O33^BHYn94><pPPd^V;NS!dVuIqe+`3&tC0{TY^rxq~44vXbUMkVD
z=t6-@H!HFscX?hZPikO^H3dd-bjgVcJ|r}lKW-m>>Bi*|0sZ<FavA+6HT3xf@iXA%
zE7-`*(0ip9PkA#N`{3NMUxv>wEIu4hY+a9jl{~ulX8NG^=R-S}79TJ#pi9@@ebsyC
z^^IS(XZNG?=a<i{>^emJE>8QeCZ@OXcZ=tw-iOzp`=Ed8`%BHmpU-~x;QEh!{e5b7
zFnt3bdS-NH_!^1MJ-vE+ZGCQJX)7}P(?#JC;Nv@pl2w%_4$j_+jLMnQ<=^6i;LM?g
zx4zsC{Iz4>-L*g7?mxeWUyF`TdvEOhA$ECX;_;^*JNv14di&8mCx=cd=a#Fpr;fe$
z1#{-afw4zV0LQ=G*4@~$I^#S!_V<;GM+Pg0hm<?l2U~U@s88I!r^#>j=U2YD`mg3*
VB9E+o)Kd13EqucE3*5c%+<!)6Z)^Yn

diff --git a/modules/services/adguardhome.nix b/modules/services/adguardhome.nix
index b30e502..407b5f9 100644
--- a/modules/services/adguardhome.nix
+++ b/modules/services/adguardhome.nix
@@ -12,7 +12,7 @@
       bind_host = "0.0.0.0";
       dns = {
         bind_hosts = [(lib.net.cidr.host config.secrets.secrets.global.net.ips.${config.node.name} config.secrets.secrets.global.net.privateSubnet)];
-        anonymize_client_ip = true;
+        anonymize_client_ip = false;
         upstream_dns = [
           "1.0.0.1"
           "2606:4700:4700::1111"
@@ -27,7 +27,8 @@
         ];
       };
       user_rules = [
-        "||${config.secrets.secrets.global.domains.web}^$dnsrewrite=${lib.net.cidr.host config.secrets.secrets.global.net.ips.elisabeth config.secrets.secrets.global.net.privateSubnet}"
+        "||adguardhome.${config.secrets.secrets.global.domains.web}^$dnsrewrite=${lib.net.cidr.host config.secrets.secrets.global.net.ips.elisabeth config.secrets.secrets.global.net.privateSubnet}"
+        "||fritz.box^$dnsrewrite=${lib.net.cidr.host 1 config.secrets.secrets.global.net.privateSubnet}"
       ];
       dhcp.enabled = false;
       ratelimit = 60;
diff --git a/modules/services/gitea.nix b/modules/services/gitea.nix
index 0a40a6e..8af0d89 100644
--- a/modules/services/gitea.nix
+++ b/modules/services/gitea.nix
@@ -45,7 +45,7 @@ in {
       # federation.ENABLED = true;
       mailer = {
         ENABLED = true;
-        HOST = config.secrets.secrets.local.gitea.mail.host;
+        SMTP_ADDR = config.secrets.secrets.local.gitea.mail.host;
         FROM = config.secrets.secrets.local.gitea.mail.from;
         USER = config.secrets.secrets.local.gitea.mail.user;
         SEND_AS_PLAIN_TEXT = true;
@@ -77,7 +77,7 @@ in {
         DEFAULT_KEEP_EMAIL_PRIVATE = true;
       };
       session.COOKIE_SECURE = true;
-      ui.DEFAULT_THEME = "forgejo-auto";
+      ui.DEFAULT_THEME = "forgejo-dark";
       "ui.meta" = {
         AUTHOR = "Patrick";
         DESCRIPTION = "Tollstes Forgejo EU-West";