From c55ea83f53a37f28afda52dc7eacc0497ac0c22d Mon Sep 17 00:00:00 2001
From: EinEtwas <ein@etwas.me>
Date: Fri, 25 Oct 2024 17:31:10 +0200
Subject: [PATCH] feat: also use a github token for ssh connections

---
 home/agenix.nix       |  10 +++++++++-
 home/ssh.nix          |   9 +++++++++
 secrets/gh.age        |   5 -----
 secrets/gh_argstr.age | Bin 0 -> 339 bytes
 secrets/gh_token.age  | Bin 0 -> 306 bytes
 secrets/secrets.nix   |   3 ++-
 6 files changed, 20 insertions(+), 7 deletions(-)
 delete mode 100644 secrets/gh.age
 create mode 100644 secrets/gh_argstr.age
 create mode 100644 secrets/gh_token.age

diff --git a/home/agenix.nix b/home/agenix.nix
index 645744c..204cc65 100644
--- a/home/agenix.nix
+++ b/home/agenix.nix
@@ -3,7 +3,8 @@
   # TODO: Get a token2 and set up https://github.com/oddlama/agenix-rekey
   age.identityPaths = [ "/var/lib/persistent/host_id_ed25519" ];
 
-  age.secrets.access-tokens-github.file = ../secrets/gh.age;
+  age.secrets.access-tokens-github.file = ../secrets/gh_argstr.age;
+
   age.secrets.obvps-id = {
     file = ../secrets/1bvps.age;
     path = "/home/rhea/.ssh/id_1bvps";
@@ -11,6 +12,13 @@
     symlink = false;
   };
 
+  age.secrets.gh_etwas = {
+    file = ../secrets/gh_token.age;
+    path = "/home/rhea/.ssh/id_gh_etwas";
+    owner = "rhea";
+    symlink = false;
+  };
+
   age.secrets.gcd_etwas = {
     file = ../secrets/gcd_etwas.age;
     path = "/home/rhea/.ssh/id_gcd_etwas";
diff --git a/home/ssh.nix b/home/ssh.nix
index db439dd..e4c6130 100644
--- a/home/ssh.nix
+++ b/home/ssh.nix
@@ -9,6 +9,7 @@
         hostname = "178.254.43.196";
         identityFile = [ "/home/rhea/.ssh/id_1bvps" ];
       };
+
       "gcd-etwas" = {
         host = "gcd-etwas";
         hostname = "git.catgirl.dog";
@@ -16,6 +17,14 @@
         user = "git";
         port = 222;
       };
+
+      "gh-etwas" = {
+        host = "gh-etwas";
+        hostname = "github.com";
+        identityFile = [ "/home/rhea/.ssh/id_gh_etwas" ];
+        user = "git";
+        port = 22;
+      };
     };
   };
 }
\ No newline at end of file
diff --git a/secrets/gh.age b/secrets/gh.age
deleted file mode 100644
index 544340e..0000000
--- a/secrets/gh.age
+++ /dev/null
@@ -1,5 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 7JS6dg I9bdNrtj0UzjlrVWOjgVomgWprX+KAaL4uITS9j163I
-8vEaIAqFwmUKXbBskafWr15tqYIfmWjKn9g61F4y6F8
---- ToUNScc7K59kI8y+SR5e3RxTu16uGSsvd65tqomiOVc
-Vo�X��Z�ζ�������G}�Z�m���Ӡ�,���*��۳�}u���8� \^I/�T"us\��CG�
���h��m>���$��]���$H"<�.tb�O������ֱ�!j�у"����@��o=�ث�_�o����]��z�9�~qO
\ No newline at end of file
diff --git a/secrets/gh_argstr.age b/secrets/gh_argstr.age
new file mode 100644
index 0000000000000000000000000000000000000000..d7606ab88db3d7bfeff8e56816c178c9b48e7181
GIT binary patch
literal 339
zcmV-Z0j&OEXJsvAZewzJaCB*JZZ2<fXD@a!3N1b$b8~1dWn?lnH8D9LH%e1BWM?2q
zL}+$ldSOmlQA#&?c{pJ?bwo5sXGBqJZ+3cBZc0y0ax`x;VQy4fMNJA>PI_8ZOHpr0
zdSqE`XHH{tK~igHWJ`EZZgVkdLU1udXl!&VH)(B8aAOKBEiE8cS8r8KV>5A0T4HiD
zD`ZhNQCDzQWp+$gQ)zBkZ+T%uSxR?$c6LQFNNWmN{>Cg>lwymI$kXJ`7m(FAv-w#>
z7nBisV?45qLkeHmnV3TGKtIRuGfy){p%BOYfkiA=dTo|?B0`-5QM}1WN!fXbR)OY-
zkuXgljHVkHHdOG$V{+|40y~mWq^$dgH|cjyKDG{F|9vn6&z1VPO;hsg`Ym|Z0HV~=
l^Vky~a3tyN7QK!F;q@E5hLZ@%weAiKl7vvW=Y#;}?BmoYi}C;f

literal 0
HcmV?d00001

diff --git a/secrets/gh_token.age b/secrets/gh_token.age
new file mode 100644
index 0000000000000000000000000000000000000000..102ee8470ee8ab681a7dab067b924bff45bdc265
GIT binary patch
literal 306
zcmV-20nPqlXJsvAZewzJaCB*JZZ2<fXD@a!3N1b$b8~1dWn?lnH8D9LH%e1BWM?2r
zQ%81kW;1C~RZUn+LTg%3Ra0v-WN}n;PjGBVRak9NVKy^ud2LftGiM4fW@KepGBQDD
zOGjlkP;W$dQ#4FWR#9$FSwum3V@6_BYgsvSSusm@K}`xREiE8oY;0>(Pj5(VR#Goz
zIXFXec34Mkd2~`WdO2cHZ**xgS!PXdOfphILpTbOd!0{V&@KjbP9u5gO<PqEbo1Dp
zzK$Ua)YG)IXsdxOnO9cyyLaE_UN0gk((_#30FdZa8AatYFkOz$%I{gGP@4FAh-lCb
zR?*&6&Pg_i8>dLanO%A2KwX!h;Iot57yP2WLcb6?^AY}!6loA5m?D3<i3_6aq`wZD
E5)3(cUjP6A

literal 0
HcmV?d00001

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 48c7aa5..95c51bc 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -3,7 +3,8 @@ let
   systems = [ rhea-laptop ];
 in
 {
-  "gh.age".publicKeys = [ rhea-laptop ];
+  "gh_argstr.age".publicKeys = [ rhea-laptop ];
+  "gh_token.age".publicKeys = [ rhea-laptop ];
   "1bvps.age".publicKeys = [ rhea-laptop ];
   "gcd_etwas.age".publicKeys = [ rhea-laptop ];
   "sign_etwas.age".publicKeys = [ rhea-laptop ];