From 7c61786305e8cde9351f3df1304585dfa6edc74b Mon Sep 17 00:00:00 2001
From: baduhai <baduhai@pm.me>
Date: Thu, 13 Jul 2023 14:38:55 -0300
Subject: [PATCH] secrets overhaul: part 2

---
 secrets/cloudflare-creds.age |  12 ------------
 secrets/cloudflare.age       |  15 +++++++++++++++
 secrets/paperless-pass.age   | Bin 383 -> 0 bytes
 secrets/paperless.age        |  16 ++++++++++++++++
 secrets/secrets.nix          |   5 +++--
 5 files changed, 34 insertions(+), 14 deletions(-)
 delete mode 100644 secrets/cloudflare-creds.age
 create mode 100644 secrets/cloudflare.age
 delete mode 100644 secrets/paperless-pass.age
 create mode 100644 secrets/paperless.age

diff --git a/secrets/cloudflare-creds.age b/secrets/cloudflare-creds.age
deleted file mode 100644
index bf0d75d..0000000
--- a/secrets/cloudflare-creds.age
+++ /dev/null
@@ -1,12 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 SP9f6A 1SZWt0ytoYmaPSXzzgkKftLR4x5mFjVRXcQi6oXXdDI
-UAORHHJy71MSdnjzi5PN9ol2mGp8lzWh0w/q638owOg
--> ssh-ed25519 J6tVTA IKmKiBSWG8IuTm8gYVsXhQHb88iQLWo+A/IJPGJEbXE
-9fPmLU9OvMl8YbojCu9/vTfpZEwtUlXFyEtC7v9g3zE
--> F*^\/j-grease dL~(_L
-3Af37Vb6Bw9txd5o6z+Hh7SO17ZG7o2UNGBX72FIY+pvzgpduzlK4nCYCnElkN2c
-XU2sg0VqF0uFB1Fr
---- sljT6+4hBVrvVkUyP0DDNu9y7D0TXGOEoXkISnPBbcs
-�$C3Œ�ij�����c���n_���!P�<J���w�\�_��&�v��֕�װ��]��s:X�45g���
-��O�^ծ� 8+���䌺󠫈�Ģ��n�IuzK�$�I��pf�5y��b�
-
A
\ No newline at end of file
diff --git a/secrets/cloudflare.age b/secrets/cloudflare.age
new file mode 100644
index 0000000..4be18ad
--- /dev/null
+++ b/secrets/cloudflare.age
@@ -0,0 +1,15 @@
+age-encryption.org/v1
+-> ssh-ed25519 hi+lKA aTP+RIGbMU30K8zhzTDNc4Y91m3yjGmBFBjKCNcmkVQ
+BbdTzDJqAw6oA569t1F5+qFRQ0fsYJk2b7uBMZue07E
+-> ssh-ed25519 SP9f6A psrWEZo5qD1n3iWm0bEmju912JFqIshz9cfDpQSN8TI
+uYzEsKEhUd9knrlJy+OP4DJBBW6xlgIJoY7NC8oQCPA
+-> ssh-ed25519 8YSAiw k0MGUnsBw+ak5hAfB/9u6UmTTsxB0vgAme7suasUUQ0
+eEm0zjUsI99mHrikBk8uLzviVva8VuXmzfhzi+eCRwg
+-> ssh-ed25519 3Chb7w gQ0uns62IkRa8WS1OZZmUBEW65w47a3p3J+cmvRDLEs
+48wHy8dk4NInsbyqcfs0c/Lc19SzGfvxqUY7to0/Kjc
+-> ssh-ed25519 J6tVTA D2A/tPD1j1N7pZXgYPd0lY1MpAeFHOA5vpsEUNGxYgY
+yF2mMkkHE7bXCBBEU5vYs31K0sOaWm3+3VeUUAXg8i0
+-> =-grease *{X s4w[g #"09>9 O5K%
+777AlqsWvkAb908PcYYvEfcW4qHJitRjOWycUE2ga3kZY23s
+--- C8UBRFNcT9jUakEoUCUa7U+xj2ml4xqag4Nmqz5M3pk
+f<�|h��؅���}�`��^��k������t�.���;��N$�;�0XUO}͢l:�ur����ŷ�������)��n�~��R��CY�J-��§��6� ޭ�^���
�fU�
2]����Q�S@A"�Ӌ
\ No newline at end of file
diff --git a/secrets/paperless-pass.age b/secrets/paperless-pass.age
deleted file mode 100644
index e3ef09c4fa724f2528e652021f9490968aee0647..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+4zNr!b5scOEG($>
z*3LAqGO98P4EJ{qO)9WR_9@E>@eVO6G4~8E_Nz!TjSMjeDdsW_DlN|r@XfU}N(uHW
zD6BFGkEpbC4%bi0G0M&J^7JY!kF2z;G%|K~Ek?J^%d8|U#8JVr#3QmW)kohTBPc8}
zuh7V`!YeG>GSeh8z}!F8)U_xeGbr0pKdHbw-I2@0uQ<XfAi~kP%stWHAf?FJz&OJw
zCBir}z}&?zA|=$tKSbZ%q&UO0*aBo*m2P@bYGQG!f_aL9Zj70Es=lKcSFTf_nR{?#
zR<31mX`;Icm#(g^LUxvUPE<rhu9tH~SZH2Wh^c{@Nm)^#vq5pDVWDAqhOe=sOJ;IJ
zRAy)(m)q(OQ>D-PTxh!Pk!s@*%_Ph-;Q_;J$(HRh|D`h)?=Am5?K4|qMB%oQsjppj
NIM(i)yV>E(D*$}+fmr|m

