From 489bcb7e51a4f58afe9bec157b2de21ae5be6c98 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 29 Dec 2025 01:50:06 -0600
Subject: [PATCH] Update for new Gitea instance

---
 hosts/jeremiah/default.nix    |  38 ++-----------------
 secrets/gitea/oauthSecret.age | Bin 1919 -> 1919 bytes
 secrets/gitea/oauthToken.age  |  69 +++++++++++++++++-----------------
 3 files changed, 38 insertions(+), 69 deletions(-)

diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix
index ac24dd9..e3ed6ab 100644
--- a/hosts/jeremiah/default.nix
+++ b/hosts/jeremiah/default.nix
@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   metadata,
   pkgs,
   top,
@@ -24,6 +23,8 @@ in
   ];
 
   age.secrets = {
+    runner-reg.file = ../../secrets/gitlab/nixos-qemu-shell.age;
+
     gitea-buildbotWorkersFile = mk ../../secrets/gitea/buildbotWorkersFile.age;
     gitea-oauthToken = mk ../../secrets/gitea/oauthToken.age;
     gitea-oauthSecret = mk ../../secrets/gitea/oauthSecret.age;
@@ -138,10 +139,6 @@ in
     enable = true;
     protontricks.enable = true;
   };
-  #####################################################################################
-  #################### Virtualbox Runner ##############################################
-  #####################################################################################
-  age.secrets.runner-reg.file = ../../secrets/gitlab/nixos-qemu-shell.age;
 
   services = {
     buildbot-nix = {
@@ -163,10 +160,10 @@ in
         gitea = {
           enable = true;
           instanceUrl = "https://src.thehellings.com";
-          oauthId = "97bcda21-49df-4876-87ac-36ae07f340ec";
+          oauthId = "7ec9107d-379b-47c8-870f-1191956d0500";
           oauthSecretFile = config.age.secrets.gitea-oauthSecret.path;
           tokenFile = config.age.secrets.gitea-oauthToken.path;
-          #topic = "buildbot-greg";
+          topic = "buildbot-nix";
           webhookSecretFile = config.age.secrets.gitea-webhookSecret.path;
         };
         showTrace = true;
@@ -204,32 +201,5 @@ in
     };
   };
 
-  systemd = {
-    services = {
-      "gitlab-runner" = {
-        after = [
-          "network.target"
-          "network-online.target"
-          "tailscaled.service"
-        ];
-        requires = [
-          "network-online.target"
-          "tailscaled.service"
-        ];
-        serviceConfig = {
-          DevicePolicy = lib.mkForce "auto";
-          User = "root";
-          DynamicUser = lib.mkForce false;
-        };
-      };
-    };
-    targets = {
-      sleep.enable = false;
-      suspend.enable = false;
-      hibernate.enable = false;
-      hybrid-sleep.enable = false;
-    };
-  };
-
   users.extraGroups.video.members = [ "greg" ];
 }
