From a4d815202eac009874bcf119aa0e7192d3de1fbe Mon Sep 17 00:00:00 2001
From: Niccolo Borgioli <hi@nicco.io>
Date: Wed, 2 Jul 2025 00:11:31 +0200
Subject: [PATCH] Refactor SSH config to use host-specific keys and disable nix

- Convert SSH config to template with @SSH_KEY@ placeholder
- Add sshKey field to host configurations (mac14, ordio)
- Update home.nix to dynamically substitute SSH keys per host
- Change docker cask to docker-desktop in cask.nix
- Add development packages to ordio host (mkcert, dnsmasq, etc.)
- Disable nix in darwin.nix configuration
---
 home/home.nix               |   4 +++-
 hosts/mac14.nix             |   1 +
 hosts/ordio.nix             |   1 +
 secrets/ssh/config          | Bin 944 -> 0 bytes
 secrets/ssh/config.template | Bin 0 -> 890 bytes
 5 files changed, 5 insertions(+), 1 deletion(-)
 delete mode 100644 secrets/ssh/config
 create mode 100644 secrets/ssh/config.template

diff --git a/home/home.nix b/home/home.nix
index 09ca6f4..6b3fd93 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -33,7 +33,9 @@
       ".config/nvim".source = ../files/nvim;
 
       # Secrets
