From 48541f1d8a07d064b591bd2f20adde8525a6b941 Mon Sep 17 00:00:00 2001
From: Adithya Nair <adtya@adtya.xyz>
Date: Fri, 2 Jun 2023 23:40:36 +0530
Subject: [PATCH] rico2: setup the proofs subdomain

---
 home/programs/git.nix                |   2 +-
 hosts/rico2/containers/adtya.xyz.nix |   1 -
 hosts/rico2/services/caddy.nix       |  10 ++++++++--
 hosts/rico2/services/frpc.nix        |  10 ++++++++++
 hosts/rico2/services/ssh.nix         |   2 +-
 secrets.nix                          | Bin 1421 -> 1425 bytes
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/home/programs/git.nix b/home/programs/git.nix
index d3b8513..ff25c73 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -9,7 +9,7 @@ in {
     userEmail = user.primary.emailAddress;
     userName = user.primary.realName;
     signing = {
-      key = user.primary.signingKey;
+      key = user.primary.pgpFingerprint;
       signByDefault = true;
     };
     extraConfig = {
diff --git a/hosts/rico2/containers/adtya.xyz.nix b/hosts/rico2/containers/adtya.xyz.nix
index d127fc1..b0573b7 100644
--- a/hosts/rico2/containers/adtya.xyz.nix
+++ b/hosts/rico2/containers/adtya.xyz.nix
@@ -5,7 +5,6 @@
   };
 
   services.caddy.virtualHosts."adtya.xyz" = {
-    hostName = "adtya.xyz";
     serverAliases = ["www.adtya.xyz"];
     extraConfig = ''
       reverse_proxy http://127.0.0.1:3000
diff --git a/hosts/rico2/services/caddy.nix b/hosts/rico2/services/caddy.nix
index 13c8511..5762372 100644
--- a/hosts/rico2/services/caddy.nix
+++ b/hosts/rico2/services/caddy.nix
@@ -1,8 +1,14 @@
 {...}: let
-  caddy_config = (import ../../../secrets.nix).caddy_config;
+  secrets = import ../../../secrets.nix;
 in {
   services.caddy = {
     enable = true;
-    email = caddy_config.email;
+    email = secrets.caddy_config.email;
+
+    virtualHosts."proofs.adtya.xyz" = {
+      extraConfig = ''
+        redir https://keyoxide.org/hkp/${secrets.users.primary.pgpFingerprint}
+      '';
+    };
   };
 }
diff --git a/hosts/rico2/services/frpc.nix b/hosts/rico2/services/frpc.nix
index 00ade7a..7b1b955 100644
--- a/hosts/rico2/services/frpc.nix
+++ b/hosts/rico2/services/frpc.nix
@@ -45,5 +45,15 @@ in {
     type = https
     custom_domains = www.adtya.xyz
     local_port = 443
+
+    [http.proofs.adtya.xyz]
+    type = http
+    custom_domains = proofs.adtya.xyz
+    local_port = 80
+
+    [https.proofs.adtya.xyz]
+    type = https
+    custom_domains = proofs.adtya.xyz
+    local_port = 443
   '';
 }
diff --git a/hosts/rico2/services/ssh.nix b/hosts/rico2/services/ssh.nix
index a315eac..0e47ec2 100644
--- a/hosts/rico2/services/ssh.nix
+++ b/hosts/rico2/services/ssh.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{...}: {
   services.openssh = {
     enable = true;
     settings = {
diff --git a/secrets.nix b/secrets.nix
index 4ac9c6f6511c9ec4c738b88e5ba8b4774632fe82..422aa588aed6c6818f3886f8b93051c19ec91fab 100644
GIT binary patch
literal 1425
zcmV;C1#bEPM@dveQdv+`03T@A|LH<X%hbNeYwnX%4O3rJ;V!)sRL+&Z-OD|e4}B$<
zg`<>Ax2K(@@L3SzhdnelKjjjq<F-w6{G^yLnaQ9U<qF5P{NxXtR!SyMNbme`Lq`gt
zK>OSn6qSlA2Lm@xUQEkdIKWg=1|LQpVk>sY{Uu2+DqSIikNnuIV6(o_OLHrTF;fU)
z;ccho8D>3QrNA6R#>Y9K8i{f$6mCCqH{SW*JhB5OV%_~nRrMAur&@p`PvVi&r#p#L
z#6<Bsj-A{4_z3BBU#0Q0sm=xX?>T=&w1|;~MOz_5j-&o5pBWk{uWVjTCn6R29oG#$
z^9_+gXB;_MFD&bY&qlUR<B*$pBcOO9hdH8Schb!0w!=*;0ZBS`)}=FIq}e|*{BwAQ
zbeZAV1V5D1XSb@MRzBtA71seY&k?Pldc+ZQoQT0StHGjkDLz2@rN@x`^7nOquKaWe
z+g-AglH^WzLno_-Y+M}SDfBleMKS;HozMg~Rs4oSQt*}=NbOkU)Ho&`$^Ex0r`X-1
z&4mm{Y*X<J6;D5mG`nE7rtMuuCYJ%>eaCJLiETmOjfC&{tgSrR^$wzeiku%Skj#eB
zTmeQ@@n>!VVQI?BP3AI7;hR(qq<zB0eD36p@@=g?_ocX=pbKlcZw^F>k*LI@PQjWF
zU*Z5wRL{4LtZGIhvHP@#(wN=+3)9miiL9hzER>jFQEQ*O2U&GrGP^C$H4Y;xEZ+)o
zk-YZVrC)G$=y@e(@87#BndF#=BC5RJ)N;$R`?0l<Ar0ipgj7EcXTbs8<O(0k{#^Ie
z*u;kwL~A&IoPOXm$J?q_ftPdwZx*i}xU{f7ik|<g4~Wr=<3_S5&41`wHK+r(2e|OZ
z(k#dc1u&3~HxDB+0;EfM%`|A+=2@4euBWdMTr`)SL<G(V{c&1FOo|}0tuS;8nmIH4
z7X1Dp)L9*RW-)*t@Ri%jYU39f1pg67ZlKyPcVCgEHEc}=_&+wHi`AX-5_xY94HtHX
z3t%U!2{bQwW^qU=%#DKmhjX2k5JZ-<P0i_>0rxQb_N<L}hk0+&`%)O$TMXFt42k&#
z4gX1gx4bqsBp;>k)G*y(f$gExb4(E?fOf%M90nlO)G3uOIH6s3Kw4`g_rO2AGC;Q_
zEzbp{UZKCp!X{H=yS&fcGf~`tv(Y`uuB#1uDkh<aV$$ZpLr@^1r#$X^G>RSW7nz$_
zPanz2vM6i2pPlZ*?!)O~Let}IC4-80H7UY0)j7-fgb)K;H`D4+a8tj*lcW^7yIyz}
zw-lALumf+PZ|)(gMnYn3==+@z$7y}@>qH8El$KPx()k+FU^<88VNTs)?lSD>Pva+(
z>Xr4~;j!ovwuBv~Ac-@;|6XqH1}FU2CQY|cIZI;CYmX^<qw$ot&`#n+5Ioj`aCEhp
z(ebH=j9>2@z8YvEYx&QnpYhaE*#sSaMr4`>x<_m<MFy#+MdG;k@KIVACcZz>4^Hn+
z2jBQF_UZ1@Nx5~POD@1DP%ULvB^CEm-KnxpnIdf|@uQ(DGX}!L)|BU4&$cfDmyR1b
z3$1J*{KM#lV3d2E+pyO&mX^{n;PL1!_#p|aC0$fNM48`Cgy^gdsifJr6jB`GH*Q(+
zoY?rmbXb7R1Q&dqEJM9`i<i1sxI)E)4;_FB$SgI5K>g0W`OHME!ZhlN(<J-tu+-b7
zDjuJiad3NTP29D1MyN#fJ@3C4<<L|0{J52fj6rDbtHGVsuPrnaJm1zH%obdmH$Tcc
zrI2?poc$B{AL(*@@x}s=Zp)a&5HNJo0jfVcp(#nTU{6kS3wH4SQDyka$-z^gk0LB8
fLY{F@y|Jj|O&0j?o;}Q3T4{6clRGz6QcMY8>6XXp

literal 1421
zcmV;81#<cTM@dveQdv+`04?*JS|3)wW<P9JhG4&{zVUXg4bhrSwbz7u83o!g&c$C@
zW_6n`M|9RLZEe}R7+)DC6*`WiDpWya#pbNnJ~*&2QnusoZQ&N>8tY<s6ZAXes)PsW
zz<zx$2hDhMp}zR{`3JSqe<c>_?Kx)NBiam#$*PSNt%G7*a94h02@fI1(}_BV=>KTt
zb?8S3F87cWi~C%*_n>ttBKnLMBx<oi;RQJ&_wq3lYD1bDYY}<kZ?*t_BqO-eDF~Mf
z`6!f%OLS{tW*N@`ZaCWXrE%S=x67$wxI@BpHwIt0^dgqAw;pkoEjLocq_*LsSlJ_)
zPXR%|?D?#lG?hhTUF1(p<jA!_Kx74(FBQY^w@by5TSEScVX#*~I=v!#sUwiv0$WI~
z)nK%pP^>F(UwX0D1-U@k;v^ssx-Qr8;nY@LI{hwJwNxf)bxqAhI=x3&>5}TEXoCR=
z8xf$ne8}*E=YTU`uF6=jT4m}tYAmb@bV<;$RH38JyF)M8s)Kl+#?Qfr%%u$MCV~2;
zSQREYU&-!rfxN$X(8gg-v<1&0liovH8W?*2t-#7r%gZD7+vrQ8C>saX^2P%%J4(Dp
z5FI!NOyld3e%ZgQic_H^p;`)fX$LXX*2z+OWBfORk6v5QAT8Lg9M~aE{A)0S5gC6y
z8po4lyVjxgneRE{Y&xz_U`pco{@)p`l}bx#mlDJofZAAl6nt4+Rat%feA6V?zQqBx
z2o+dwxh#1I2E(OMLg`<5l-I?-a?tX1VrdEJKjrs&&OFcK4=TQ<Zu+vF2Ma}*g#h|3
zMg@K<!e%>YkJT4iqs$VT?R6j_DpXs>Ella+8bpwHwMVhPckwB4J(C93WP~kRhHQ!9
zgsTza>1Wi<ou(+BV3NI!m+bG~VK4tKzW^`Z!sQ1NyHnP0f;(0{E`-s%?PXZzF059J
z8KbbkK*NiN`}iFgvzMYdYKb$H`t!Sw_zFS$2&q~kz^dI5zR6o3DP@7e6{)XGWbu$#
zN58l!oG4whVb`NkJ21#gZevw)TJ4!Zy3EbW`fxweTndw+(dX+z4>zO9TzpdOE5&!e
z-w;M-_G>v$fe?BQ#DUmwA|3SB6@T@vMKecbF|}0lC-7JRRd^kMDZrEfgZ{>;WV&?#
zufcGhx4Xy7p8Ml_SNKA3m#X>+@!Cgxx_YVlpu;DYZ>vruMAwm-O7#%V2ez`8;sI|s
zB;2#B;#?OZOCL*^EVW><CFmO4oLR8Qb<7kL9#mi=fpbr#=ywJ=hsSF->i?Ioq3jrb
z&%oNPN<%N7W2#q9;R?xyP(4=zdSg(LEjg2S2?C8Pw0jPxw|v9PsVn*`itsm3;<lT&
zM@Pct!HH5fuTrjLG$YrS<CqEfJk78?3*<*A;qDPf1(AwvvnGF9HsWg=^Z`6sjD9G|
zU~9Cv^PYndx}r1@R>Uxl85`sgw{tLfs=t`qAXR}b{c6#bz5wfmp)Ea0qN)56cr7xs
z8nYm0vsD4OOv7CKE4tMZNWGP|aS+-9gF?XEooIP?f~rU!*FAQ07Z(2XPt;PGM7NW%
zcL@!*&fd@cG#BJxsRtrEV74@B(!dZGL!(`+!=w|ksQ301(XA!JuXDN9p$)lFx$@5Y
zyCdVJ3XwAS`G*g|$SYN28Qy77iFn7ckY?Poe*`{TgiIm-C=j(b<~r(m53)inI+qwy
zNaekIPPeP}l#}T*;H!Me?~u#Im%U4N{p^)50_d$D?M|H&+{Tnt{)b~-dCj~$30boU
zQ^JmWBG*etH=#lg?+REmQqsxbpQZ;SlTfaW><wzDBAMVz!#oBRKKo<>Nno=)q>^5l
bBJV+OVMzmUTEkAWtEha3fpQkws_m>Hu3o*J