diff --git a/secrets/gitea/oauthSecret.age b/secrets/gitea/oauthSecret.age
index e30ce81e7276f7cb9959a1a26cb5d7a24221b759..5ccbcb934d50cee912a8f3bc8e5a27953d7c0fac 100644
GIT binary patch
literal 1919
zcmZY9yX)*|9mjEOL<ZK@Mr5!N3}<t{!6IaGpWJVgNw6@N$&+Mqn`9=L1Pj?h!9qBN
zg*J<oo!DtB*vi5-!di%EvxS9?rTDAo`~@%GJkR%&fXll}myPRiulnxeegyE0?%w@i
zKTYMkOOBBw%I+DueB8jkT@=0W9VQ-b2P@7g^r4s5V)EU2!+3^PYJ~{M>It)gv6CwW
z3?bX7hnaQk^rY$$wWf^(8l~eYp)o?;?2DT)Eb6NkNQK{m{hIb%$Ki*K$0&V7<QRLN
zPnOCASxXQ#f@<{`X6uTe{IttlGsnVK#ek+su8;J`s2)h=SYpMQw^t<%R2>zop5TdB
z?P=b-p4%r9@U8~Lg3AcoVoXda3;0&g!D<%inihc@qJ3rI2VC3*!FJ2*(^*0nU$5pK
zRs?l4?{fz0mj;qTLckt~l=-yFy=qB>ac6G-=wrM!hu$`86Kj@s>aIr8c*L=VN)}g%
zbUo27S}mKX?&4>&l!buH_gD>t@*yT|r&*;uQ0K(rlDm$K*5m0o<aK)0IHxR7us<~C
z+;+~k3)xVtP@BAkqHrxk|L7LHN@GDoc&Wn}EobaF0;A^}z>uC)5`2INR=t&lMI<c<
zCfm)5;Cu&JZ!p^Os<l>Y7hn%VXwA8P&0AF}=){9vH7J`5NiSx;N;hzcXzMuX7YDqx
z;Rdx5lpc|oiLhb9Z{!q~nc`E8z2y4p>O!+*BXsINXp4@On=bp(Ng_DE5}g;|)_6D^
zS0aAO&51~A+PZFsDsy^+Bg;}Gc1cLfk4V(SG2qWO0dRpT4<t1XTha}eV{xr+PaZWm
zDluN$5ICGPum?nrKVl^r$H5|*ddA#1*xD@eGR>$F6`6#poHoAiYiCCnp!UqgRTs)M
zQRuN)sm=N=WO8wuf;;21mf!Xs9U<bYW;QUna(gdpb2Vd2Eo-kb%d$hz$`^0FYas^V
zoLg3j|4cxNlSs5H>^W&Pa7cAvVHDfn5wCR4PAEjsc|2@!uEqIqWF%B$UNt$_0q^Wl
za%0F+A!ULCL>A48ZO5o2i^t;)X`R&Q?2E}NB9N5pu2lzoWtZ(jB#_QNVD3r7C+$h1
zZm&Csd?m3$1QuX8$9dK6mI5ozzQ>MSHm27u6|UzxQNny>sQk)$8w8qCOVfiXk0d4u
zVA*YfS~XTkON_`}VkD270uMz8f#4c6!!s#|{_YZZDZ?N95^31x!r3?Aj^Em=bq*Rc
zZo75OHfGq=)<?o-Z8aHrcu+^Bta6%m`C{s-;;%#yE~V5OlkTzCqDcJiaERH1DLMDV
z(UK=?U0>U-xjk>re#-&iN7CVDvawG*v_W*QD3w7Bk>LBGyG^~(_?l{Q>h3Xi*qPvx
z^BKf4O2~DU-J^@t@hyGwwj2e$(w;5axJ22j)_3iBc)RXCRbvuQ>f_*&<^tFLjlJI>
z-&2Z>yZH-)r-^;Lvt32(t_fsrCsvn3c4`}g(MSDGCASfEr<^_L9vZ;0I|p;*eXx^!
zR|*K&S5xK(n35}HhfjKayN4M2w&}Af%l=g~%h)>-K8C}y>+J3wTH%__)=V!QA5AW%
z@Y8#{lJSDnLG6;VDoV)Q-vs@GHsUg1!P_cV#--7TlVrf?@T{K^5W7WBBMsgjIKwYb
zW+WRgqZIMFgW)tg_F{=1sGt@}qdW=|JZnK|!-#TXAoViULtn=1@$KE-z1#P^XG@es
zxag^hoHcjRC0I>Od@!!(_4=4roi?7(2NJ8hzx+da|H=EqpPlc0{JT$MRr=yv@4x)|
zkH7KRccG8IInDq1$w#03==;^b>7V|~``>r|{@?ho^yi=b{A+)+zWDSv;M?Y}|M~mp
fSAY8D`a@3o8T24N|HE&KUwrw;uY&5!U(x>uPjPQv

literal 1919
zcmZXUImpBa8HPngmZ=s*&}s*f6$!t&F9g}#lT0SZWHLDvA;;vH+;=isi(6O=7NTIM
z*r*_gg`FS>Hg<Lvc7ltnXrX^SfBQ8L&-Z@c8>F|FTOIXVJLXOO)uvCu8Q#5oeLoD@
z%PmH59H#danN3}~?^!ZxOMV%QGuD+7NNx{|;jK+1pacqfF3pdAO(<l;N4vTa0gcA1
z$V+@f9|-E))_4ky+39L-rs+X92d{^sImE>?%@&hOmF~IdgpHPW6sdrJ)K(|o1+8}@
zOr+t4j|UU=js&Btw6%FVy?B_I4}&sMdHA7DdSF?dt&=YObP8`ybRJwbJ}h^<fSzfq
zHr5TZ4{w}v9b=k@)pHb`iIGFR9+vWhMo*#BW;Jd2-6@C$bJ>{^TQk%32*y6zpvuWO
z2!;+z8*R)2fIwBn-1rA)-G^9srUf3txXiw5Qr;A6@5)LudlK()cRyzw5anC$ECq1F
zNFMAR6ctcv=Vb22#X3Kit4im<x-nY~Co0!~Awjp;W{P-kS=MdB-_RH{OW<_BSXeBY
z;N<(F4EiYFjj^H}w1r0=tRV~98SSNzH60s<cIwFIO@h@cm_iX17!uA-soG<&<2vO=
z=!V|$MW*5mpq||-y)u$?f3%w(mTly=UhP1ZJx#zTUu#98E31GX*;td}Mh$SUTy|3n
zH!hZzomWjpNP`D~VPX(bNigUojR4?eA`U`>Zq*w%Psz{WvL7$~Wu>onryDqP9t=g$
zG2?+3>{ux&49x3vP%k2q-4JNk<E^?au&e-92-ylVvZh#qlo&=-qQh*crXsqG6hVq_
z+#t{yj_Kaif{j4~n_P*&56QdZhoIH~SFyxn520$bNA##S%;;k7JTO6%^m1VkO>^1M
z#;n%9>NMcErh^UPeC3nNSv>?)v^;N8D?xl?_Osfq{k;0%mFDO|@9EJ}k7Nopx&)io
z^Je*FS*drmWwD)H-mHbS9tcaRY2{hGNd)BW&b4!7l1B$FvLcJh{6gEOXPOkNDQE8e
z;!&va#ahXwIMAVtE5i~wP*{kU^T4Pxg%TFMFbjHzb{!;V!KRf=Q1TrIsj7bxBUK}L
z)a1|H<iT`CK-#<^@Eh8wAHajTA2oKImIyq`<O4^J4~NZ|XmZ>61mJ|8Ow!reBCE?+
zo7q(^@u*k-t~lrnIuLeIB;D>o<$j+D*@{x@0flQ$q;oYqyNT^%PRzaM$GPCMJT#NV
zz*b3{p;}!vg~+e19vX-fcK2he!EQ$F%K17^0zM0ehmcjqy;HfPbZX?dodvoT`^$C#
zmO^Pd_)Ts_Y|IaHpU1UD9HoPn(Xm7T%=I#+K;`GuMj%z@*-*e4QFGK$Ti!W>kKBfn
z%{2|X;?1K$WS12mA>)d8$(`+!Hq(Y8n@(>(yES#?w&`A(xhTMq;G`-@#3-xb^Q)Lv
z_~X_mM_S3<E@^}Xc9YlS6YA^{Y9%gYSL71F6R$PAtN=>5H=hG&nYEDqHH(bqn`atV
zXFQbd<Hp@Oe^bg#QtnR5dh``V$yj&J$1pZ}Wq=&1@o@#?&E2Y_VO-)1*6?)QU?eGY
z9yrtO3S@Z1_~IGy9L>2*M)IbWv0IDS%$~T`<P4@6JPkNgRt#EfLaK1|Tq<Gf3N7uY
zkPf|Gn@Q~wTPEkopYKbB=SxFICj<r#a2k>mtFgVf951Ki%%~jl+9fY9`zl%$27pOx
z1eezrxD7Dj&hk+(StQ9fc%g#WxYnD?<;Cuu^=Hj{@)th-{CB?i@ArTHIqHMu)9?Jt
z`^8uO`MW<fAN}dQKmU^Y@w;F8(U*Zg{^Rfi`IG-+DC@&dF`xMD#~*yl{KilJ`d|8+
jfBWHIeii)wKY#!J*FO9V@ssa<`!^r`n)}`b`RxAzEedN*

diff --git a/secrets/gitea/oauthToken.age b/secrets/gitea/oauthToken.age
index cc1eb44..4f03557 100644
--- a/secrets/gitea/oauthToken.age
+++ b/secrets/gitea/oauthToken.age
@@ -1,36 +1,35 @@
 age-encryption.org/v1
--> ssh-ed25519 87huqg +vGKJWJF+cULuu6iVaX6cgGoaAeKUoEee4vGyaFpI2w
-N93+n31fWF9gwJ47JIa3IhA32PtpZC3gNX26LXF9+9Y
--> ssh-ed25519 UFfTmg qy00MSIs3WLDSWm1R2d6NwonFKs85d9u/FnPDv0Tj38
-mNliwCIFNVaEB3/KihdX4KCrqIXW6fF2zAPRMW4Ynn4
--> ssh-ed25519 xNtnoA VgJb+XhCU9H7hv6MiBrrn9ObbOzMCdW8AHf6Qc18wms
-noHjCNW5P2CSHtADe5jaJ6cQ8Of0U+AX2XZdPvJSLYY
--> ssh-ed25519 aY2AXA UItoGwNQ0R5aQe6u8R6lAjGOqUA5Ft/g32KkiQ2U1Hg
-dgP9kezC5mlHzlpUgq2cK6iW/xk6HPT2yxQ8lrpUggI
--> ssh-ed25519 AQhf1g p1m4ZKVxumlVIGRpagEN3uuehlT381x8KYRV/Fh4rio
-/OjBxcGXFCwMX0EayIK7LVy/+3ySVPIwdW+JOlqbFEo
--> ssh-ed25519 mOmPfg a6G4AaBn9nH+TwP0n5YpPlIdkOf6pfLNlJwu3z9ikHE
-QAr2dwZqQAJMwKcSqKWBbQMEl7CS62eyziTobQtdbaU
--> ssh-ed25519 YJiRbw glcvmIFcNql9Neyj0bO7P16KBaHt5ImQlaVhHR9c2m8
-6wm+IILVqxAxTzuJwFLFAhyd4G0em51CV7k6iEUfE4c
--> ssh-ed25519 0/WsKg 3UwZTJqvW8r0Zkh+AhuP9yNLpGkqRz5k04ETWGEq1zY
-TFQWBAXz0u1o9D9HODVHZp7zklYsn99cfoSnDtn6Zgw
--> ssh-ed25519 Nl/5yA mENQJ+E702sdXC/JqsreYhWwfScN1o3LeDvj9C/BcCs
-IbeMgUqNx7qyrIC3ZwGMlxo6Elg9CeFHgTnUJQVfLQ0
--> ssh-ed25519 GdLgCQ W0uEyxaJvO7wz9UYBRE0cv+VGeyYa8Z6iyTpPN2DvWE
-eegDs3uVmH9rqVd5sE9zubBMqdxHT8jJPxHDfk8Kusg
--> ssh-ed25519 tOH/HQ QT9SrVYYY8ODW4tIeAEfNakwWHo4RyPvQle2E/3jGm0
-duQtW1MWE+MTtxMBT2Mvps8J08BYRcmdeRXFfL4B9RY
--> ssh-ed25519 FpzvfQ zIF2xJFiaC1y3V67q3YP6ql8mbyrpO+O2b6dW1mm4XM
-37r/nLDwJmkjr1QQY8tTijPtqufEqBOeaxota2umwxI
--> ssh-ed25519 kdPvzQ cP81EXGaO/IUqxrxzlXDweTSPBZlRGCl6x9dn+rkOHc
-NVCJA0h7ZLr/BcNDfZPrZAJZWtpZxT4VJ1FGA+Qcpe4
--> ssh-ed25519 onmXpg 8hx4rthfVY5SfRXvq1wlD0lTtWPsEh3pxpDjzBqEJRE
-I79UvaGkDwg5EvwCwe+XlR/YLbqNCJGi+XVYiz27msw
--> ssh-ed25519 CnhD0g sx5bqqrA/N9kQbX5uWWi9qYq8dZPUEQl/f9gxQQUzTM
-/v612wQyNIKttHLtfqtW5tqgsj9DnD94CPfZAVy1SK0
--> ssh-ed25519 4ep2UA 29aXaZNK5IDqjr33hN9gZ2Xa/A8Fo6iQTRkhV2I9nCs
-24wTdQcRPPRmpmYNw2JM2Mr8DKY8lS9dUigB48UKXRY
---- IBC4Vix1Ft0GRMOcBmErrrMODnbJAoGNzTxe4x5DlIs
-.��R�����	ȸ�4�<ek���]�
t����	[���妸
-�D
x��ֳ��x�Ӷ+�F\�L{ץ�0��[2g
\ No newline at end of file
+-> ssh-ed25519 87huqg FaiN3ippcpcxcI+nCAUgBoKUF65mFC2xwvupSgDVhzs
+kV2k3NKXdqwnJqHsDyof4blc+CxHj+Xuz2RySap/mwM
+-> ssh-ed25519 UFfTmg DMiGAsTR3E9hqW68M+oW1F9/wTPa0J8HY7O3Ir/4CQ8
+JVYVroeE0fI0dDkj2TLImb/TxQGrulOubFswLzzWUNY
+-> ssh-ed25519 xNtnoA 1s3lCnko26npB/TaQ6RqOcAxhL+rvCsTZa3i47/3OCQ
+q/eW4nemPqQ+NIM6sY4AEC74+Q4ts449D0DRSsfbCpw
+-> ssh-ed25519 aY2AXA 3/kMT0KaXLGb9WgYsyJiy2/Q2e/BVeAEJ8TpU0MraC8
+2WLbSbxCTuuKe7op3JVZqFADk3pZDL8MZeIgecW6ysI
+-> ssh-ed25519 AQhf1g tGyMM0/jIm4iRMW3omb+hAv2ptOana2TeKDwrk0lcXI
+aTP3w3XBW+UG3ZKWa1fCtmwjJ/CPDtYI35fW3xs21z8
+-> ssh-ed25519 mOmPfg ZGlYlzAxcLnfH5ajyarlgb6ai8S+EPj0McDRoeeJwSU
+nnDDJQuaDPsv6XautBqktDTmcP/e2fpVGHLidfxgH98
+-> ssh-ed25519 YJiRbw puid9qEgO15ZAQu9UJHTBByXhjAYdkRuifqpKiPyBzc
+ip4Iudphrq7ee+ftGiG9L1KClxXs81iv9ZYxtysb33g
+-> ssh-ed25519 0/WsKg PjNCT+o7/ceTAwL1O3ylDvHpQksFJeGWiRRJPLM780U
+C2UGCNYG0P6lJ4WRlrrvBUHJNsJe9lKRAlRkvjBSljo
+-> ssh-ed25519 Nl/5yA nq3+6B/CE4Dm4V/uoYO1wMUQGFBepxb86ovtA64icVA
+sXOJVbrrjMpK3tpaJOx4I5UylACFTQk3Kgkb0U04HZQ
+-> ssh-ed25519 GdLgCQ 1+AlaHiMguVVCozkhhbkESc0Uzf/+lLjh9p2nYhzem0
+hEFBD17NpkfPlSR/13qZJVtuMvLHEaveNBvtNx3ifBE
+-> ssh-ed25519 tOH/HQ GOdOyjDZuRkNbq4xO5hKl7bAOYGYgpYhZ0ySXFL36Vg
+ravlDE/qkTlF0QBZL0m3XDCyQDSi+YiTQbsKgVoo0W4
+-> ssh-ed25519 FpzvfQ hmdZm1akUfe65XR15qkPG/9L0wohcBmNVU2Dl54ccAI
+xGdvMhDlp+mMDnVTI2pmXeIOkg7Q3NWEEn0pQhYptHU
+-> ssh-ed25519 kdPvzQ 2yEYstEqe7dRRA3xJAPWsS6pWoVhHWgniF7tDU/DiBE
+wQcwV9YtB1wqV/Rh/mXDRvvTlHi9zt7s9FfA+nl9tl4
+-> ssh-ed25519 onmXpg EtohxlbytPxdjQ2+WGa31szA2pcNfpjTSjywxdsP41Q
+CLm2PML6ftK5sEL06YM+uzp3u6B3H6puIR0ZZjwdStI
+-> ssh-ed25519 CnhD0g HBmCksCnULHjHY46ROD9nEsF1+MgmpvI7BsC7hqIOyg
+2ibCG8YHM1+cmKga6IYunbC9m7ZeKt/A+uXhCI4Q6KA
+-> ssh-ed25519 4ep2UA gPaSut9Q6VsR45d4BaeqvYFav4WJR1z1JaFMbzZjv2U
+wcEudPepWaRFJZa0Fp/KnzUZQyzJRu7oGgazojSNzss
+--- cn+bvbDY6o6mnhowncq4qmCn+MydUMXG/iIM2sIKq4Q
+�x	r�X�b�eA�U
��}&zLC�)+r
��=��8��͞�E�a��w
B$*��^*+�G5��͉��S�
\ No newline at end of file