From 7839d2604cebe5028d37f3b7ece5310a5133ff74 Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Sat, 10 Jan 2026 13:32:03 +0100 Subject: [PATCH] pinwheel/backwards/tadpole: Remove `codeberg.org` --- hosts/backwards/modules/git/gitconfig | 3 --- hosts/backwards/modules/ssh/default.nix | 18 ------------------ hosts/pinwheel/modules/git/gitconfig | 3 --- hosts/pinwheel/modules/ssh/default.nix | 18 ------------------ hosts/tadpole/modules/ssh/default.nix | 18 ------------------ .../backwards/alex.backwards-codeberg.org.age | Bin 786 -> 0 bytes .../alex.backwards-codeberg.org.pub.age | 7 ------- .../pinwheel/alex.pinwheel-codeberg.org.age | Bin 767 -> 0 bytes .../alex.pinwheel-codeberg.org.pub.age | 8 -------- secrets/secrets.nix | 6 ------ secrets/tadpole/alex.tadpole-codeberg.org.age | Bin 3756 -> 0 bytes .../tadpole/alex.tadpole-codeberg.org.pub.age | Bin 1072 -> 0 bytes 12 files changed, 81 deletions(-) delete mode 100644 secrets/backwards/alex.backwards-codeberg.org.age delete mode 100644 secrets/backwards/alex.backwards-codeberg.org.pub.age delete mode 100644 secrets/pinwheel/alex.pinwheel-codeberg.org.age delete mode 100644 secrets/pinwheel/alex.pinwheel-codeberg.org.pub.age delete mode 100644 secrets/tadpole/alex.tadpole-codeberg.org.age delete mode 100644 secrets/tadpole/alex.tadpole-codeberg.org.pub.age diff --git a/hosts/backwards/modules/git/gitconfig b/hosts/backwards/modules/git/gitconfig index 7610f2e..093916a 100644 --- a/hosts/backwards/modules/git/gitconfig +++ b/hosts/backwards/modules/git/gitconfig @@ -4,6 +4,3 @@ [url "git@github.com:"] insteadOf = https://github.com/ - -[url "git@codeberg.org:"] - insteadOf = https://codeberg.org/ diff --git a/hosts/backwards/modules/ssh/default.nix b/hosts/backwards/modules/ssh/default.nix index 214f184..4bce9ab 100644 --- a/hosts/backwards/modules/ssh/default.nix +++ b/hosts/backwards/modules/ssh/default.nix @@ -35,11 +35,6 @@ in identityFile = "/home/alex/.ssh/alex.backwards-git.ppp.pm"; }; - "codeberg.org" = { - hostname = "codeberg.org"; - identityFile = "/home/alex/.ssh/alex.backwards-codeberg.org"; - }; - "*" = { forwardAgent = false; addKeysToAgent = "no"; @@ -136,19 +131,6 @@ in owner = "alex"; group = "users"; }; - - "alex.backwards-codeberg.org" = { - file = ../../../../secrets/backwards/alex.backwards-codeberg.org.age; - path = "/home/alex/.ssh/alex.backwards-codeberg.org"; - owner = "alex"; - group = "users"; - }; - "alex.backwards-codeberg.org.pub" = { - file = ../../../../secrets/backwards/alex.backwards-codeberg.org.pub.age; - path = "/home/alex/.ssh/alex.backwards-codeberg.org.pub"; - owner = "alex"; - group = "users"; - }; }; }; } diff --git a/hosts/pinwheel/modules/git/gitconfig b/hosts/pinwheel/modules/git/gitconfig index 01687e2..7aa744e 100644 --- a/hosts/pinwheel/modules/git/gitconfig +++ b/hosts/pinwheel/modules/git/gitconfig @@ -5,8 +5,5 @@ [url "git@github.com:"] insteadOf = https://github.com/ -[url "git@codeberg.org:"] - insteadOf = https://codeberg.org/ - [url "gitea@git.ppp.pm:"] insteadOf = https://git.ppp.pm/ diff --git a/hosts/pinwheel/modules/ssh/default.nix b/hosts/pinwheel/modules/ssh/default.nix index 14f5488..6c30537 100644 --- a/hosts/pinwheel/modules/ssh/default.nix +++ b/hosts/pinwheel/modules/ssh/default.nix @@ -31,11 +31,6 @@ identityFile = "/home/alex/.ssh/alex.pinwheel-github.com"; }; - "codeberg.org" = { - hostname = "codeberg.org"; - identityFile = "/home/alex/.ssh/alex.pinwheel-codeberg.org"; - }; - "git.ppp.pm" = { hostname = "git.ppp.pm"; identityFile = "/home/alex/.ssh/alex.pinwheel-git.ppp.pm"; @@ -99,19 +94,6 @@ group = "users"; }; - "alex.pinwheel-codeberg.org" = { - file = ../../../../secrets/pinwheel/alex.pinwheel-codeberg.org.age; - path = "/home/alex/.ssh/alex.pinwheel-codeberg.org"; - owner = "alex"; - group = "users"; - }; - "alex.pinwheel-codeberg.org.pub" = { - file = ../../../../secrets/pinwheel/alex.pinwheel-codeberg.org.pub.age; - path = "/home/alex/.ssh/alex.pinwheel-codeberg.org.pub"; - owner = "alex"; - group = "users"; - }; - "alex.pinwheel-git.ppp.pm" = { file = ../../../../secrets/pinwheel/alex.pinwheel-git.ppp.pm.age; path = "/home/alex/.ssh/alex.pinwheel-git.ppp.pm"; diff --git a/hosts/tadpole/modules/ssh/default.nix b/hosts/tadpole/modules/ssh/default.nix index 0f217c0..55d5d37 100644 --- a/hosts/tadpole/modules/ssh/default.nix +++ b/hosts/tadpole/modules/ssh/default.nix @@ -28,11 +28,6 @@ in identityFile = "/home/alex/.ssh/alex.tadpole-git.ppp.pm"; }; - "codeberg.org" = { - hostname = "codeberg.org"; - identityFile = "/home/alex/.ssh/alex.tadpole-codeberg.org"; - }; - "*" = { forwardAgent = false; addKeysToAgent = "no"; @@ -114,19 +109,6 @@ in owner = "alex"; group = "users"; }; - - "alex.tadpole-codeberg.org" = { - file = ../../../../secrets/tadpole/alex.tadpole-codeberg.org.age; - path = "/home/alex/.ssh/alex.tadpole-codeberg.org"; - owner = "alex"; - group = "users"; - }; - "alex.tadpole-codeberg.org.pub" = { - file = ../../../../secrets/tadpole/alex.tadpole-codeberg.org.pub.age; - path = "/home/alex/.ssh/alex.tadpole-codeberg.org.pub"; - owner = "alex"; - group = "users"; - }; }; }; } diff --git a/secrets/backwards/alex.backwards-codeberg.org.age b/secrets/backwards/alex.backwards-codeberg.org.age deleted file mode 100644 index 3cca77d24be413015f36c14d72ebf7e6f16dbf53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 786 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+C^hg1Pge-?PW3bJ zEi1{&H8l+=cCE-wjC2l*$T2OGT$lPJieKu?)+uO}`oEwbd+7JW*S#RQ7c-qwZ>NxqXwjb2|n_%zoR!(>3wV!oZ!L^UkPn zPgry!ykO;w45vTmz0NU3dhLCFLq67N2gAqX_s)AAIP{cz$z11foljRvi}F%Tk2rSR z_+#tNyXSF@w%BZ;$gRPDI_DhbF@p)rN$W3{TcYr3pYh`P4^O7thEusfes!HOHFW@*j6^ z?u*d4y@2P_qU&?EocGpDx%l8^FnvUmRN*H#wz4^zSRN^1OmcJX@}`zg$^%)iEaTi)QhnCTF8P zzhCA5lN7qkExOmX$j(Z~T|G*1$3cPWJs&=Lv(^V3HG1S)JIy~t?%J9;+vhF)#MzZJ cZPUu1fgMM^v?u;uv-{NcE7$g`nEmGf0BkW?6951J diff --git a/secrets/backwards/alex.backwards-codeberg.org.pub.age b/secrets/backwards/alex.backwards-codeberg.org.pub.age deleted file mode 100644 index 6e28844..0000000 --- a/secrets/backwards/alex.backwards-codeberg.org.pub.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 Pu0HWg eK/pdhmsF334C7rSuYsRnXCtenmlT2hOXpfW5CQEARY -odooTLu8ZQUZjCeVPZYOA6Vgb470cosE1Q1iBkE9Kc0 --> ssh-ed25519 +oNaHQ nJU52SSZ9v3+8NuXR6coSHosEYrs7T8GeZYzV/quOU4 -IV5YduRGdJLy93gVwfYmwvldRXoXXX3QvAsH3ljBadw ---- 3gJg9NFmqHCrgcvgnYOeSY1H4klPEyzI+07IlKCOItc -\5ܤ}yA_J {p +ꜞ+JeLW 7=S*ɐ}fPқ!X73\`SizW<4PbZIhH61'ybmCmE \ No newline at end of file diff --git a/secrets/pinwheel/alex.pinwheel-codeberg.org.age b/secrets/pinwheel/alex.pinwheel-codeberg.org.age deleted file mode 100644 index e1d60666d0ed19959de600229993e373630d0561..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 767 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSHs|ZMnN>|8p3-B?h zD)0(6sjM_}Gz##kj4JXnF|0B#4{_2it}@Jz$oKFGu*fJ2bmWRK^e!?n&Cd*TGOo%t z*ADc}%(4iIEH>82&#y8)+?7jLS689L)F;Q=xTq{bJK51Jr^p~TtSluby}&&y zB+1F5)W;~wGTS28yeiDxAfJn6{xiKh1ydw8y}NMHr(mkaKB2(re!JGaZ7x=Q{{OjW zf|QcM-D!%~WH+-vw{$H&Sv>1O)-G)iM^>-za)p-^MAXkewUkSF^sA&;`_pXqLl0!6 zynj5XWZ5VGx^!06Zhu9az1{2q)9Z~N+W(O~d@uG;;R3cB&fg?%y*z4{a8+c|3^R6d zZt2cRft&jhzcVj0pZs;ft+i)nrycQ_xs3h!3qj5kEn99e8ttsFe|*K6-}==YM{j+H zSl3tDOF}<Ni%79al9vzNjyiG_2RVV3l(@voe)`#)JzMiw?1JE|!dH zjyIcjikl^h`+`P8M8xl+n17Btg_rpmRP6X*u|VUr4j;qiS-$_SueaJS&8w{-{~|e1 z;^CKb|4MZ?UzHJkVjE-0nfLH}!^LU_DMej1Kl!#KjUUU`mi`SmtNBP^Wy4HO-uRs2 zqyO@HD;}%;Wc+ojYx=xDlk2RfM4fTdm-psUzWluQbYYXXPMl?uSK4v)GdxPcYg0CU z{UqAF_gK&4te@6z9tMd`_uk)FCH3WG`IhFkM-e_=E3WVDn(^mZypOYf!)25DEhTS@ z{64>~SX%W({YCZp{ ssh-ed25519 vxPbZg IKvbUY2e3wCrphoiFOKJYxyWvj4DjMlW1yv1VrZ/kBk -8sS9cNUsb8NtPHD5iKx8dfcgKxLObcZDfWJohduWEl4 --> ssh-ed25519 +oNaHQ nIY6nLvP+HIUlCumO/MxGoBGfutwfwv4zlvsLCuu2C8 -eFqY9TaVsYoKulu5e++WI1zYzoBinEVUJt/lDan+ttQ ---- 67CbghCaK4yhjqH6vHEUzfeFth9PmX8h+qTKHocKGzk -iF0V517~w&մ>1b化gc6Fbsn5hk6W?0@ |C mG1. -0#wA]!s% p \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 31067ed..c3e6df1 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -17,8 +17,6 @@ in { "pinwheel/alex.pinwheel-tadpole.pub.age".publicKeys = [ pinwheel tadpole alex ]; "pinwheel/alex.pinwheel-github.com.age".publicKeys = [ pinwheel alex ]; "pinwheel/alex.pinwheel-github.com.pub.age".publicKeys = [ pinwheel alex ]; - "pinwheel/alex.pinwheel-codeberg.org.age".publicKeys = [ pinwheel alex ]; - "pinwheel/alex.pinwheel-codeberg.org.pub.age".publicKeys = [ pinwheel alex ]; "pinwheel/alex.pinwheel-git.ppp.pm.age".publicKeys = [ pinwheel alex ]; "pinwheel/alex.pinwheel-git.ppp.pm.pub.age".publicKeys = [ pinwheel alex ]; @@ -45,16 +43,12 @@ in { "backwards/restic-password.age".publicKeys = [ backwards alex ]; "backwards/restic-cloud-sync-key.age".publicKeys = [ backwards alex ]; "backwards/restic-cloud-sync-repository.age".publicKeys = [ backwards alex ]; - "backwards/alex.backwards-codeberg.org.age".publicKeys = [ backwards alex ]; - "backwards/alex.backwards-codeberg.org.pub.age".publicKeys = [ backwards alex ]; "backwards/alex.backwards-git.ppp.pm.age".publicKeys = [ backwards alex ]; "backwards/alex.backwards-git.ppp.pm.pub.age".publicKeys = [ backwards alex ]; "backwards/wireless-network-secrets.age".publicKeys = [ backwards alex ]; "tadpole/root.tadpole.age".publicKeys = [ tadpole alex ]; "tadpole/root.tadpole.pub.age".publicKeys = [ tadpole alex ]; - "tadpole/alex.tadpole-codeberg.org.age".publicKeys = [ tadpole alex ]; - "tadpole/alex.tadpole-codeberg.org.pub.age".publicKeys = [ tadpole alex ]; "tadpole/alex.tadpole-git.ppp.pm.age".publicKeys = [ tadpole alex ]; "tadpole/alex.tadpole-git.ppp.pm.pub.age".publicKeys = [ tadpole alex ]; "tadpole/gitea-dbpassword.age".publicKeys = [ tadpole alex ]; diff --git a/secrets/tadpole/alex.tadpole-codeberg.org.age b/secrets/tadpole/alex.tadpole-codeberg.org.age deleted file mode 100644 index e7262a4a80eb4837901fc24fcae4196149491c9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3756 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 diff --git a/secrets/tadpole/alex.tadpole-codeberg.org.pub.age b/secrets/tadpole/alex.tadpole-codeberg.org.pub.age deleted file mode 100644 index 843b43f8468736140ee2b78a21c478a9613f0d9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSP4KjDPbX0KGcPhgD^6?CgNH+}#vfy&b$&W~PtaNqu4Kv9$ zDax;K4-fGTEA>qD^-Rn)%*^o%3^t9-El({C2}QR}JKrzSBT&JzqA1)o*wd{fw=B%5 z(m2z_-zlZQ%iT~r-^|iKtW4iO#5BvXAU8Fl%8|>q~RwsE~>Jj&2@}WG=in*O4H7}!0L)j&KqqomoFZEr| z?o37A<@IrYYYy?~{9BObHJ?>_=beWfc~5sqy?Ag^D6J{Ltxh*Qwegf<+s-rV=0yiN zDy)*Jwn=|4^sDl4&;_QirToV;PA!~}AoO=}M{|nhPY*jrTWuHa_e#6gJk}7;{IaK- z4?JvwZ9ROEyDW?!#{nmw}B=bnF>xu0v7aZ%7$&HwSDEz1+ubl#RP zy*)YPtlRXgG}WeM250X)+Eo;6blD_v!?<{UTdH;-6N6%dg|L(o;*Q{Hqw_Os~W@@Wc zWJK=`b>fn|k5lzS%Tf3treHrdYIAb@siR@0OnZ*ig)Qc=~5HGf>P z{w5VlN54|~d(6-;bH$l&+@f+17In!i^39pDwCmHo?6kr%9^oS|qBe$JFZsFsy|UK_ O(GPF0Ci?c>V+R0n3fiXt