-      ".ssh/config".source = ../secrets/ssh/config;
+      ".ssh/config".text = builtins.replaceStrings [ "@SSH_KEY@" ] [ host.sshKey ] (
+        builtins.readFile ../secrets/ssh/config.template
+      );
     };
 
     shellAliases = {
diff --git a/hosts/mac14.nix b/hosts/mac14.nix
index b3cc072..80ecbab 100644
--- a/hosts/mac14.nix
+++ b/hosts/mac14.nix
@@ -2,6 +2,7 @@
   username = "cupcakearmy";
   hostName = "mac14";
   platform = "aarch64-darwin";
+  sshKey = "legba";
 
   extras = {
     casks = [
diff --git a/hosts/ordio.nix b/hosts/ordio.nix
index b348320..36ec0da 100644
--- a/hosts/ordio.nix
+++ b/hosts/ordio.nix
@@ -2,6 +2,7 @@
   username = "nicco";
   hostName = "ordio";
   platform = "aarch64-darwin";
+  sshKey = "ordio";
 
   extras = {
     casks = [
diff --git a/secrets/ssh/config b/secrets/ssh/config
deleted file mode 100644
index 2f180a82799352e811666cb2fea1d52281780c12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 944
zcmV;h15f+_M@dveQdv+`06)IU7S#I9v~AZ|w(4C7vSM#!vrJcNrIGLvFGhFteJ!ZF
z&o6s*N>lqY9dQ{|QxCphA<8bZ7_xUQX0YY;e5Xdb+8YT|++yO9s!yb}oU=eO;2Tnq
zEQtmrv00wH(=j_mx+#{#g*>!so=01cZGlQBAyG|bwxL#@nna6=NN1dMRU<0ktp`L-
zQwRAop;=sCZBOw+KHfb}U_n^a^oe%2Ib46dC+z4e#J&?7?j=;n5eNw$mXzOw{k~Zt
z!Zzb#3@j6I#o^mlbu`kV-no5C0<Ck;pDybP+dm>>Osb`Sj%M8O$uh_Sue%=czz%rm
zHr*k##)@+Jx%u*PQVHS_&v-!W@8?s%)=hb$y8<6&)nh{r=J_9*-#mQnq7sFv*EXd1
zbmO0vlaWQhDJt^~&~&;hwdPk9{j_n{TAV5+L*Dr|Y;X^Y*vy`!Rb})+(fPiSMgxB(
z4g6p6SGqfJ@TE4-BzVXge1-m2zbmX4_kv*%k+z`wTvvlt3XA+`Dhlj!O5uW2+;?qj
zPjxh)EVXSofY@txp=Wbf?WzX9)z{k)5wsd+VB_lCPZrW%Wd&yW%qM*rp5}2OCLfxg
z#WP?XFZ7sUU|srWR!b?6Pq?1P5QN*KG?<~EMj&$2VM;&ztqF)`K|P(=<od&-$w`Qe
ztTHA+MuM#1h)3{ZMUzP{hcHHPtV~S9CdmpU7Ec}x57vyvtw2sBh|)imfBOPWcl>i1
z&fTxaeFf>O8(%1eO#!jSsGULAeWT)-1xMv6hKQN$i%^&9qEV6vmjep-QG@6l7#Aux
zp5pRTR<Nx^J$z9?K~vIeHvuHic&Q{fPR2E?C^KwLrGn}7s)7tRrbwEQ)}NRF{EvxU
zE?twVI`*8evl@qOL8O<&%8rtizo*t1nE+|Fs^2QwiAPuwDQkIIcnWgr$hHZ&uVaR2
zgQ4?^kOep=RB0Ap1d;F!G_YEcObZ_ey7UcZO0hk+ja_lbx#@=}9tp~Td4XX_nc|t;
z%VW*SNw4wGr+$jUHRRj4TY0mImd5tp<+0NYmbVoA^gdKO30!AA*5<@L(Dn+%1j9hC
zh_Sh;N!vRyS?`Z~HOSb|_PRBdxR<1lMr9GDnu7fxUDsmF-OX01fi+q;qme5Ev9VbT
z7zH4pb|`r8(xUsSa`qGJC%F43KXk)mN`)mO$b7NJ-!uU-G+4mU?8@AXR@NYZWoFrT
Sj1S3DL3tGA#%YFYRM}+v`p>!m

diff --git a/secrets/ssh/config.template b/secrets/ssh/config.template
new file mode 100644
index 0000000000000000000000000000000000000000..3938e253b298bcec1091d11feb2803405035ef5b
GIT binary patch
literal 890
zcmV-=1BLtmM@dveQdv+`0OR^I|LTU``%AsY!!+r_MsQAQ=5|pCv@Rl<v;~{)7J{%y
ziyx~*Z3Qx)`xSYa5jz`&LOA4n5m~>X1D+|Cn;CE@T@7Eqc!LiH4$=#sVIpK(w<5ot
zqJ)f)a{nR^*<UoKQ$Pe2g8GJzp{p;nHhguBwzg#yaT+{>UN~0|{YQ`!9!G#lVtF`e
z0^oQwu6@!l2E!nHaL;;?j}bpffirm=Dlg$~OaV%ym$u(NM)706HI1VgV*EiHN!(d>
zCjvxm=*||KKUzZ(S0COI)Jua;=vwWqyZY4r%i37s*t_OQKZ8z|&ZM*4{K1?ZX_H;d
z+G7CbCyyMH$v!05ip@=A>_-JD5Jy-{BVJ3yA>$IXS#Z5}Y()$6XM?z&EoA#Gb^G>*
z6X_C(!&vSVgZTOB?*0j#Kn=2{PjzG<9d14Zo94KV%PBBcpVaq*;^lnJ?KIgTjS2;+
zsHHQYlP{F-+cOC;IO<F6D-h<zh}39MRrhZ4^sru5mdixZqt;HpX;eGdCTFR`y_$#|
zt1(C{H7+syKm#<}GIRliP>M?EK{L+Z52ugIz)KW5q@<qNu}lv5&ZzRsuNyx+WE;A+
zS`mZI+2j2CYn&LJB3lqV96<Z;yL%F~AFw`ehU6Yy=73$kGv0+LQGv~ZbUym>?5iIW
z_=vuCro!YRgOYx{K=*$`w4kq2BZkhx@^2#vtm=Wtpy?br^xmwQ)3K!thEb=of(DQP
zqtJHp8ne?JgI(Yz{Z?e3hGP62a-ybPub6{jOphahUfQYbI;qm6ji<x2-*rbWfQH-@
z1q9QXn@SuGl%y5c7s*O}oZ$$kIMUxQv7M#|gT1Lw{#z+OB=97hZGpWNh4}UmhYFB7
zKd2wjodk34{1dElx*`b&1iTo|GAATP|0o&mi}?%vvSLF-M3D#9D0IhDMDv_ntJ@1t
zqocKU6%r!>1N0hzlT`&-v&mn<>te{7uyLPN0%j6_?w;F5-A87n(4=%tYdpy{1^aFd
zCs7D0hwCu-It|vK>s$fgY<}FPW}}Gp8!$%#&)Wp5SdMTf8SajkOF;ijSz4#lA<1ut
zl8n7i4!!`J`*cR^&ey!+3ZiJ4mJnSX?-Gh6FJq<b2%HKPCMbt8Tg?M256LUrMC`yb
Q*JBj>5FpKmZ`L>o)mg8qGXMYp

literal 0
HcmV?d00001