From 3e3b472e518ae81b632d4c68c7cc209bd23d2319 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 11 Jul 2023 15:16:56 -0500 Subject: [PATCH] chore: more secrets Signed-off-by: jolheiser --- apps/default.nix | 1 + apps/nushell/jolheiser.nu | 2 ++ apps/ssh.nix | 1 + flake.nix | 8 +++++ machines/chai/default.nix | 1 + secrets/secrets.nix | 12 ++++--- secrets/shared/nushell.nu.age | 18 ++++++++++ secrets/shared/ssh-config-work.age | 53 ++++++++++++++++++++++++++++++ secrets/shared/ssh-config.age | 49 +++++++++++++-------------- 9 files changed, 114 insertions(+), 31 deletions(-) create mode 100644 secrets/shared/nushell.nu.age create mode 100644 secrets/shared/ssh-config-work.age diff --git a/apps/default.nix b/apps/default.nix index f2137ce..c2743fb 100644 --- a/apps/default.nix +++ b/apps/default.nix @@ -26,6 +26,7 @@ age bitwarden-cli delve + discord duf du-dust fd diff --git a/apps/nushell/jolheiser.nu b/apps/nushell/jolheiser.nu index 6811627..7dc53ee 100644 --- a/apps/nushell/jolheiser.nu +++ b/apps/nushell/jolheiser.nu @@ -14,7 +14,9 @@ def sshdev [port: int = 8080] { } ## Other ## +let-env EDITOR = hx let-env config = ($env.config | upsert "shell_integration" ("WEZTERM_PANE" not-in $env and "SSH_CLIENT" not-in $env)) +source /run/agenix/nushell.nu source ~/.config/nushell/zoxide.nu source ~/.config/nushell/ohmyposh.nu diff --git a/apps/ssh.nix b/apps/ssh.nix index 4aa3766..ddfd17d 100644 --- a/apps/ssh.nix +++ b/apps/ssh.nix @@ -3,6 +3,7 @@ enable = true; includes = [ "/run/agenix/ssh-config" + "/run/agenix/ssh-config-work" ]; }; } diff --git a/flake.nix b/flake.nix index bebc642..b3674d1 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,14 @@ file = ./secrets/shared/ssh-config.age; owner = "jolheiser"; }; + ssh-config-work = { + file = ./secrets/shared/ssh-config-work.age; + owner = "jolheiser"; + }; + "nushell.nu" = { + file = ./secrets/shared/nushell.nu.age; + owner = "jolheiser"; + }; }; }; }); diff --git a/machines/chai/default.nix b/machines/chai/default.nix index 0864d64..9dd04df 100644 --- a/machines/chai/default.nix +++ b/machines/chai/default.nix @@ -49,6 +49,7 @@ in { jetbrains.pycharm-professional jetbrains.idea-ultimate jetbrains.datagrip + libxcrypt subversion teams-for-linux xorg.xauth diff --git a/secrets/secrets.nix b/secrets/secrets.nix index b950f3e..f4cb906 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,7 +1,11 @@ let - jolheiser = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS nix"]; - matcha = []; - chai = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7PS9SJ+OVrUku9dPUQZigioy+r3VlFHVntsa/F7AdM root@chai"]; + jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS nix"; + matcha = ""; + chai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7PS9SJ+OVrUku9dPUQZigioy+r3VlFHVntsa/F7AdM root@chai"; + + all = [jolheiser chai]; in { - "shared/ssh-config.age".publicKeys = jolheiser ++ matcha ++ chai; + "shared/ssh-config.age".publicKeys = all; + "shared/ssh-config-work.age".publicKeys = all; + "shared/nushell.nu.age".publicKeys = all; } diff --git a/secrets/shared/nushell.nu.age b/secrets/shared/nushell.nu.age new file mode 100644 index 0000000..2f87910 --- /dev/null +++ b/secrets/shared/nushell.nu.age @@ -0,0 +1,18 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyAwZW05 +RFFqMjJEWVJoWlIzNEtOTWxLWXpxN0s2ODZqM3l6U3BxNENzdVR3CkhrazV4NElq +Sm9rL0NXaDhtS2IwbFBBWlltaUo1YlhvY0cwcWxxaWpXUzAKLT4gc3NoLWVkMjU1 +MTkgam8xTVBBIHVib09UYXNnZHpNRUdVMUErcEdLdUhGLzVyeUsySGcxOXQvbkp0 +aVg5eHcKUWdaYTJvbFl2N2l2WUw3eUlmQWFFNHFDeDNnMXpITzBac2NZWWo5VGl4 +bwotPiAuUCYtZ3JlYXNlIEU9YkY/PlpKIFkgdVhKQApvd2dqZGxkbENOQ25Cd0Nn +SUdSRlRkeWVOYngzeEhuL1lLSWZySmVheWRIaFFESjVwU0FsMVdtRgotLS0gdG5h +Y3FvNllQcTF6MWExZmVKb0tnVDlKT0hJeU5QakpCZ2cxR29NQ1BlbwpumY2uN/TZ +QUvUq8N2HmKJTNlE+doAktzuxXiLljrxvSVSZM3ghCkyiu7bKVOfoQNTog5d1Dru +HCxupsgQB0dbUEw4nS3pzeFzj2eBWW7zElvnVRC6xqgi7Y/lOV8P4R+7vQFbk/rM +V+SBaAerFOrJrGFqug9OeLCGQP1mdUbIHTwWlc+sNdoP0jl7EdbYbzLqrqH8kyhB +L6XLmhCS3aZkvmCcJh46Ym1zcTLj0p/4+lIos5jHPQ2W/E/UzRdP76okVI5Xx3jE +xpQDDHXuniMyJIrbj1QQyrRol2arLMUqkZeyltv4VjpqBVoXCchi0ErMD4ddxmIO +1bUSa7BUazV9OvgyQrvizLahPRxuVld27TtHQbBjLwc5O2mKmKfxi24tCzg3j81W +aBgWXPKxTcg0O73V2BPZaT80LM0UdYvJlZdKjWAfOITyrqfyOd7Nm2MOqfKcbyFm +T3DD4mwV +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/shared/ssh-config-work.age b/secrets/shared/ssh-config-work.age new file mode 100644 index 0000000..3e50cf5 --- /dev/null +++ b/secrets/shared/ssh-config-work.age @@ -0,0 +1,53 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyBpZ2FE +TUFOTVU3VzloUXVpWHAzVkNlT2VyL3RBdzNCQllFb0FCVXZNQjI0CndmNC9xMis4 +LzZJV1ZQN0Q2cEgzQ0UxV2hLZVd5VEhhY1poWHZqakx1N2sKLT4gc3NoLWVkMjU1 +MTkgam8xTVBBIEZ5RTlUNE1xUEtCYmJ2TFNjVVlIK3cvbi9IbGduT0JHUWNXSHRX +YVkyQzAKM2ZFK3FZUml6YUgzY1ZlY1NBMExvYklRaUZQdE04VkJFOEk4dk9EZ3Vk +MAotPiAmc2BALWdyZWFzZSBJJiksPU9VCllidjhNRG5yQ2ZvYXJJV0srTE5ObjV0 +SHJpQXNFdWZta1JUcFNpWHhLVnpoMWVyeQotLS0gY1M2bmpQeUdtL3VzeUNtVlps +V0dOMFRFUDBYRXIvejRxRE9mZXNNbEtSYwqwhvunpzfEosrjz1FfzrJzjcQEUIGi +zSBlZkRxR7+jXPf9m7wp9sZ4qWv4Uu2a8x+1RrdUd38+MvYfTyYevEkDn46WUmDw +Ve4BnPfhoH0eJL4B8OjGIGAliYx1COx6Sq/N5EyvQ2tvgQJMFuIICu81pfuZPzoY ++zjxustQ31PQZH4zg3NUGnwAl14POJIid2prg+oF7j/tGEFrVE2Gx2eCoZBUM35R +GKsUj1G1i9Pi3d87XGEG1CHtJ4fGDYThPu9ka5OeXWR5ZbiE1ydenDEXLLeoIWWg +rwg2liNfri06CFo3JkSUWezZnsasPCfuWzoSgzJu5R1Tlrqbpn7f/tHPORIegp3r +1t1P8xMI9JHsRebrDV53P47ZYF80kXRcFzeT1VR7GaVPx0gc+p8GdCJqz4JgbmKc +n9yNoWV57wyGhi9Et6NKq3tn0H25+4Atqp6k+ytlnTfoLe9K5NvRML57fnLNeIlK +gx5Y3Qxk7329e5dPnBelEG8DgLy9a75kqtiDYO9+lppv8QQ4TffbBVkJMBzDhDxj +Gfm53VP7Y+57wT+6hlKdFA3CoBh/k95tseb5RarSvu5ZHbSYmhlP+Y9uxcT88lxg +iZHytCfdLnVEQywd6Bf3ojeSEM9ycJGRpql8sEGRngYyzE6klhVjOv4vWkIMqfST +XVOpXcUDrU94z6z9VCF0s69/amBEKop0eR1sbcLz8t1EmFFm2bxfen5twfVfq1WI +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 +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/shared/ssh-config.age b/secrets/shared/ssh-config.age index b2a8fa6..d323590 100644 --- a/secrets/shared/ssh-config.age +++ b/secrets/shared/ssh-config.age @@ -1,29 +1,24 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyAxYys2 -eHYraFR1Y2lGVlBZcklSN1lMYzF3b2xFRXdSaTgyQjFET3BXTFdvClR6cGVDQ1do -ckFObWFCRVJXSllJaFZDcU5VYWg2b1QxanFrK2l1YmhNNzgKLT4gc3NoLWVkMjU1 -MTkgam8xTVBBIFRaUDd5alpxcDVwcVdTb1hOS3hxM2JSb2ppM3dVRGpPK0FUcGx0 -ZU9LbkUKS2ZSaXpueHRBN2JVZWdJNnZ3VlpsWEhEVWFFZ0ZFTi80Q1h6YVB5Rkp6 -OAotPiBBcjBcZWgmIS1ncmVhc2Ugd0k9YXRFIFxEVDNmQ1J5IGw9KkQ2IFZvK2Be -bHsyCms5d1R1Tm0rT1pRdVBXZmhCaktKQXJFQTl3Q01US296bm53Tm45Z0UvS28x -OGNZVHJQMm5XRy84Wm9HRHViWlEKRXNtNFc0Ri9EMHpzakFrTzUvRWIwcEVlM09E -Z1VkNW81a0VhdmZEYk8vOHJRSG1OUTVET0h3Ci0tLSB6RnpoZmw3cUMyK0tSQkV4 -QnFCaXhOdEszSVRFdGJCV0hYS0hENytLT1NBCpap2Ueg9XZJh1ile34NxIu+7tAD -ACP2mrbLJk8SrJ+QJVtcfeHGTad5CwzoT/9SiZufDhSNLTCrCu8TT4ngCHuMOF1x -qVdmBrSacQ8VgVqovkFP9Sj5DZZsXj1XxJfQG5IDRwSK9d6+h4opHCsSHAJ19syg -zu/l7385EGc7+xlSt1Ifdc2HPV8Yk1ozGDTgVmsnvHSgXXkKgyGbjlHLvkrnqJJS -GMXl24N/X075L+hok62y1pzD2YxHWIOnIAs9SHwrKBXReWc4TymBHIYJQv8mSbDS -rDT8QXyKns8b4Zu9SWbWoiAcNzwF4BxUV5qM7PPzVZOlK65tiSSEB4f1Zh+1gL6V -UQqFw6RP10dAqopngNOKNP1WgQkb+Stjs8aplzCf3KBurdn63wcW2D7Z+hQouYE8 -CHMTFB5piAZ9qCWnydACF6/apOT7G7BCK9D8WhXH8mXYl+tlkA6rf4a4KOKuxJR/ -vrtSy3wCir8V4ICCdadxgWicZ+hzp9YP2nAgQxmGUT+SF+eRIDsBSueaz1py3fM1 -THsHGIt0sLJTWWKT6u8agwPpmpNrjDCCdN6wUHW8nCJ4xjXmcQyGwx0IGovLxi+g -6mhhPrg62p9vroCGEIzhkuWNK10SCSVs4WlNRMH0BH/DgFoNkM70rbT6tf2gDKtG -74+9mp5SntGQMuOL5nndscwD6G524fh5mcHFVaAdMvfTnFX6/7+iAI4/URVYrxyj -gEV9YjQrmj7Ync6jv7nKHmgQMesmRLf7lxXswb7AZ281wk5hmT+uv626sLqU9q+9 -z270Jy/7QV3jQk+dS3Y5RgflAzNI8eXmMA0SEojzydWbGT5oFbrY9/DofILQs8Qw -cPQcXtUSW0hRQjBCQPuFvwde7pY3gjfpwVeof/9hcc6usVWoT4PoPAYKr+0tRuPo -syI/Aamn1SO04n6RW51y4wbcOVrofs63pkAjwk9DAmHwO8Qe9ALTFd+n9K/bknMa -HYh+8v3yVa+xfR/9XizRgRpE6eghNGBW30ywPAkGryKchlri6lenfBhcmRwGI4b4 -mc27ZS79Rn3rjTPKXtIgCEoOQYOmGZW38PELS0LWi7h53iXr7W9apQh/ +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEU4ajYvZyBmcmxX +WFQweTROWEF0YUNKcloxMjJPeVpIOTJkWXQ2SGV4UEZ2SDBDS2lRCkRhYkN2TmRs +UHRwUXNvWXY3UFZRMzM1UkdBYU9rQlZZOHhmY0syZnRjZmcKLT4gc3NoLWVkMjU1 +MTkgam8xTVBBIHpvUlFneFFWZ3FLV2NCOER3T01SL2hWMnAvWVhXazRBcXI5NlJx +d3VkakUKZWRUQ0RDVVp5eE82OTVoajVuNFArMGc1aGFzeDhNRGhFT2VCMW1XREpo +RQotPiBcMi1ncmVhc2UgT09FUDxJWCApNFQmdSBOfUskajolbwpZbVpGeTFoam1V +bFFKZnNTWHcKLS0tIEZieURDNzVNQjJoTGQxdlRiekxGaWVhTTcrK1ZVbU9kcUlN +SWlGM3NFOGMKIJUphGO70pIWlCBw8VboR3czhPxdl6px5dNJKanfU3aH+Tg+dIoY +8WjdgDMun+G5J3vh9Wxdn40tnpVBzC0JY4Zn9dECF7pUJiedYbtiaLxZrNEciM4W +argzHPb3ZHYfwIbJJuzhAR8sCtB2V++cydRmFrktQRkkdvujCCcUkxfd1DikZb1e +9/IW+DZfpXRTjxsOYox7eG7Nz0/+qKJyY0b886NrcWBhl10cT6ZgdyJF1lijJSDe +wdF4ZAtYCynk1VvugQKvb39S8r9/dHq7Hxv9NpioPKOlI+Kfd79pNsudxluVx3ch +luS0fxIXFhQ19pLt+9TakvBBJdV9Iq760YRH+dFxRptBh4v1pr3mYE6YVm3MGIte +2XN+7t+dElNw1S0NCzFSv9AV77vqEEVB95HF3kMswCeltuBoI1eCIN77VYhdmaJI +0IwpFfvg2QzQtI6SIrW9Qa6wMSRL79pOKGdNbblvXwVaD+9KmfIr6XVsB4dXfghF +f1Z7uKlY9UTgtUqSIuvxYWIEUL3F9sjLgIABaQivMWRtIH6eVWSfTOh7UiKZNmWU +8/+qIwMwR+KNVFYwzbf3Jqk0+XXTzWJX8hcgxR5t5klHxwMftw8/udLnIlFpxw2/ +l5SHZ6IcKePpCMo3dajPGZmdEe5JNpgbjd2p5iz2hhWQn6AQN98Zp8D8ClxsnErV +XwJD9z+inEDnckNkXiRpyKUeZpUbwweNgrKP+YuGfT92pl6HT/dY+jynkGus6Q+8 +GRvEjvpt5yprZ8BWX/zMMq4BUON3Uqx99PrQi+xD+wjRmjii33rymJQan1FchWIM +2paT1m736ZbHJsA+Cdfp15441sScRJABDA5fc1rmLaCM2bKeP1Ci0ZF1/CJNXjIJ +oUEL4j+Q91zUuzh20oz4JqOTXS4g3LqPC9azYjZRfADSLkK3vJcqhCfHMOCG -----END AGE ENCRYPTED FILE-----