diff --git a/flake.lock b/flake.lock index b36ef854..9a788f1e 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1624727938, - "narHash": "sha256-w6vdESHOlSVaa+ts7HB2Yi7zxZepjHnXArdTiauk/2o=", + "lastModified": 1624785192, + "narHash": "sha256-oiOKboMW3ugSUCLX2lMBVW+MvRO6qlWe7UmHVznWeXU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d756e841ef2d30dcb9d831f47c2f2bc9b7eaaabf", + "rev": "2ac9c8cd3f29cfabc059e9f5e490fbcaf767f7a0", "type": "github" }, "original": { @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1624742990, - "narHash": "sha256-Bl+3y9bn/217kDV8HkyCA3ldfry5hUGXpUrgiWFb4ag=", + "lastModified": 1624746582, + "narHash": "sha256-5RXicZDUxLjzz64oWXoRqAaTsfnG1oucIB3UIQa0rMI=", "owner": "nix-community", "repo": "home-manager", - "rev": "8eee5f5272ac21df2f2db4b51eed28820c499930", + "rev": "8d3b273afef0e6c3d6d6e4239c9c9d79b1ab6ed7", "type": "github" }, "original": { diff --git a/secrets.nix b/secrets.nix index 79893fcd..aa2860fa 100644 --- a/secrets.nix +++ b/secrets.nix @@ -1,12 +1,18 @@ let + kharbranth = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWu55zjDTl0qr5+kWNzuxGe5qem40ML8ELohapW/xug"; kholinar = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOL8MzChayhcVTfZvE3/ExwXpq2+LbihjzUVlKeIGoOL"; lasting-integrity = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMKJmeY7j5LxWVv3fKzqG4Bvg/ZhOp8iwk0utpyMWMSk"; urithiru = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOrzOpyzDc5BVtAeb5//PnMRcp+9B+DjfU7p2YpaH6a2"; hosts = [ + kharbranth kholinar lasting-integrity urithiru ]; + laptops = [ + kharbranth + kholinar + ]; servers = [ lasting-integrity urithiru @@ -25,8 +31,8 @@ in "secrets/authorized_keys/charlotte.age".publicKeys = hosts ++ users; "secrets/authorized_keys/root.age".publicKeys = hosts ++ users; - "secrets/passwords/ugent-mount-credentials.age".publicKeys = [ kholinar ] ++ users; - "secrets/passwords/ugent-vpn.age".publicKeys = [ kholinar ] ++ users; + "secrets/passwords/ugent-mount-credentials.age".publicKeys = laptops ++ users; + "secrets/passwords/ugent-vpn.age".publicKeys = laptops ++ users; "secrets/passwords/services/accentor.age".publicKeys = [ urithiru ] ++ users; diff --git a/secrets/authorized_keys/charlotte.age b/secrets/authorized_keys/charlotte.age index fa839dd9..d7e1bbc4 100644 Binary files a/secrets/authorized_keys/charlotte.age and b/secrets/authorized_keys/charlotte.age differ diff --git a/secrets/authorized_keys/root.age b/secrets/authorized_keys/root.age index f2735d7a..316dd913 100644 Binary files a/secrets/authorized_keys/root.age and b/secrets/authorized_keys/root.age differ diff --git a/secrets/data-access/ssh_host_ed25519_key.age b/secrets/data-access/ssh_host_ed25519_key.age index be89db54..e2261d39 100644 Binary files a/secrets/data-access/ssh_host_ed25519_key.age and b/secrets/data-access/ssh_host_ed25519_key.age differ diff --git a/secrets/data-access/ssh_host_ed25519_key.pub.age b/secrets/data-access/ssh_host_ed25519_key.pub.age index 0af255f2..48bc0ee6 100644 Binary files a/secrets/data-access/ssh_host_ed25519_key.pub.age and b/secrets/data-access/ssh_host_ed25519_key.pub.age differ diff --git a/secrets/data-access/ssh_host_rsa_key.age b/secrets/data-access/ssh_host_rsa_key.age index 2fd2a944..b17a5ebc 100644 Binary files a/secrets/data-access/ssh_host_rsa_key.age and b/secrets/data-access/ssh_host_rsa_key.age differ diff --git a/secrets/data-access/ssh_host_rsa_key.pub.age b/secrets/data-access/ssh_host_rsa_key.pub.age index e8ce5cd2..0e587e84 100644 Binary files a/secrets/data-access/ssh_host_rsa_key.pub.age and b/secrets/data-access/ssh_host_rsa_key.pub.age differ diff --git a/secrets/passwords/services/accentor.age b/secrets/passwords/services/accentor.age index c46f9bfb..e3ba91b7 100644 Binary files a/secrets/passwords/services/accentor.age and b/secrets/passwords/services/accentor.age differ diff --git a/secrets/passwords/services/acme.age b/secrets/passwords/services/acme.age index f73240eb..de460183 100644 Binary files a/secrets/passwords/services/acme.age and b/secrets/passwords/services/acme.age differ diff --git a/secrets/passwords/services/data-basic-auth.age b/secrets/passwords/services/data-basic-auth.age index 77558f32..d60aa3b0 100644 Binary files a/secrets/passwords/services/data-basic-auth.age and b/secrets/passwords/services/data-basic-auth.age differ diff --git a/secrets/passwords/services/nextcloud-admin.age b/secrets/passwords/services/nextcloud-admin.age index f6c02013..27d8aed1 100644 --- a/secrets/passwords/services/nextcloud-admin.age +++ b/secrets/passwords/services/nextcloud-admin.age @@ -1,12 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 hKAFvQ x9t/cSncNIVOU166JjWIntDJ08ar6jqEDqm2SHdIJmU -Wi1kSAfImT7O3ZHQffngy2+OK9MkcxRdTIsWj0Uvppc --> ssh-ed25519 s9rb8g FBbDb07Wot6y7VbFtZ6p6pmdPXu61fOMXn4zobmYXn0 -9WV10AVHinYMy6DfsTbDnNuCry1lunNiL8rYlM3VAu0 --> ssh-ed25519 yad4VQ qkqTUmEzVzMlL+MzQZ6jbuEuMMr7fmkao02BTEXz0CI -NuJBm09rWAPDAAiKCpjOvLn/lTqrjv4O8ZlNdZqaMsU --> OPQKCjr-grease {eEXe/H n -LeU7ay4hMrv1r+ot0bHboLAzGJBQ7E02y3lMXZaMfyYd9eBh9W3iQ8Js+UZa9g9G -gODPDb4M8+UtZh3VSGHqtfJzTCrvkPjbys3CpGRz/3oZR2v5PP8 ---- JmNEtjO4ODYoLNKN2K6Di0/XwkCgq8dAEhEkrQSjBwQ --3=tk\R|b{Kβ^KtZ`Z>QS{sԮy \ No newline at end of file +-> ssh-ed25519 hKAFvQ QNajFt1BBrbBWGyijrERR98Va6wgrtVdpSEu4r1Yn3g +R1jU7f+k0ev+TjNrMfdE+C5VmdPKOMj/oeCSlIlUHK0 +-> ssh-ed25519 s9rb8g AeFeCM94hxN7glO3chNanFAaudnDAoNreqXPflrxPCk +lthYBbMe1Iof6DD1cbbZwICsshuiGUOB1GDT0qjZCnk +-> ssh-ed25519 yad4VQ rlCWZLV7K5eFehuV5AeD5cbJaG+OephpdLpyW0QXFW0 +RYaMclukVU8KSBeDSbJTVJimzgqaGVgaBxlO/pNKzKU +-> :-grease O>v RiEg?$ +us4ZSMX9G4DY4nqCyY6pCaVVzHQk79F1UmbQsHEL+wxtiqPWJE6ShvI8HwIwt/jV +YxYaaymXCAR5rZ8q7Pv9YMLf +--- 7StYgUuLFXku5vYBpx304+4/gXH5lpieOEmeaKdngA8 +Cx4j4 .Y|w f&0{ kd_۶ \ No newline at end of file diff --git a/secrets/passwords/services/ssmtp-pass.age b/secrets/passwords/services/ssmtp-pass.age index 0ae4d1f2..e856af9b 100644 --- a/secrets/passwords/services/ssmtp-pass.age +++ b/secrets/passwords/services/ssmtp-pass.age @@ -1,14 +1,14 @@ age-encryption.org/v1 --> ssh-ed25519 hKAFvQ BDIrYjLZNtA13rPVoIxP6W1dWF88I+CLL6pUvJ6vK0g -MeEh3+IhgF5InzslImtzfa9lvlpDzWM6u5YYfPXKhd4 --> ssh-ed25519 9PfEBQ vaD7NtryG1+F4D520aqqzjy4nlCKed3lA+KZqDl2YGk -TNhvAb5h30I1s9t4nOwRdm0MjSSflPmS5sHbundkNTM --> ssh-ed25519 s9rb8g xjBrIBaOJIo6wKzPzXGOtnk07jxTxooVL/0m+MIy/HE -HV2SSpBGm/zf90PEkUjkkEDpFdunF2MoYvE1F4CAqjo --> ssh-ed25519 yad4VQ ET642EsdlhOrFWumUNg0lu2fGKCC88VkeEuATqGLuks -nPNM56yWuAVt6NWSjIswR/y0S0eSNMooz5Kfm5KRz0M --> Djkn-grease -WAU+Og ---- v4AxWOuI+CKCiqa/71rOuE2b37ez7tJ7Q4bdsYLZ2fA -gۂf8=x]ToL:"<D&! -5q|HҌ \ No newline at end of file +-> ssh-ed25519 hKAFvQ ffnoLy5rtj4qHMpHmC1lPCecABSzvQFB0eZcmqMNAQM +52UOgRy7Mlb6WSWZrZD2IBL8j958sHGWr5RsgIuWdYI +-> ssh-ed25519 9PfEBQ iwhEaRCzulUJXsBD4msE9uZGOln5d8XbX6fIqN3QCwk +vIXQFUvaHEJ/GvUxgVhHSDlNbVyCiRndfkkR11KbYOg +-> ssh-ed25519 s9rb8g uu/XALCxaX50i2OrKWUt99gJexwPS2j7C6GHfU5Dgko +HvQg9nXdud5WbXxndswYuDUUxMZflzHhU/uaJKzQ1ZE +-> ssh-ed25519 yad4VQ 8IhjqW3+rogiVNt6Y25Jd0lWpPFjq3wZydff7GkKAw8 +iTLo0dDqKMA2T7MFW5w2R3MnBqS7SDomY2iQtaPOYVg +-> A-grease +kX+FBJn9+lTFGUhIE9pzFVksfiYa2uo5isXSBLCDzgE0OWTVyU3Bi30VcmowbH0I +blvB+ehKZkbX +--- I3kxb+yryi/dZ8bogc3TsVLoBMt3+gcqeQ3exeHk9zk +iTZF\ֿٜ )U/K!xqqwiX65ua ssh-ed25519 aUd9Ng VKPLzPWI+pe5Yd/MSdHdBDuTX8rZC/+p469vEPFoXxk -98Yzz1zt1wyQgjG86118I5idbFuSuKAEkvjddC+T4fs --> ssh-ed25519 s9rb8g BEGtkNLFNifqjGFk8qEqjuXEv+2WcDI0DRPxXtm+OCU -trMzwuQwyICXkZuA4wuVflqWFVkUb3d7meW/EpxoqfE --> ssh-ed25519 yad4VQ 4j0mcq45zOkde4411/Dm9/A8plCsWWipTpC8oVjsBxE -yWVNOfmT0UBkZRVKrd8eK1ZXEbj0DBmUfLm3P75ue3c --> dA-grease KK9j4 +>n>m % -ZT+0vtK8K2BUHbW13tlDNHKtMzQW4oZUOazYJ0naCCgKSRu9am9cfsm+Ul3TpafN -enO42MOQ5i00H/6KCIo+0qc4hw4kQV0 ---- hR3HgO0pfUOtWM2K4/l1OT+nIa7ZBBxSt+KWYwHEuXs -B٬INax+uğNOILu޽'󔬼Ur[5q͘r5U.";04!"6- \ No newline at end of file +-> ssh-ed25519 umFZoA QLehvggIrm1zga12lBG0z716tIcXGmVNfX7j9LyeeX8 ++7qQwqjU5m0v/FWh+fAhWssCp752//EL4hyVvK7Z8WE +-> ssh-ed25519 aUd9Ng CJbCFMoO94/WSdJaixvDkw6iUeIFvTpWqCKU0HCY4hM +xnLW7to182WPWBbXGIO1OZNWTQAfSUQ+Z9gu8GxrfY0 +-> ssh-ed25519 s9rb8g 0t5HyNSzTmoy2ukPvy2VPUoXZpTfln8T3a14br6BoGw +dqy1L6riE2vOsbNsOvze7Zk4BLIUCDNSqMt3TGuKK7o +-> ssh-ed25519 yad4VQ aGI4ij6UtJcGIOodwvJbwt8vznunnDApzHxhKagdpR0 +isqGkGfwx0ZWoznazHSPD0HHtSoTNTod1DQbJtqdM9s +-> DgE5-grease j| 9zL'?l0} K]XDZq +MQX6jowSYw +--- rGEenFppNSComDbzgVU7OMQKuWg44ISgA8sQjeLFpqk +Lb}B+B^sչ“򱍦 FPCj<-8 8;P6hiLصVL7M_2 \ No newline at end of file diff --git a/secrets/passwords/ugent-vpn.age b/secrets/passwords/ugent-vpn.age index 0e20f14a..39ab499a 100644 Binary files a/secrets/passwords/ugent-vpn.age and b/secrets/passwords/ugent-vpn.age differ diff --git a/secrets/passwords/users/charlotte.age b/secrets/passwords/users/charlotte.age index 5290ce1d..e9501edc 100644 Binary files a/secrets/passwords/users/charlotte.age and b/secrets/passwords/users/charlotte.age differ diff --git a/secrets/passwords/users/root.age b/secrets/passwords/users/root.age index 05e765d7..6f3f2d53 100644 --- a/secrets/passwords/users/root.age +++ b/secrets/passwords/users/root.age @@ -1,17 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 aUd9Ng 8n1tz2i+HxzSliHHBHc+kmgpWbbNgCppLrEN0P+9DFQ -hE3bzq0j5gxNdk8VmYQypxjT+da8jRLIkUR3GP+4DnU --> ssh-ed25519 hKAFvQ M9Ju7grYMVOKxLjYVP3GGvV4rYT6F3VfDLI8EhsIEyQ -Slkggok27UFcYpKyEO1m4UMiJm/lp7CxVRmx4kQxqlg --> ssh-ed25519 9PfEBQ bf4KuUS1ep4Gk3fDmG78I2FcEh848++jRE71CYIQIRg -Wldrb1cqj3/8vOITln7X8KtC+CTljsj0WY7knNySeQg --> ssh-ed25519 s9rb8g Gp2mA+WShFq16ZYU8fImzqAJ96HZSv4MnT0tZ8RmyAM -t8tIVz/PYgkAuCnmaoBzdNN7Eedk47pXN62fLnvCkvQ --> ssh-ed25519 yad4VQ 5oHcwG9X9fQ/I1gkCFP0bR9X1dlugq+XLhNChahcD18 -M2+r0JfRNooc3bOPMtbae7RMJMvmdeFgvwFc9eNaJHs --> E:Oz-grease Ehb$" -oL5+EmXX4BIy3ug9u4HrEOoCtO8aNMu70KjMWQqOqwkuk4t81DoG28+/ruew+a5m -zcEsAb1gDFJb+usuVPF37nijiR8 ---- v4M0JQCd5ST1rzXfkpfgHfibXDN7EZ3/3VnYXnT23tY -#vtz ssh-ed25519 umFZoA 2NBiAWNaB4TJLRQVtghCZJ8DKRu4w3FByzHsl9CJ5XY +BiHu2CHSYuhYdTC4l5nsRfXQ1z4GJYxABiq+FyE9n5s +-> ssh-ed25519 aUd9Ng u3rq4ngnDkpCg6qqjl5RRD2UsoZYbh4Q91J+wLSpg1w +D8e+ddevM0AM/tCnRT5fcWlhUPpCvR1SUHBslzRBAUI +-> ssh-ed25519 hKAFvQ rDlrZNBHrjwbV9YiTHLwt0DReZNpoJaTf/6E17q7gj0 +VmZo0FF3iX4C1JwoxRkcwQq0ixnON8yaBjU6t7d1CIM +-> ssh-ed25519 9PfEBQ 6IGRh5XFvDPt0KM4hSE2XU3aIuOrGDrYihflSxZ5Bhc +Yu6/ZSWbsdfloFMbIQDqFQ0ft36VpHsOIux3YAdv7Po +-> ssh-ed25519 s9rb8g RvDxbLkVu5OTxV7h3OCdELIwrUmncoBsg+EK2tU+bHs +xRM92mHXFYRRYq2AgbZRMZglgZMu/sQbiPaYjuDvVww +-> ssh-ed25519 yad4VQ AoO9fFf3DCww0tq7k34qwF0DN2/gaDoA0vZgpOXFUTg +biNALn9lJ2ofSCrbfQhb/doh0C6LzCeUhzRAZc32oDA +-> G=\-grease f E5G e[ -z(4 +aG9SLJgXtv99PCPM6qRmNSfqixoQVdo0o8cYwnyoScL50GttHACpqY67wAEnlF2Y +xLokmS8PTN0raQpN+PqEwuSvf9S43vniaA +--- GJAx67UT7/6rLjMWiLTdBaodGqqnWhM7il69OdSbdm4 +Ah3-Z$^Q%K&1`0@5Wmm\&AK.% C \zpqՊ+1qSGd#5=*UQTkh4-^Vh8Fb/r7xD]hhjCIs0cBv]ɻmS \ No newline at end of file