update encryption and add sops differ

.gitattributes

@@ -0,0 +1,2 @@
+nixos/hosts/*/secrets/*.yaml diff=sopsdiffer
+nixos/common/secrets/*.yaml diff=sopsdiffer

.sops.yaml

@@ -1,18 +1,26 @@
 keys:
-  - &users
-    pgp:
+  # Users
+  - &users:
     - &misterio 7088C7421873E0DB97FF17C2245CAB70B4C225E9
-  - &hosts
-    age:
+  # Hosts
+  - &hosts:
     - &atlas age1hm5lf4qk84r4wh00atn6hpts7mpdx80adq26wht2e5qh9ewvhyaszfv82d
     - &merope age1709qfrwglm75v5x8lpuhryt83k6p6c90npplzzec6a5w8ct93ejscpqpc3
-  - &all
-    <<: [*users, *hosts]
+    - &pleione age1j9ld6ey62hqd33xkyd2fg9362k6xhm5gavsrpsfalwpcs8smxfdqpk84a2
 
 creation_rules:
-  - path_regex: nixos/hosts/[^/]+/secrets/[^/]+\.ya?ml$
+  - path_regex: nixos/hosts/merope/secrets/.*\.ya?ml$
     key_groups:
-      - <<: *all
-  - path_regex: nixos/common/secrets/[^/]+\.ya?ml$
+    - age:
+      - *merope
+      pgp:
+      - *misterio
+
+  - path_regex: nixos/common/secrets/.*\.ya?ml$
     key_groups:
-      - <<: *all
+    - age:
+      - *merope
+      - *atlas
+      - *pleione
+      pgp:
+      - *misterio

nixos/common/secrets/passwords.yaml

@@ -8,40 +8,49 @@ sops:
         - recipient: age1hm5lf4qk84r4wh00atn6hpts7mpdx80adq26wht2e5qh9ewvhyaszfv82d
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTVHJjVlRrRGtaQXI2NUVI
-            bjdPSG9lZzNOOXRnUEZlRk10eUkyUjIvMkVrCkhINlRHQmo0NDdqaHhjYlo3MGhL
-            RTlRbjdEaVZScjRobGw2ZTZLeU9Xd2cKLS0tIHBWSjRIaHkzNzB5Y1VaZmRLWWZ1
-            TEZBRDA3c2dtNmhNanhYNjV0aS9pbEUK2ws/MWh8D6wrurfG916IB3n0hfQF4lL6
-            RHyazXLnidYm4r4rO586bbzcPXngsmusSnIzjRX60urzlBVeX8B6WQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5NlRzTUUxZEczaU1GTVBR
+            NkhMWGNlZ3A1djB0c0lNdktVc0dlb01QQkVJCnVjRTdVSDhpR3gxRzUxOGU5Tnl6
+            dU1lYUs4UVlxS0FFRHp1WHg3RDc5Y2sKLS0tIFVLOHQ3RXNsWTYzcDQ2MTRpL0Rk
+            UzdqYk93OGwvSzZhTktPTi91elVUUEUK79z8spXtSb2bE49DzXwAYM6t0eNceYvI
+            ta5KxoQ9YhLRJNB/nPvcZo2MkY2cAM8jTttzPHb+efIa89xTuZTp+g==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1709qfrwglm75v5x8lpuhryt83k6p6c90npplzzec6a5w8ct93ejscpqpc3
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyclBIcEFaVFNGUGl5ajdq
-            ZjVPNThjVWZHa0VHYTJlL1QybUNRM0FXZFdJCk5VZmJNUDlycGJuSHBYb0xETnBj
-            QWNjUGF4ckNVRzQxWHpOc2dBa3VETFUKLS0tIHcrbUhiWUtxa0kzRE5VZjRQQmVm
-            eE9xOWNpRmt4bkVmcGt1WVUwRFFCM28KbHMqg2qeArrtscQADw/hDBUFKAE1Th8M
-            uX0o2caF1VCudne33Prz0J8oVbpNSMdEYRkP0DxeGxZdq+rMoHUeSw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZYlFvbmxnWDJ1MVM4V3Bv
+            bDFJT0dLN2JtUTJUTEZzckNjTjQyVWxmRW5JCmYzUGtONXg0VXpGbnFkZEo2Y1NX
+            ZGZLMmRXdDBOUXp2MVdYRGVsUjduMFkKLS0tIFJ5aENqRlVXczRzYXI1NkRCVTNy
+            N2VDeUhpUVdiNTlTQkpLcnpFODg5eE0KhWnr2AKiYEpSabrC3wSxheQLEKsNbY+F
+            vWC2dT4wZIFMVofg+ZN6o+qQPjPmeQQnu6Zx6oChgTgS2ohFQ7fiWg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1j9ld6ey62hqd33xkyd2fg9362k6xhm5gavsrpsfalwpcs8smxfdqpk84a2
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYWjZtMGF3ODRvOEJ2eVd0
+            VTMvSERZNGJqN1dmK1NUVnZRKzFva2xnOFRRCkhLaW5GelMvbm1GOU5JeU4wemlD
+            ZkRZTkxUanh3N0lzVFdtY0ZuR3hwWlkKLS0tIGsrOGl3OC9YRGpYRmpVd0wraFlG
+            ZjNyNGgzcnd0U3FWZmtnL2ZEWlZQVzgKWm5LHDswIocA8I4SAea4k3laknVuS01y
+            fT8LFsW0r1LnmV58K4PMDPhQdxHh/y2OuRlOpS3JEEBprPmtQjIMdA==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2022-06-05T19:15:32Z"
     mac: ENC[AES256_GCM,data:gfZ/FnAgYfir8z0Lhb6snnA1XomIJ+KdRYP/WFkwuAwpWTpVrdeT9GzR1wq72b/dN4aM9jicyWX/HOP6GDgow+1024FqWa9JQIPlqFrkLDf01sB+/xgD1WX1qu2GFj1tXGDM8VJHtVExYWdWICkXGp1ZxMnyuVF74Y3m8wNTvaM=,iv:73C4k4ox9+dG4jLdoAas3YEz9TK1hqUbKBdlgKqGR/I=,tag:TKk5w3rb1E5fIIAt714yIg==,type:str]
     pgp:
-        - created_at: "2022-06-05T18:55:28Z"
+        - created_at: "2022-06-06T08:44:12Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            wcDMAwa9kVfiDH1CAQv/YXNbZ790CO7W9gcWB8WRIVxe4K7kVxxtGNvy+X0KV1t1
-            NNYpyTBc8voiqMNc2uiFi+vKB8Bx4kaWB6CQIipPcsfYpu8ZCnYnSTQEJFdrsCWu
-            6kMgd7JDy5kApM/2JZ6Mxu2vhZIYWu8bB3VDF96MyFn4SwXx5puCZpsYtH5dHIBe
-            Xe9u1tZxqvfBKQa+mJxApzpwhrTcTn5N30kve5p5UQn0B6ipIOhIjk8UIVBkTfka
-            iXzfrTP1UIgsilALHbTfMEH0TwzGiOUbp6TxLt1O6yQ3QC1Me+aUJShlV6VwItgy
-            rNVWd6hgcfgGD04qkOkfsQRo7Qnkd0VU305H+KEH9sMBFwsnpWNVeaWTKequTjrl
-            72nZJHl3olLYVm88+wr3UIsuVdEFajnGPGdXt8pBxNaUMjvRqWMi6RrsEZ8FhzdB
-            PFv5IGSVCJKCaPZ89fmc/KxqD8U5AgvKYakZoWLw59wpNy6Z4F78xZllTJj1A2gy
-            ekZZZG2QRhJWi+22LU9Y0lEBmcxsOQxnGkJz75OQpWMzMHrKy3yiCzS1NngD4rar
-            zmbL5b+zgbOd9BaxHct/SEANY55qxMryVk5q8AVvXd4BGHhwZV9anirEQDgMsw7l
-            mII=
-            =Oi5i
+            wcDMAwa9kVfiDH1CAQwAgIxC+YxcnqjGMMuvtxRgeiT9vjL+eJpdmKmpldFMoxbt
+            LQPjP6EwQV1MQ71ibJpFK9+f16tsxEN/+b4DfGmM/zEC5/9Usso6t6aTPqv8M/NI
+            reuB+7o0yk6+ZUryZ/usYAtVB6l5Yv61t0mc0nQvhXjpPXdXSNeVJX7T//yjRdzV
+            r5tCac3lng+glA1nUgKV5abZbFGzFauBFxLM9cNq3i2rvhdoLBwjE+9w7uLsJVCC
+            nmjgiyQLBftFxKh4FCQjcWNhoC1yTJlv1ixmCV3KXulemsvWt2A3VM23ktrJ4LEn
+            GL9W6VN7Aaoh0YWHtmAieBHMGeUnWkQPyRdRFTlBUWmolRdIPZ04/P+huyxxXpvQ
+            lK5nEwNLJ8BEFc9iXCjpI1nFEaTkbAUoqGaXKbJDj3Lui2u3bq7z2+cZQdnCnXcd
+            n1W+T1Bs7TQj4qqvDN2mbdLxN1dEnPllbBxRkI0tEqVP/KWONTpdOQQK889OV+rN
+            XZMPZwcOFyBxsoUgb+Ws0lEBoO7jbzC4BZKuOgOFxex8xn3kAYsejgt10Vb3nnnS
+            fJ333OGo8JV89PnMZP2UgjAtTrXhNfc2orT2D0hpPbXq2RW3Jrg0jUDbFfhmLPsI
+            YTw=
+            =AcCe
             -----END PGP MESSAGE-----
           fp: 7088C7421873E0DB97FF17C2245CAB70B4C225E9
     unencrypted_suffix: _unencrypted

nixos/hosts/merope/secrets/keys.yaml

@@ -6,43 +6,34 @@ sops:
     azure_kv: []
     hc_vault: []
     age:
-        - recipient: age1hm5lf4qk84r4wh00atn6hpts7mpdx80adq26wht2e5qh9ewvhyaszfv82d
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2NzJHeGRIU3F2WTI0dDc2
-            bmM1eVp6TnozaEJtWW9BYkEyTnVFbU1ibUM4CkdvTGpobjdiRFZzbjlhUGNIcmNJ
-            Y0liTHVtZThBemFRaUJ0Q3pBUWUxa00KLS0tIEorRUwrUVZSNFJmMHdGVXVOU2pu
-            TnBuaDZRcXFxMUdOaU1JSHV2Sm9pYVkKIUIKizr4M5d19sUtXxflWKpzgrE3dyxB
-            ISzAOwooMkNekRJWKCo453exseqlU3kdu1PmJ/7rxHW/+/GgTb80RA==
-            -----END AGE ENCRYPTED FILE-----
         - recipient: age1709qfrwglm75v5x8lpuhryt83k6p6c90npplzzec6a5w8ct93ejscpqpc3
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDYXkwQ21YcVhmQTJ2OGNU
-            ZWJySm9GVzREdWRyZ1NCYTNlc3BYcjFBWFR3CndROXlQaUVSNVJ6N25lc3NGN1dM
-            cXhFa3R1R1FneHZxV1E3WUQyN09JTW8KLS0tIDY3Mkk2SFV2bDNOL1pxcVZzTWt6
-            bUVzWVRLdVFuTFFTbnlENEJIK1lZekkK6r7SDIUthZxPlr8veUyYiPwUo6M4VJKl
-            qxFoc2JYQd8VtJm87Xdz2UEikKS8XvMwdxBMHgJ37C/nU6Bpht0zgw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpZ2tGbmtpOERxMmZ6UkYx
+            aDlhbVRTN25QMndmNXMreS9wTC9GdkhEVVdRCm5uYTJKQnZWKy9RcWVkc0ljelRN
+            MWpSaTZiMm9PYmJKenFoamp5UGVrejgKLS0tIG96d2xmQUxmSVdBZEVITmhIK1JB
+            WjdDTWMxOWk3aFcrZEJmNFRYTzBNcFEK2cnBy9gxyuLt6wpMpRLDvGYQfJL4bAVI
+            uP5WBhwkwxo2bzCkW0eK7bxaR8DdKaE+b9fU0vIymAqjvsFIEy3T6Q==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2022-06-06T05:35:55Z"
-    mac: ENC[AES256_GCM,data:X5xSHdvWJD5lPlOaaR0xOWm1i9Ix0DEMTNw3qzD5yu9z+PRNhGH1foY8CDPDV3xR5aWAf3booMH1EF970DUZshKAH1MOYUZYVYmaeE8e1Og3t+/AUJhfKi694Kc10MALRxf7seAqBzCaS+M9HX9jA/GTRuB67+GJlg/n9Z8MHss=,iv:fUqoqYSOHautT3S2FCqr9I6tQ7xrxWh70mnAKBg20DI=,tag:wb2NdzVTg2QGYBEBqWGJAA==,type:str]
+    lastmodified: "2022-06-06T09:14:30Z"
+    mac: ENC[AES256_GCM,data:5n8ziEOzKI4PLgQGhoJ5eHQfKfTzvTVoTewSmXbIksy1/p4slQWWQu0n4LJVsxyM5dkBXB5/K5phM50mmzCHlcKtVyIqyqM3+Pq0rU4fRFukBvBZrm4kk30QA0idUfrOHcEC8kLFXmV3UzAR6BQ9h/pXz6l43pX/QFM23UA1duc=,iv:zlyKNoVGrd/1ko8ZIxRKuKWgROCKFMWS9R/jk4YZFCc=,tag:FWyn3naBupcbS6AjYMFNvg==,type:str]
     pgp:
-        - created_at: "2022-06-06T05:35:35Z"
+        - created_at: "2022-06-06T09:12:51Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            wcDMAwa9kVfiDH1CAQv+JUaj83BpCqRh6O+Xf+NPqy3DRLySyoc+oAbqCqYbviYP
-            +wtrJf86zNKnBxAJYUld73s84jgt+35ekNXWxXv4EJSNPzGHQlRIdxG83W+pxhA7
-            95nZ1X9tCq/D+KPbfEoSzGDIg5XsMFHRY9uHWxVyL2a2TV69reCmRw5cAmau1ILh
-            lV2aKILh5QRMf68VecZ6mG6TzeRxcp8csqFoKPTs1qcLwrcrrK2ASYkLuU20Ik7u
-            r9gyHKakWx6hIGGmVTSC75eVRQRlFSppyGGsWfkf+2aycBNWY6uFNaJb25dera1F
-            ojYpTXSOVCDYwSAWJXyLML7EkGCCrx3D5b8X1cSHKFZMHTdIix2CNsqOZZqNm5l4
-            cLTU+Z3Tk/Q8yhl8mvjZPJHJFCCKjIcxF5Anxi2ZG6k+nx5rgiIkW3B+RRlMAwtX
-            YL5sYxUQjs/qmfEXiwsidmRDFvpijESTMjAl2nAWJUfTLMctKo2l3ycsQ4ld5i5p
-            g3+5jDkaTd6AObkHiPEo0lEB5raQkcIYPvsBohk40Xmfg3DX+DnikVZ/EIzgvB0a
-            xzTTfDF+EVITsLYhl0jLjLaISNVTtisECUBzp3+3NCycRcbJ8XdTDY5Hyyp/ifp7
-            DCQ=
-            =vW3q
+            wcDMAwa9kVfiDH1CAQv8C/sRwGWVBSq/pcsI4qltVIS583NdzlJtJAH9iUQ5gpsZ
+            xgncDbm87S8zuMBYkvCS7jKnGH1C85D6gnhG1nyJ+GNyeMyUn/MWryL++OUqE7Xb
+            WwUSTELbA1CTFCpAMxy6xIxA7kifOneM2tksQEUCHuJj06k5UI5onl/F6+OTM/Y1
+            Dfl5qRgqb5lyTlM1Zx/jfb+Jh0geiksOJp25vji3F3ro2n1UVuFM5FtCFGH6u91M
+            N306G82MUudAiBklVNkqQV9ZAld7x8XBgJrklEBlOkreuYvDwSVwzqIUWthp/W6e
+            bqs2f6sLh+s7JjTN3tpIXyxDYhlMilNqplJXTWKnzXkSw7hDWBqtTjxVKDZJOzG4
+            wHMf6EYuQCbVBJARroGtGcMlZ9b6w8I+KLdle1AXZYeYeVpKkhJiN3sczU91P0jO
+            oH9KGbIrVy1tPQqIczjB5xU1+j1reW3iBkRuBevZilt2RfVYMK4c+OtdXG6xLM2w
+            MwvsTdmb51WiKyXCAbPl0lEBPLPvy+vsAN/sTvXEeoe1dosYKlR9K7/KW8gbqclS
+            OQo8ad+Kovv8Yapp6nvCwJZOdFKIowDdAqTGToofvQd7FvNwul0wzwI3XAIFVk4s
+            4fE=
+            =pdJR
             -----END PGP MESSAGE-----
           fp: 7088C7421873E0DB97FF17C2245CAB70B4C225E9
     unencrypted_suffix: _unencrypted