From 6dbecabf406e3df94d9cc67ff9405fe19bcf9830 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Wed, 24 May 2023 19:54:41 +0200 Subject: [PATCH] Use KeepassXC as SSH Agent This replaces the configuration of files per ssh match block, as well as the need for keychain. See: https://keepassxc.org/docs/KeePassXC_UserGuide#_ssh_agent --- home/files/keepassxc-ini.nix | 4 ++++ home/programs.nix | 4 ---- home/programs/keychain.nix | 10 ---------- home/programs/ssh-match-blocks.nix | Bin 2319 -> 1860 bytes home/programs/ssh.nix | 11 ++--------- 5 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 home/programs/keychain.nix diff --git a/home/files/keepassxc-ini.nix b/home/files/keepassxc-ini.nix index edb2da3..69e59d0 100644 --- a/home/files/keepassxc-ini.nix +++ b/home/files/keepassxc-ini.nix @@ -45,4 +45,8 @@ LockDatabaseIdleSeconds = 120; Security_HideNotes = true; }; + + SSHAgent = { + Enabled = true; + }; } diff --git a/home/programs.nix b/home/programs.nix index d998179..7c42cf0 100644 --- a/home/programs.nix +++ b/home/programs.nix @@ -40,10 +40,6 @@ in { inherit config pkgs; }; - keychain = import ./programs/keychain.nix { - inherit config pkgs ownLib; - }; - gpg = import ./programs/gpg.nix { inherit config; }; diff --git a/home/programs/keychain.nix b/home/programs/keychain.nix deleted file mode 100644 index 90ecb77..0000000 --- a/home/programs/keychain.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, pkgs, ownLib }: - -{ - enable = true; - keys = if ownLib.onHikari {} then ["id_ed25519"] else ["id_rsa" "id_ed25519"]; - enableBashIntegration = false; - enableFishIntegration = false; - enableZshIntegration = true; - enableXsessionIntegration = false; -} diff --git a/home/programs/ssh-match-blocks.nix b/home/programs/ssh-match-blocks.nix index 37e8a7bd9fc2c4350f8e70257a238c8818a9c724..55d9900936927babee6c01f6c25cb088ceb8107b 100644 GIT binary patch literal 1860 zcmV-K2fO$HM@dveQdv+`02nw-`I*9Qn*~OTJDu3z=3mT@TelWucTP88?sRD!PRDNs z)>f}}_I6G(M!9@$ZbGl3TJMYr1d*@T;sRUCSMj)Rx(`QSk(2P2Lc`y`67sb=sRLRY zn^XFo^ZtA9rYH7gh%4T;8_J`5hhq@?APr^xLsslb$0P7oZszIqLrph}0*OuKXG-7< zfk3bNl`s*yh0#O>iJ*Pf|GMo=D#f=VXZBB~&4VV#I`vgZmQ%>Eaz;Yi?Y<-zX4E$_ zQHyni$nIWP;iGJY-BnmM3!IVJvckq+XJFDG+=0rC41-3Dlk5Y&&0k4 z5#om(3!}L{C57yD82B)DQO#e@Q3vUjibk<9Z`SlkdM?%kHBo6rlmRtx zxCe|4Y^8Q~;ttVJ1+278Xvzj|1c4lNxg+V)2qyvL9;IVNM+;8l%@FHz6#QNWHVcN&Q(uK<{EQ16cu7FLAn)Ao;VXq$04LSZq zUn8^2ETEq|&$Q_~^9y^3%PdEB^q_>j!s5%X2SLEP#>}6w6v7rCxlbBS3c8^Yj1~@ zIs{R6VsXQ?@}KfP%tnlpsJjKdq1RF2m|vr^6d|-~Cfo1(2(l{i8Uk#fTko0P0kG#^ z%y8Y6o|i*0EACp}?0=C!v%w*i(;iobM3Z44V`W-?y=Za}tCc7WT*s~6u$jMbvL!5| zGK5R=!2+#i(Zz%A$&`bab?zrlv6qm_8E6k3zp9-v@#FY~mJCV54(>o6--l*Rn}*h$J0XfN`oSSEAWd3 z<*79+YsQDx{EpcJq7-uEBCT+Ywj)IoyOrONAq|O0J-TXhXHAzTgI|g!1I1X)ofTvg ziP`(noDwOf-NzeX8MIk6N9tEq&uy3&B+|mM&$q2sI7>Q9JbDTbi|BYCn`i=+x33ee zn~%N&cj@!o-iJ!%IQCVO1N82t%nW&iDYY-eoxFEkfLaSQJHoV!<#WBWobd0M$absB@Q0KqileMGHWt%@Z z4uH1M3@8#39(va>nOTpyuJl*WA%6aboqZ$QX(V}+IH;L7@zcS%ZpUNzJVELcQ&-}y z?d3A7eq}ZKrIASvby`tms-4@ZN10Cp3d8K*mcDyipAxJ(zY|BH#CPt9FPk^iuac@% zm;m$fqNdii9YSdp0~tP3#qkxV88qg25olh(-x$!k;ey8+9+R zMwVIiRCi~dPc4r^50R4;S$l~#Q0UA#YZ^|VshcO;R5Ji$ZZB@U`NcOD?pRWCKrf?v y+^hBa0z>b0dmsAIN4^+I6vF*15HmDvO&K@TGup5G@J6UZY>)tfrGxkXf-@RWu%Q3| literal 2319 zcmV+q3Gns+M@dveQdv+`03pUq9F^o&2)uDFM^=E?otM>6#{rtGQ@VQ19}Z?p9PvU(W1^xZlfy>&mE7~F&FoAB)zCb?&l@Ay3;{v z^C(q4BFe;Y6zcU%qb#u$=cE(b#sYr6@`6`F6100|xlYz1;;`F9Vy3|!9F`5kS9DKm zI>J!dq19T?=0|-fL5~AsbwcyzfSt!WzUaDLP1JI#(CBbf%PrGT<3#7Kr9g4 zi5E&1f1r+)L9Wb|liAK%6`Cc*e+tSZ!>`Ip1&Uch;D3JlUt{yz9qLm8^Rtg%HB;{l z&|Bqp?Bp8C3!-%?NLAztj}~K(M*5T9IJ{#DkfM24vGRxN2I`8ZG z<2Z{_ENm(tH2o$bnJrl(l!5Ss>e<`uC-#w(Wb&y`&Mwu<#i&p0(>$_L54BA5$h@F4 zzQ&KR@xP@R&ie|wb;(i5oQnl!+6yy5bsnZ1ejM(X!qz7!WktW`D~3ba z9*|Nr;WFcu6!_)ZSNlDmwmB0+sJE=@`|tbFapBkJ*NR*-`XLP8Q(f91T*A~Kc#kR2 zpv5s)YLcuvSaLc`$GTpC&rSshix>2l@-Hx z_DSM?LFd;z7i75DB&HWeDeuso*qGH6_2l?of%{6w%5I}tfJ7ex9YrwG;^u2^Hl&$F zhP_v;{{@XtXC)0L2TF+%gHJgbA;%nuGsvxRiLoqku-BSw#7FK5*Z>EyiLRNcEd3X$ z?dU$Y{?bSG^G4k=dU90TqGW>cBjoJ`bqk>;0TO-Kg@AZ$IX6si8B-w zHsE-#Bx0a9uS{JLL=O>?@RZ9#tmrn`!(5ODwo3=a-;jExcgff|cIdT8Lzcc~y$T>N zzio>Q${so{4>$sZxDs~noKO>61Q+-jh=Tje_BnmVyN2r#)<(OIWG$xN-8ZJm02_vw zjefzeF0dt?gi5Ui^+@>-u9m8PS4-;G*=uaN^XQ7?PlN~|kUlt9CkQsbW6OO}k4TG) zHS46CoRQK0)ZqW9A>A$89hu*vB~?ADpB95MW7aI1h>{tiAj0Y6K= znHsM;X5@jikPKGWeYwQ_z>x;;mMgHNR4@NYf_003Z;dN`;Ym*-OETB`${lbe?J*DF z30;5v7`~v zyK(XU6&T@7ffKen_BF>32kv{y@qo6xrYeuzQq8?({ufbKHoDFVtCzr^_c53|S9&d= zys^lkHuur|GZhdQ5o$L11=%=;NYG}Wf;#=NDT{xvu?K>zJ@4Q?Jm$m>_?TL2j^+_{ z%31V@7HKRjXe5uby@jC*8X!cbc}G+E{4Jw*FF5&igB1K7O5kyVIS_~)wr&cyxE zvUw%P!ST0C_qQoCnFcxWoN>B-vSu~OPmFcy*sdD5@=1n$HG;wH6yJq8zqeAsbOP?@!#cw8sRXz<%;u7|y(`S- z?n}*8_(@GiSu=WrULJ)kle71vlWQ)uU4&Biaab%QKDxgrnD)pIw}XG{P93v` z)3@}e%t4O8xhyBc;{{%Wl!ukR9(Un9KMbq{U54fe8=x6{-h@(n39s6V<=Vc(rF`N5 zru{1rCS<+bJZrm>zLub9PzE=iR7>ic5kF5RM;V=|6>{Fs@D)e?R?E7h-Ur1MGm0QT zzU<@^PtfaC@kWo#W(ddI9#IKqzUZ`P(oYwi)1Ss>?PE4=ct#G5um%6Rk)O11&je9P zx|8hiw&_q>m2jn?ZCXog96CQXNRBqFk(6pVO*tAw1~>tdb8uvWCcHuat@OzN;=*4c pSKlWzQS&e8c}6C|&g6I?ST~o0dqHb~w diff --git a/home/programs/ssh.nix b/home/programs/ssh.nix index e457779..d171fb1 100644 --- a/home/programs/ssh.nix +++ b/home/programs/ssh.nix @@ -1,10 +1,6 @@ _: -let - oldKey = "~/.ssh/id_rsa"; - newKey = "~/.ssh/id_ed25519"; - -in { +{ enable = true; matchBlocks = { @@ -17,10 +13,7 @@ in { "github.com" = { user = "git"; hostname = "github.com"; - identityFile = "${newKey}"; }; - } // import ./ssh-match-blocks.nix { - inherit oldKey newKey; - }; + } // import ./ssh-match-blocks.nix { }; }