diff --git a/flake.nix b/flake.nix index 3035701..eed84ff 100644 --- a/flake.nix +++ b/flake.nix @@ -134,6 +134,7 @@ ./systems/NObangers.nix nixos-cosmic.nixosModules.default ./extras/cosmic.nix + agenix.nixosModules.default ./extras/uwuraid.nix ]; }; diff --git a/secrets/password-tao.age b/secrets/password-tao.age index c1a57b9..b8f9163 100644 --- a/secrets/password-tao.age +++ b/secrets/password-tao.age @@ -1,9 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 V3f6QA QDUWA5zzVhBw+QqxzZSEaLYNKLtP8DOAh/z10OTM+0M -zA0mROP7S/Y+Y3NC2ZO1kKdgb50jJDAaEsvwcssVEMM --> ssh-ed25519 aRvoFQ doc+fEMbgE/JYKa0TKRdobp1qENAQSDqnKzPHzLqRzg -qv0OJ/4PCKCSv04pP4hyfkhekX9V0yMkzYAUvFldgcQ --> ssh-ed25519 J90tbg RCekA9T/crPEYbPCr47+EaSVsrENHevd7XIfkycorEk -ZBBCNvOTRz3gWeOfUKeTy6+QXMknTHB5CNHfjU5iOEc ---- KAex15ZocZqDmam5N9HSSCYAbcpdhKt4whnbFA3XWxs -MJ0rՃt(Btan$0l@^֗iR)э;:tDQ]Cma yC>B5¡Vk}#!gv%n} ݨG \ No newline at end of file +-> ssh-ed25519 V3f6QA Jqr1VBsmVKIDYp+gatD7GuqBPqJCM+q60yF5CYWqnG8 +p4HhQIo+Ar8cIdOyASPq2+j2TcK5bk1PrUW7Yv+5VOk +-> ssh-ed25519 aRvoFQ QYqX5AvBeR1QYM8ml7sYtyxf40X8kOXeSyDEWDwhhQ8 +V1cznVWmgHr4W+3zYoIRraPEzGO2/tx5j3Uk7FVwIQ8 +-> ssh-ed25519 J90tbg /x5uxUS8l/b3OBPh3VVl1zOmpoRrpAuqwRienAxGXw4 +/pmp+iurY/6EbuTRaR8fokUdYS3xA9RqSyJ4qPQlFro +-> ssh-ed25519 pMLEJw QEoPXcEostoswMpoTnmv07DXNzOYctKoNR23LrGm2mY +GM4aqs1iC3lpmAOLks0H+rlE9oVXAD0Y0GMk8csFVA0 +--- 2L/fJnqxn2rexl4kAw79w+8xRZ4bSwi2bcgs29zLNnc +qҏ3Da/Zx&+Mv񩢛0NXse'/29`x*"N'ltDL" 56,'3'k]4 \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index cb4a12e..8f053cb 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,13 +1,14 @@ let - # get these from /etc/ssh - NOcomputer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPv53GM1uDDOdRxIlHmpf6x2y13yT5bFDNyrgDGLAR1l"; - NOlaptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILtdTREsBxzg/8s0lVCwL+r18qMP8glxAKaKEg+71I6m"; - NOmom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGdPvIo0P00I27i9XQFngsklw/dSyoFs7EgRt7RvkbSq"; - systems = [NOcomputer NOlaptop NOmom]; + # get these from /etc/ssh + NOcomputer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPv53GM1uDDOdRxIlHmpf6x2y13yT5bFDNyrgDGLAR1l"; + NOlaptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILtdTREsBxzg/8s0lVCwL+r18qMP8glxAKaKEg+71I6m"; + NOmom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGdPvIo0P00I27i9XQFngsklw/dSyoFs7EgRt7RvkbSq"; + NObangers = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGFLjWigGCzbpumo0WA8xXR0PAxSifyocOMNTFqfFLOq"; + systems = [NOcomputer NOlaptop NOmom NObangers]; in { - "uwuraid.age".publicKeys = systems; - "syncthing-NOcomputer.age".publicKeys = systems; - "syncthing-NOlaptop.age".publicKeys = systems; - "syncthing-uwuraid.age".publicKeys = systems; - "password-tao.age".publicKeys = systems; + "uwuraid.age".publicKeys = systems; + "syncthing-NOcomputer.age".publicKeys = systems; + "syncthing-NOlaptop.age".publicKeys = systems; + "syncthing-uwuraid.age".publicKeys = systems; + "password-tao.age".publicKeys = systems; } diff --git a/secrets/syncthing-NOcomputer.age b/secrets/syncthing-NOcomputer.age index 921983e..c4590b7 100644 Binary files a/secrets/syncthing-NOcomputer.age and b/secrets/syncthing-NOcomputer.age differ diff --git a/secrets/syncthing-NOlaptop.age b/secrets/syncthing-NOlaptop.age index 7ede6d7..a9f9600 100644 Binary files a/secrets/syncthing-NOlaptop.age and b/secrets/syncthing-NOlaptop.age differ diff --git a/secrets/syncthing-uwuraid.age b/secrets/syncthing-uwuraid.age index 7ac7551..0e0c0e8 100644 --- a/secrets/syncthing-uwuraid.age +++ b/secrets/syncthing-uwuraid.age @@ -1,9 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 V3f6QA tldpGANWIMXkdGc3wAgiO7gHzjQ/WqezW2t2RtCMcEc -IK6u8X9l7wR8IbskW2SehAuCuXQO/b4wkQlZrd3SKV0 --> ssh-ed25519 aRvoFQ CDSvzM9oYI7vtWJZlRNlGuYJ2Ri481xtyTnqnjfrl2o -IJHi3RD/1ilTAilaHsvDktB1HQlJpXsfpyywWjKnTpE --> ssh-ed25519 J90tbg l2/Lx+sPgGnslF5Hfjnh/gyt9OmVIoB84XttpuTDyyk -r8Hpr6WpPhb+RjjBamnVtrmxms73XZKV++ncUK1uk38 ---- vPpwu4/5Hr0BV9hO6YEZHeAEiIMezn9vAO5a7FcIIs0 -l@`"2_>lF soЌPlڊpn02/ &)M%*Vݐ;-KۅlcϯIX-M=&x \ No newline at end of file +-> ssh-ed25519 V3f6QA G78ug4xIYOawhwWrsbqfklnovZgd+uxLMP9+IO5jVQo +PYmm6tSpNzwAAr9s550BnuiScvd17yFfdiYmKcR8EoY +-> ssh-ed25519 aRvoFQ Zz8TY6G6jKzt6DO3FwlL5OMtaIsuRrEalyzUaSkhinQ +OegvROP36xLJ+hQJxn1c5LRjNk6bIu81iVA1H67b7ak +-> ssh-ed25519 J90tbg GG9y1IsGL1xSq8wkBG2xwLGTDLzhGuYF61oCpsPpLg4 +SdokS1Gl7QuEVO0g1JI3xI3P3knA8CLn+E+Yq3nnd6I +-> ssh-ed25519 pMLEJw glaKnXbF/sW4g2FqGk4tiaaE4lam7PnU3A+7aIaOtm8 +iHv144nmeDMBdpZOQ4qgfG3mHRaFPIaXEV26sdSeE30 +--- o0K7IlVBhr62ubMOZJZpZW8oBEzkp3N1lPoZCW/kOgA +rQZy<?iVPɇӪ.j$ =mg~AbBjU1Pu&>FmQ+sLSJ\v9 +w \ No newline at end of file diff --git a/secrets/uwuraid.age b/secrets/uwuraid.age index 6d11948..032f514 100644 Binary files a/secrets/uwuraid.age and b/secrets/uwuraid.age differ