diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix index 9b87eb2..28baa5a 100644 --- a/hosts/brontes/configuration.nix +++ b/hosts/brontes/configuration.nix @@ -61,7 +61,10 @@ }; }; - age.identityPaths = [ "/home/ny/.ssh/id_ed25519" ]; + age.identityPaths = [ + "/etc/ssh/ssh_host_ed25519_key" + ]; + # Necessary for Nautilus to display trash, DVDs and for gnome-disk-utility to show file systems services.gvfs.enable = true; diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix index 6381e6a..3a7d3cf 100644 --- a/hosts/marr/configuration.nix +++ b/hosts/marr/configuration.nix @@ -47,7 +47,9 @@ }; }; - age.identityPaths = [ "/home/ny/.ssh/id_ed25519" ]; + age.identityPaths = [ + "/etc/ssh/ssh_host_ed25519_key" + ]; programs = { dconf.enable = true; diff --git a/secrets/couchdb.age b/secrets/couchdb.age index b270f1c..698b1c5 100644 Binary files a/secrets/couchdb.age and b/secrets/couchdb.age differ diff --git a/secrets/rustypaste.age b/secrets/rustypaste.age index 8266472..6ac8426 100644 --- a/secrets/rustypaste.age +++ b/secrets/rustypaste.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 b3HlPA 2xnmAbE7usGlBUofIkT0+k9lkAOMfrUifn2kEp6u43w -IpuhSKZoguXHXBamt2xzKTIRPyKNmzIYPaIdKM90aow --> ssh-ed25519 nueAfA LuY9xtX9NcTzA6t4XugshESmLA5omCP6CzgiEItj9CA -JCLnGxpvRLcMeTZOPy+7L02Jsni/AhYzTzL4mFk74Jo --> ssh-ed25519 WcjW5A nQbOkYhDen935yMtYnWKeM54PeRUcAikvGRsjRQ/Ox4 -uL0PpSXX7+Xn91HYHtb/HNf90VNCRaCZ5sQjYCcOdWI ---- hr+DtkYLhfRAVjc0E6z970/JJT3iaJKTSRwMY0rLMPA -D \ YMW;nE iۉ5 _\Ճj@jc(J}5nK7ԾAh=׹:K?-V.kD6cv \ No newline at end of file +-> ssh-ed25519 biwZXw DLhzKcc/aiFwZ7GbtzwVgUt+Z8ChCdtpOddFmqjjuWg +sQYrEX6DIB+DCBC1KZEVTiBT0rc4DbTp8t1BFAmXeNo +-> ssh-ed25519 b3HlPA ml14rPEtoZA8PDiuHroQOfcfHIUeIghnlKNH6Jaoa2A +Te2J7NF6PNVwBVabETgq5ql6BpQbeR3IhkIVur+M29s +-> ssh-ed25519 cdUqUg huUBNjAnara7+8mDEBcElZ2DMsDF0NmeA9iApuL5XHw ++js2A5SuvXigR/Zmy3o8Vix3BqrJfa3pLkVerf9PvrM +--- Pk2z17H5u3tKdXKNPLOZ8LoL7gRs/Bwdx5y8lAgG5ys +NJ"YPC]4j2j@8ʀ KM$]•ӀCsiqyُm/\X/уʥږK CAB`h#D$ \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 25dbe50..af512cb 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,16 +1,15 @@ let - userBrontes = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMvPqWPXEUOSMGMIRmirQfbrzq//NkPlEI2TmFpIkSfw"; - - userMarr = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGwlScEmVbdc0EH93XLX+K8yP5FKUKzMf/bWTSO+rMiO"; - - users = [ - userMarr - userBrontes - ]; - raptus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKdpjGR/pV1roktZdKIVVWqds0JB+x1ksfyQmYPMLK7o"; + marr = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILMh2nUUKt3xsKiwZUuo6HgvR3lr7rRAl0SOH/502sFP"; + brontes = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICgknH3OPazZNhH5xkYfXBcYpI3TXj/eRp0/zzjtVJBf"; + + devices = [ + marr + raptus + brontes + ]; in { - "couchdb.age".publicKeys = [ raptus ] ++ users; - "rustypaste.age".publicKeys = [ raptus ] ++ users; + "couchdb.age".publicKeys = devices; + "rustypaste.age".publicKeys = devices; }