diff --git a/secrets/paperless.age b/secrets/paperless.age
new file mode 100644
index 0000000..7d59241
--- /dev/null
+++ b/secrets/paperless.age
@@ -0,0 +1,16 @@
+age-encryption.org/v1
+-> ssh-ed25519 hi+lKA iVknZMTjasF69UZkTxXike6D6hAUGVpbnmN6z58YaUE
+a5TqmRM3mYX1Tbthq4+IlNHNuJlyJUZiKeroirHI0bM
+-> ssh-ed25519 SP9f6A FE/kw6Zo5FWBgsT7Qd3Cn6Jgi1INKZhusdUEviJVYmU
+wIKAQcJJpddJVJGHgEbMSha6uHsww9c32oGnOKKXjPA
+-> ssh-ed25519 8YSAiw hdDv90Zkp1I73KsvAJav0rudWvuPCc9MJFVETaE1Y24
++h/Owqu7DoQB/h0QMN1hIlENdVMjvUc+qvdcn+N8ZtQ
+-> ssh-ed25519 3Chb7w tcAXhI3C8Zab4Pw98O6aLbAFXZ3+aluN9bHvQIESKyQ
+7ww3+rA1H5/SyJCsMtsKznh05eFcH/3+1SdIZtBUCVQ
+-> ssh-ed25519 J6tVTA 65v4RexysNZgMD2bhk8vDuI92Iyv5VG4G25Md5og6Hw
+KPy/j5XhFINWMvTt0rg+2d0lBAaZc9rOnPsSlQoap/I
+-> j<yMuGm-grease @ua_uW [$+sK
+RKkrIjNh9CYcgDvdPrW/JZoN8YsYedQXsxjz6/Gjxz1sCakCtBeEezluMH08jCRI
+KeRpRctJ+yH0C3x/XKdOXQWOTASlD6Q
+--- c3c2lynNpE5LP49fLNgBD+WFw/aSS8wKYi9+kMIufR0
+UA]f�>.I
8��b��m�_&�{w4�1�(8���V�'�j>ؖ_�.�d����
\ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 914a4a3..377cbcb 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -4,18 +4,19 @@ let
   io-host =
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCIrKJk5zWzWEHvLMPMK8T3PyeBjsCsqzxPN+OrXfhA";
   io = [ io-user io-host ];
+
   rotterdam-user =
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA1v3+q3EaruiiStWjubEJWvtejam/r41uoOpCdwJtLL";
   rotterdam-host =
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK7zAxgU8LNi5/O5XgoOcLKjbNMmO2S7jAuCI9Nr/V4v";
   rotterdam = [ rotterdam-user rotterdam-host ];
-  desktops = io ++ rotterdam;
 
   alexandria-host =
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK95QueW+jp1ZmF299Xr3XkgHJ6dL7aZVsfWxqbOKVKA";
   alexandria = [ alexandria-host ];
-  servers = alexandria;
 
+  desktops = io ++ rotterdam;
+  servers = alexandria;
   all-hosts = desktops ++ servers;
 in {
   "nextcloud.json.age".publicKeys = all-hosts;