From 99b3248bcb417b8842ba6d4001e98f3c37e03e3f Mon Sep 17 00:00:00 2001 From: Ricard Illa Date: Tue, 1 Aug 2023 10:42:38 +0200 Subject: [PATCH] feat: changed gnupg key --- home/git/default.nix | 2 +- home/pass/default.nix | 7 +++---- home/ssh/default.nix | 8 ++++---- home/ssh/id_rsa_gpg-cert.pub | 1 + home/ssh/id_rsa_gpg.pub | 1 + home/ssh/id_rsa_yubikey-cert.pub | 1 - home/ssh/id_rsa_yubikey.pub | 1 - 7 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 home/ssh/id_rsa_gpg-cert.pub create mode 100644 home/ssh/id_rsa_gpg.pub delete mode 100644 home/ssh/id_rsa_yubikey-cert.pub delete mode 100644 home/ssh/id_rsa_yubikey.pub diff --git a/home/git/default.nix b/home/git/default.nix index 18a6e30..21f05ae 100644 --- a/home/git/default.nix +++ b/home/git/default.nix @@ -9,7 +9,7 @@ in { userName = "Ricard Illa"; userEmail = "rilla@monotremata.xyz"; signing = { - key = "0x8333CFB0B9D3244D"; + key = "0x101F79336E07C850"; signByDefault = true; }; # delta = maybe? diff --git a/home/pass/default.nix b/home/pass/default.nix index 33a5b97..59f92da 100644 --- a/home/pass/default.nix +++ b/home/pass/default.nix @@ -2,14 +2,14 @@ let password-store = "${config.home.homeDirectory}/.password-store"; - stores = "${config.home.homeDirectory}/.local/share/gopass/stores"; -in { +in +{ programs.password-store = { enable = true; package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]); settings = { PASSWORD_STORE_DIR = password-store; - PASSWORD_STORE_KEY = "B51D4548A4846E3C8D115C808333CFB0B9D3244D"; + PASSWORD_STORE_KEY = "2E0A7CADFF84D08BA94273AA101F79336E07C850"; }; }; home.packages = [ pkgs.zbar pkgs.gopass ]; @@ -26,7 +26,6 @@ in { parsing = true; path = password-store; safecontent = false; - mounts = { lan = "${stores}/lan"; }; }; }; } diff --git a/home/ssh/default.nix b/home/ssh/default.nix index 513efe1..5dc0602 100644 --- a/home/ssh/default.nix +++ b/home/ssh/default.nix @@ -3,14 +3,14 @@ let defaultBlock = { identitiesOnly = true; - identityFile = "~/.ssh/id_rsa_yubikey.pub"; - certificateFile = "~/.ssh/id_rsa_yubikey-cert.pub"; + identityFile = "~/.ssh/id_rsa_gpg.pub"; + certificateFile = "~/.ssh/id_rsa_gpg-cert.pub"; forwardAgent = true; port = 22; }; in { - home.file.".ssh/id_rsa_yubikey.pub".source = ./id_rsa_yubikey.pub; - home.file.".ssh/id_rsa_yubikey-cert.pub".source = ./id_rsa_yubikey-cert.pub; + home.file.".ssh/id_rsa_gpg.pub".source = ./id_rsa_gpg.pub; + home.file.".ssh/id_rsa_gpg-cert.pub".source = ./id_rsa_gpg-cert.pub; programs.ssh = { enable = true; matchBlocks = { diff --git a/home/ssh/id_rsa_gpg-cert.pub b/home/ssh/id_rsa_gpg-cert.pub new file mode 100644 index 0000000..61bd9de --- /dev/null +++ b/home/ssh/id_rsa_gpg-cert.pub @@ -0,0 +1 @@ +ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAglWhTnSbL1uBWO80hihwZUrdKrHPf/FmDMpvYKKTXzf0AAAADAQABAAACAQDOYX4vqQexz5w7aSBtcrsESNatF8U1BJnH2WXMIsN/zM8buDBsyuKRW8N8QhxanMMpjHTlbj0m0h2HRweBazezBn97dM7N2JbwSFhcgg3Nk2F85ThT+Ko4SzoBD0AQQUpVIglCrWp2wnvs4E4gEgcTvUQBFc54Cawc4WAwv9BRYfKFO78PrAqdKrpenNjVIAch/4le0WTTAaPLEc8nseeUm+wQRbHKFOq6vkA8LDwz3PlZQuW/NP7vBocFHmIn1Q0UwMPTDF9KbepO7TTsG+Tpf/Ro3YpBCLWFU2VtFF8gGwPANP5JBLMdkGBemGT1/hMUdoVST1SDJLsqRxw4p9rS4ylJf4lniTdTZHDk4vteu0zqSlaTU6/WjcT3WLCbKole2EX00IbEGNTYokIvgjikcM3fHny71yNT6VTRVXASWstQD8YCdgevzqJhUD/oJP4iLuWDB9lCa98QQ8fsBcl8S/aeXSUZ25eioohsYxVP/yye6lCw8TAm/qaJ1brg6pbY3QkZ6PteUmQciiqCAv2lMQBOBhyRy6zKKu3ild74JVCaiZCcstdgIDiPMoh5tPIulhjLcN6NH1584nDNAHnNgP15HVUQvyDlZodwCi1P8TZNo1GvhjQuiIXi79htKgvg6tIcKkOsJWEvEHUEOzx/ues+eM3O5rt4C4DBKkYAywAAAAAAAAAAAAAAAQAAAAd5dWJpa2V5AAAAFAAAAAVyaWxsYQAAAAdhbnNpYmxlAAAAAAAAAAD//////////wAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIHWoElrMDzjVdjcTKjBRqM/uiBtgTHaBwbBMMFyHeT+QAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEDs2GO93+FlGd5cD7oeGCANAWMyjbro8Rq4/epDO6aOtbJm/fnMbNgilZ+0NrwrWku68ax4H/lBkmbshvRRL7cL cardno:10_968_164 diff --git a/home/ssh/id_rsa_gpg.pub b/home/ssh/id_rsa_gpg.pub new file mode 100644 index 0000000..65ccfc5 --- /dev/null +++ b/home/ssh/id_rsa_gpg.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOYX4vqQexz5w7aSBtcrsESNatF8U1BJnH2WXMIsN/zM8buDBsyuKRW8N8QhxanMMpjHTlbj0m0h2HRweBazezBn97dM7N2JbwSFhcgg3Nk2F85ThT+Ko4SzoBD0AQQUpVIglCrWp2wnvs4E4gEgcTvUQBFc54Cawc4WAwv9BRYfKFO78PrAqdKrpenNjVIAch/4le0WTTAaPLEc8nseeUm+wQRbHKFOq6vkA8LDwz3PlZQuW/NP7vBocFHmIn1Q0UwMPTDF9KbepO7TTsG+Tpf/Ro3YpBCLWFU2VtFF8gGwPANP5JBLMdkGBemGT1/hMUdoVST1SDJLsqRxw4p9rS4ylJf4lniTdTZHDk4vteu0zqSlaTU6/WjcT3WLCbKole2EX00IbEGNTYokIvgjikcM3fHny71yNT6VTRVXASWstQD8YCdgevzqJhUD/oJP4iLuWDB9lCa98QQ8fsBcl8S/aeXSUZ25eioohsYxVP/yye6lCw8TAm/qaJ1brg6pbY3QkZ6PteUmQciiqCAv2lMQBOBhyRy6zKKu3ild74JVCaiZCcstdgIDiPMoh5tPIulhjLcN6NH1584nDNAHnNgP15HVUQvyDlZodwCi1P8TZNo1GvhjQuiIXi79htKgvg6tIcKkOsJWEvEHUEOzx/ues+eM3O5rt4C4DBKkYAyw== cardno:10_968_164 diff --git a/home/ssh/id_rsa_yubikey-cert.pub b/home/ssh/id_rsa_yubikey-cert.pub deleted file mode 100644 index 952eefe..0000000 --- a/home/ssh/id_rsa_yubikey-cert.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAg/2+dgwO+Ofq3Wvy8Vzx2NdEOdqx4b10w2lGINu318G4AAAADAQABAAACAQDaiwmnSKC4DpznZlode1987DvGVLWqkvDZXZ6ey/LOZhRHvNnr5lP4Ke034R17mHHuTlzzuTKUKTN6JcIxBURGUwjWgNQO5z+7SapdOvPpw7M8wOlgp92CbIMiE/tReNbUi2e584Y5NR4tMCQm+FPvQ7c7nY/WoxJ6VSiKBbXzN+IrB9H6ZAVyfAlzHpxhwXeuP5xFwTtapzyzyc4phvuIhbXUc9NOZHXwoAR2La/0TVOgDyktEmCq6aGet03Azz6KPRptdnf4g9V3u8YivccXfd9WTrJr9fj1fWjDU9bBKVU6GtdcSwfqKwa6X4sQIZfONKvVEfqbIIEB70FsXHcdfnm3EN5L1PWbC441Q8bB1zvu/GnlXTlxDFmzByxnbLWTSPLuQyKq5sv9va8Jl9QEVpS3qWJbPHYBTevgboTExyLmpEfsCI+Of86Oxb8PNjyhX1/oWiy8S3w+5oQgAb+yNfSVPnX7CO4oGQhnttoXHA94LzxArYr9zZIp2asRMlc4VVWVH/jQ4FdLDjvKNARYiytOplZBPvFOHJiGb/rfjZKbMPPE+3V1WQPZ6B2nlWN5QxTpnLgTQnONr5rlSrvzFPY8BISUAYcdOCErG4agHDkHFZqWn8u+51wUZUnXo4NI+rty4Nzmc/kPfqWyv/8mSJfihidfuuHGEEzCk1qVdQAAAAAAAAAAAAAAAQAAAAd5dWJpa2V5AAAAIgAAAAVyaWxsYQAAAAdhbnNpYmxlAAAACndvb2RwZWNrZXIAAAAAAAAAAP//////////AAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAgdagSWswPONV2NxMqMFGoz+6IG2BMdoHBsEwwXId5P5AAAABTAAAAC3NzaC1lZDI1NTE5AAAAQGBK6cVFrPbg1/NgOYNYUKuCgNjCsJaIMXWaIt0lW5V8GRDQjdxfzNlEAlJv6+z0s58Ar4sartbuxxWyJGnL9wk= cardno:000611073199 diff --git a/home/ssh/id_rsa_yubikey.pub b/home/ssh/id_rsa_yubikey.pub deleted file mode 100644 index c092b27..0000000 --- a/home/ssh/id_rsa_yubikey.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDaiwmnSKC4DpznZlode1987DvGVLWqkvDZXZ6ey/LOZhRHvNnr5lP4Ke034R17mHHuTlzzuTKUKTN6JcIxBURGUwjWgNQO5z+7SapdOvPpw7M8wOlgp92CbIMiE/tReNbUi2e584Y5NR4tMCQm+FPvQ7c7nY/WoxJ6VSiKBbXzN+IrB9H6ZAVyfAlzHpxhwXeuP5xFwTtapzyzyc4phvuIhbXUc9NOZHXwoAR2La/0TVOgDyktEmCq6aGet03Azz6KPRptdnf4g9V3u8YivccXfd9WTrJr9fj1fWjDU9bBKVU6GtdcSwfqKwa6X4sQIZfONKvVEfqbIIEB70FsXHcdfnm3EN5L1PWbC441Q8bB1zvu/GnlXTlxDFmzByxnbLWTSPLuQyKq5sv9va8Jl9QEVpS3qWJbPHYBTevgboTExyLmpEfsCI+Of86Oxb8PNjyhX1/oWiy8S3w+5oQgAb+yNfSVPnX7CO4oGQhnttoXHA94LzxArYr9zZIp2asRMlc4VVWVH/jQ4FdLDjvKNARYiytOplZBPvFOHJiGb/rfjZKbMPPE+3V1WQPZ6B2nlWN5QxTpnLgTQnONr5rlSrvzFPY8BISUAYcdOCErG4agHDkHFZqWn8u+51wUZUnXo4NI+rty4Nzmc/kPfqWyv/8mSJfihidfuuHGEEzCk1qVdQ== cardno:000611073199