diff --git a/nix/secrets/cloudflare-opdavies-uk.age b/nix/secrets/cloudflare-opdavies-uk.age index be4cd22..a5f4219 100644 Binary files a/nix/secrets/cloudflare-opdavies-uk.age and b/nix/secrets/cloudflare-opdavies-uk.age differ diff --git a/nix/secrets/cloudflare.age b/nix/secrets/cloudflare.age index 5763088..5076f32 100644 --- a/nix/secrets/cloudflare.age +++ b/nix/secrets/cloudflare.age @@ -1,23 +1,24 @@ age-encryption.org/v1 --> ssh-ed25519 M7i4ow 7YUG6RkPCjizq+ZjKM+X+Z7EGGExJIU/iV862q7QgFU -FI5Db1p0H0wtKLnvgiPzXBE9dSkGlx1QM7sUn5gX6vI --> ssh-ed25519 IsVD3g 6eYOo99x7GlRxQK/hFm4xWyoKy/UEDDTL6Q0RwSNZD4 -jgyZGv0FTscKHiKkv8LsNE/VL5t83yTLvRYTzo1Cb38 +-> ssh-ed25519 M7i4ow e7dFi4n60iNI01xgxcZko+xGizPgDWqfxI2PB3dH1HI +e2tsd79XPYjDcGSO+o6iz6fzeV+tAvXuPyUozCthlhM +-> ssh-ed25519 IsVD3g VNvK6wf6i8F0mUXjS//k9O9uoh9RW/+5mhyZyA2n434 +1Tf4euC6bJzbNmQCbYVUpm4C2xHfmk3BaQ7T1a3W8sQ -> ssh-rsa +vTWQw -BVDNBwHVMavrnKctOFZe5KyNXC6MsFUyLT4jjoLPv438PJiYsyIBmrfj4/8EwibR -gBPewIM+3n+tTlYXwoy5RvwWFi7WStaQw/FPXKNk9VyQa/JALeQphjGxBEJJzlhV -b0HtzcDj6RAf6Tc0PwsywZgAQ5BbiTtb3wf4Nw/ahIoFPnGbMp0xCr9wdT0aDuEu -wcwgflrcQRnJDwymAmd+lGe80/L5Etard7KjXONPKbuCmD6+1FAXyXZi3YT/S97G -frqQj3vCfhHFq6lWU9EIfbituTWBcMXEiyPxkkczNagKMSpEXM9/ak9jsWIBLNSU -IASaJ2aanY1xeKH5Qi0x9IPkUnOaLNeSkIa+xVqqruoSeJADcPucIcYIp0d2s6FM -K9IJaCX62zgqA9853z8jr19iR9nVr2+5FZanBFKEzHNPh0JLbbGDFkY3XWEFM4wa -G46bSnQcgDyYYUeCw+1rFElz+E+XsphNy3cnL64Q944p6O2PqvjkiFaf6B+y8tMG -kxXkiW011sq0Do/o4+l/8/GwtojnQFQkkVwKlue6PxcFTsZD0/tjEcYaS1TLHZH+ -aWcgQe65gC33SZTv1XETtiUtpujVh/Hzs2HEivB5myDm619mw5yQpn5Fs73S9dBv -QZFTbr1c6ucR7lp/gVOpWidI42HNuy4gtEHFSC5BOps --> ssh-ed25519 DCAArw ayH8gMUh+Gv7EkdXmm+WqIbOB3xrPFOJTo4o/N28DCA -uGyb5ydQoXIJObaWrpZxzv2AEBIy8zUI+2XhWgw40G4 ---- DX5h7iwzVjAi/0UMzZDv/Q217NlSFEnnDccw/CIAPAE -h__Y=ai -h ->1s|,/m9#WP]ՀYn܁7Zw~%geuiM+d~I'1s- \ No newline at end of file +ZPMqQZ/ZxHkxMa0/k1BaHXYpS2IGMIbdT6HfxMIkPbTOopbtk3bkds3v4fY2BRqm +nmGCNLnYYZ9/eENjv3uHOOHlmG7omOPiC1eFie6v9pN1y4XwJJuMiFVYWnycKHKh +ooG95gVtrUTecEHntlsNdANyih3BB3TXKuffh/JwZFeJrEs6H4Kn9FQtzfBhPA/g +MAiKBcd8lxnQ49UXuX3nvRqdGYukYU7xldOzKN3u6Z2D1no0ZpRxXUpYYnAGo2rz +SGOsgLwZeXccRDTC4G5vlNRHgcmADptNExB2DMPzfV+d+jMAVC0aIgmAi6XPIy2n +dJPzKv9pMx12CCVcVJO0DUqczW3mlzA70v35rvbEfoVxy3jxYQdhT+q7d96vfIOV +HJqvpFflZ4Ex1y6xqINCO39zZNkOpqRhmmZjqCzmKk5gmopvC43AS1KUP6Sa1JER +Upei4gfqY9FwJppKkx+KG/CYsCjYz8uXRGPQIxI94pZ0904Rq1KIlJnv3cUK3p4b ++oZXyoXkjC8u6ALTgPywmsRayEeGsiZPqq3EQV5k/xo/d3QThPboJ8kxtPS85Enz +RaOAKuRtqFOgnk030P19aOz3PTF1U64hJe52khy6hJGz6h533TBYUx18AjOigBXw +J2YgBaM9g347rwjKYvwfXLyq5N+SJ8fPwHF49astoFo +-> ssh-ed25519 qqcYyA 4bdXmVfzmkaWQXfnoYSWeb3oaLNZ39bP5p/f5cYb3g4 +3MKWf7nM/As5x6WCNbYvof0O2mhPifc4CIyZotAETp8 +-> ssh-ed25519 DCAArw RdyF0DgyvA51IalbELM4E8piFRoHoACHGXXFIvrm2AM +J4OK4m7dEBvj8KhskUBoumsoHIty8TewF5qH0+ELJrA +--- KVBYImWXK/utLnInjHjxN+mvQ71qkZUgK7bWLMUPowo +x`b~z7LVF`*&a:{fsNJ;o+`ix/;-v H:z]&u4Y"WAoa +P/]4Yy'GW+ \ No newline at end of file diff --git a/nix/secrets/secrets.nix b/nix/secrets/secrets.nix index 38b175b..3ac4309 100644 --- a/nix/secrets/secrets.nix +++ b/nix/secrets/secrets.nix @@ -8,6 +8,7 @@ let users = { opdavies = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDkkbYaCD9NUIQT0NnsmlyfepwjxBYeiJSBCotOpdPTyc5inFAd29DiVw98j4skfaHdzjcqWmMFmDQWM6tGkK7eg8n0WuaABmsjdEbzTtfjHwM0tRDCIh5AtoT4IvoLhwLjEI2jKM05BGCQ2m5lS//AYJK1DjiV4UH+IjXHz6oy/3eFzQwANjxWS+mbR565p21yuAu1DKEyaGeVzT1xDhgzlnZG7Cys/rFgUYpIvYDHMOFxG6hsDB8vqyHiTXniniti5tdvGGYHgRGQcynRTU12aerrqHTIOefrElXJdf3/PA8FIY/Pd3MmZocY/vvQe0EVHXWrNtnHOF3MFQ1tFyfubKO51Dcp9KmzHnyBvO4CtvGVr/upSVWfo0I/EqkIqvCvBbdSIPeH9V5hAcyWENGF4Wf0/Yqtc0dBhfXJmPVBsC2ghZp9oERK+h5Xs7DpzkT0vtkN+wjgA5weIuG8e2UVNO29LWASzlychVqb7BVa6kNn5CyGwauyIGsYvAFnUjkyJpK8qleNM3VO5x9aw26IhSKlnSE9PAdX8p7PpdoWfxWRekKTc4h6iAe7pFOENvuokAvCNsE5LolR4VrYKXjA0m3nupDNWYexAWfR3lSeSlKd9nD3OENS0biJKayZHs11iDUTxm5u5gm/U60b4z0zDXjh1H/DI/pSCG6jjaXDpw=="; + opdavies2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHcR57U61CmPbV/QlaqeBZh3SNmWPGC7rhJpt1Ds3d3N"; opdavies-hetznix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJStz4WQ5IerIyi8HqLB1gwoiKr87uH/bI+Q9sDxVu+a"; }; in @@ -16,17 +17,20 @@ in hosts.hetznix hosts.t490 users.opdavies + users.opdavies2 users.opdavies-hetznix ]; "cloudflare-opdavies-uk.age".publicKeys = [ hosts.nixedo users.opdavies + users.opdavies2 ]; "tubearchivist.age".publicKeys = [ hosts.lemp11 hosts.nixedo users.opdavies + users.opdavies2 ]; } diff --git a/nix/secrets/tubearchivist.age b/nix/secrets/tubearchivist.age index ceefe2f..c11006e 100644 Binary files a/nix/secrets/tubearchivist.age and b/nix/secrets/tubearchivist.age differ diff --git a/nix/users/opdavies/default.nix b/nix/users/opdavies/default.nix index 4806156..0d15bcd 100644 --- a/nix/users/opdavies/default.nix +++ b/nix/users/opdavies/default.nix @@ -18,6 +18,7 @@ openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDkkbYaCD9NUIQT0NnsmlyfepwjxBYeiJSBCotOpdPTyc5inFAd29DiVw98j4skfaHdzjcqWmMFmDQWM6tGkK7eg8n0WuaABmsjdEbzTtfjHwM0tRDCIh5AtoT4IvoLhwLjEI2jKM05BGCQ2m5lS//AYJK1DjiV4UH+IjXHz6oy/3eFzQwANjxWS+mbR565p21yuAu1DKEyaGeVzT1xDhgzlnZG7Cys/rFgUYpIvYDHMOFxG6hsDB8vqyHiTXniniti5tdvGGYHgRGQcynRTU12aerrqHTIOefrElXJdf3/PA8FIY/Pd3MmZocY/vvQe0EVHXWrNtnHOF3MFQ1tFyfubKO51Dcp9KmzHnyBvO4CtvGVr/upSVWfo0I/EqkIqvCvBbdSIPeH9V5hAcyWENGF4Wf0/Yqtc0dBhfXJmPVBsC2ghZp9oERK+h5Xs7DpzkT0vtkN+wjgA5weIuG8e2UVNO29LWASzlychVqb7BVa6kNn5CyGwauyIGsYvAFnUjkyJpK8qleNM3VO5x9aw26IhSKlnSE9PAdX8p7PpdoWfxWRekKTc4h6iAe7pFOENvuokAvCNsE5LolR4VrYKXjA0m3nupDNWYexAWfR3lSeSlKd9nD3OENS0biJKayZHs11iDUTxm5u5gm/U60b4z0zDXjh1H/DI/pSCG6jjaXDpw==" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHcR57U61CmPbV/QlaqeBZh3SNmWPGC7rhJpt1Ds3d3N" ]; packages =