Use ssh-agent
This commit is contained in:
parent
34db2b3098
commit
c29d21b186
3 changed files with 22 additions and 12 deletions
|
@ -23,15 +23,6 @@ in
|
||||||
{
|
{
|
||||||
home.stateVersion = "20.09";
|
home.stateVersion = "20.09";
|
||||||
|
|
||||||
programs.git = {
|
|
||||||
signing = {
|
|
||||||
key = "~/.ssh/dadada-git-signing";
|
|
||||||
signByDefault = true;
|
|
||||||
};
|
|
||||||
userEmail = "dadada@dadada.li";
|
|
||||||
userName = "dadada";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.gpg.settings.default-key = "99658A3EB5CD7C13";
|
programs.gpg.settings.default-key = "99658A3EB5CD7C13";
|
||||||
|
|
||||||
dadada.home =
|
dadada.home =
|
||||||
|
|
|
@ -5,6 +5,12 @@
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
cfg = config.dadada.home.git;
|
cfg = config.dadada.home.git;
|
||||||
|
allowedSigners = pkgs.writeTextFile {
|
||||||
|
name = "allowed-signers";
|
||||||
|
text = ''
|
||||||
|
dadada@dadada.li sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIKu+pA5Vy0QPHJMjn2S5DCsqKg2UvDhOsBwvvJLf4HbyAAAABHNzaDo= dadada <dadada@dadada.li>
|
||||||
|
'';
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.dadada.home.git = {
|
options.dadada.home.git = {
|
||||||
|
@ -14,6 +20,20 @@ in
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
|
commit = {
|
||||||
|
gpgSign = true;
|
||||||
|
verbose = true;
|
||||||
|
};
|
||||||
|
gpg = {
|
||||||
|
format = "ssh";
|
||||||
|
ssh.allowedSignersFile = "${allowedSigners}";
|
||||||
|
};
|
||||||
|
tag.gpgSign = true;
|
||||||
|
user = {
|
||||||
|
email = "dadada@dadada.li";
|
||||||
|
name = "dadada";
|
||||||
|
signingKey = "key::sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIKu+pA5Vy0QPHJMjn2S5DCsqKg2UvDhOsBwvvJLf4HbyAAAABHNzaDo= dadada <dadada@dadada.li>";
|
||||||
|
};
|
||||||
core = {
|
core = {
|
||||||
whitespace = {
|
whitespace = {
|
||||||
tab-in-indent = true;
|
tab-in-indent = true;
|
||||||
|
@ -42,10 +62,7 @@ in
|
||||||
branch = true;
|
branch = true;
|
||||||
showUntrackedFiled = "all";
|
showUntrackedFiled = "all";
|
||||||
};
|
};
|
||||||
commit.verbose = true;
|
|
||||||
log.date = "iso8601-local";
|
log.date = "iso8601-local";
|
||||||
tag.gpgSign = true;
|
|
||||||
gpg.format = "ssh";
|
|
||||||
pull = {
|
pull = {
|
||||||
prune = true;
|
prune = true;
|
||||||
ff = "only";
|
ff = "only";
|
||||||
|
|
|
@ -15,6 +15,8 @@ with lib; {
|
||||||
networking.domain = mkDefault "dadada.li";
|
networking.domain = mkDefault "dadada.li";
|
||||||
|
|
||||||
services.fwupd.enable = mkDefault true;
|
services.fwupd.enable = mkDefault true;
|
||||||
|
programs.ssh.startAgent = true;
|
||||||
|
programs.ssh.enableAskPassword = true;
|
||||||
|
|
||||||
age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue