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
This commit is contained in:
parent
6d28265b1d
commit
6dbecabf40
|
@ -45,4 +45,8 @@
|
||||||
LockDatabaseIdleSeconds = 120;
|
LockDatabaseIdleSeconds = 120;
|
||||||
Security_HideNotes = true;
|
Security_HideNotes = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
SSHAgent = {
|
||||||
|
Enabled = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,10 +40,6 @@ in {
|
||||||
inherit config pkgs;
|
inherit config pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
keychain = import ./programs/keychain.nix {
|
|
||||||
inherit config pkgs ownLib;
|
|
||||||
};
|
|
||||||
|
|
||||||
gpg = import ./programs/gpg.nix {
|
gpg = import ./programs/gpg.nix {
|
||||||
inherit config;
|
inherit config;
|
||||||
};
|
};
|
||||||
|
|
|
@ -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;
|
|
||||||
}
|
|
Binary file not shown.
|
@ -1,10 +1,6 @@
|
||||||
_:
|
_:
|
||||||
|
|
||||||
let
|
{
|
||||||
oldKey = "~/.ssh/id_rsa";
|
|
||||||
newKey = "~/.ssh/id_ed25519";
|
|
||||||
|
|
||||||
in {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
|
|
||||||
|
@ -17,10 +13,7 @@ in {
|
||||||
"github.com" = {
|
"github.com" = {
|
||||||
user = "git";
|
user = "git";
|
||||||
hostname = "github.com";
|
hostname = "github.com";
|
||||||
identityFile = "${newKey}";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // import ./ssh-match-blocks.nix {
|
} // import ./ssh-match-blocks.nix { };
|
||||||
inherit oldKey newKey;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue