Merge branch 'master' of git.2li.ch:Nebucatnetzer/nixos

This commit is contained in:
Andreas Zweili 2024-03-06 09:22:52 +01:00
commit cfaa1abf3d
15 changed files with 81 additions and 79 deletions

View File

@ -36,6 +36,7 @@ in
extraConfig = { extraConfig = {
core = { core = {
hooksPath = "~/.config/git/hooks/"; hooksPath = "~/.config/git/hooks/";
autocrlf = "input";
}; };
safe = { safe = {
directory = "*"; directory = "*";

View File

@ -36,14 +36,14 @@ in
age.secrets.dkim2liCh = { age.secrets.dkim2liCh = {
file = "${inputs.self}/scrts/dkim_2li.ch.age"; file = "${inputs.self}/scrts/dkim_2li.ch.age";
mode = "600"; mode = "600";
owner = "112"; owner = "113";
group = "114"; group = "115";
}; };
age.secrets.dkimZweiliCh = { age.secrets.dkimZweiliCh = {
file = "${inputs.self}/scrts/dkim_zweili.ch.age"; file = "${inputs.self}/scrts/dkim_zweili.ch.age";
mode = "600"; mode = "600";
owner = "112"; owner = "113";
group = "114"; group = "115";
}; };
environment.etc = { environment.etc = {
@ -64,7 +64,9 @@ in
fsType = "nfs"; fsType = "nfs";
options = [ options = [
"hard" "hard"
"nfsvers=4.0"
"noatime" "noatime"
"nolock"
"rw" "rw"
]; ];
}; };

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,34 +1,33 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-rsa 7S8lxw -> ssh-rsa 7S8lxw
KyffoKZdMYJcKv6JpRAWROT2qX+patnk8a2NEwbZwxPD+oqfBPuKMZVQAX5GBhrW TSrYXFsVHiSBPw5iYN7fB5p50UuAFf67BQ784DdemGyaY03WZPsVUUwHUA/uii1R
R7iQAws2LYFAQUAXclQyVhFsqyxClG+78BFCN6UyC618x9BZw3FMu1tOnXuM8kZH FXUmD3cqn4cpVdgD8N9vId8MR7gnxPqoW+GMdDapZTdfxiM1P1idey2BYKRCphEn
ybGXcH6oFlKjKSnCgKkYdMVOX8IsxG3LPKvxs5sO/ExXjOcN3cs/Wv5b6useQx6B D5IpkKczJI++n8NOTvOQN3UHbxX6QZbn3zwpX0L9JIQFMRHeG4WoLRKFN5lH1u8R
SE/ZAF5UwSaTHNZfiwIhlGblux2F7xUwJNsj4Knw9chua4lCIHRB3adbS+RSkV6M lJ49/NsAokFSP/lcGGgr9n0P126vs2/ekA3d7WlLQ3qaq7NdpA4Az2a7rEM1b6l0
r2ZqphyYgS9E3mJFKxoBdGy0+US6Dp+dx2CDF17GmYkEVDY3AW7sFnA9wt7c9Dm6 Gz4XhdEWznPkLJ+sFhycaYG1FE493JgTR80eYnFSzF/Dr2MCHafYguFTEgoLuFhw
DY5yiUlm5oeC83W+U9G8IEVoz2Wv3K5TB2A1syaH2au6koe0arl5AfA7r1RdU56Z qKhp0/chOmOixVwn4rRyHL/7Gh8ngp6IVpwsajz0B0KNj4R51fqVfNi2nJf7MZQR
ffaLPPqVbQLiAsebCY04RVeZw+XJl6jI9UzTRQPGfIWjciJfREFJX4JsT5V0ZP1j XDxGctHmfznQA9hZhk0p+l4gxwbRrlFq7FcjP8Ba1kcjcdfr0pqirEiaU/IE699j
UaWUeJ3yMBfOVnEQYqEIoh1AD4/LNqrBE9clJguLowQjcelpg8S/zlcQeQRZBnft 1oiiiTo4oWv/W+XPEsxGy666l8ZP2TrltDVuP/kfu2lkXuxCG2qrI7TU1QXxKGmd
-> ssh-ed25519 Xj0rlw skS6y7pZyyQ+h/heXDqDNtFEzsHktdoN1dw33TpwOGY -> ssh-ed25519 Xj0rlw QAKx2SkpraZLBq/g7dx0z9+tHULnG91IbYjgL2ukk2k
Cp6VX8daOFr5SS6zPVT0yyfg+/97GrCqgBWbGe1WshQ IVLEzwF8Tf4RmmNI9lhVuE3s3phDq/w1CCLDwoegU8o
-> ssh-rsa Ws+JZA -> ssh-rsa Ws+JZA
sIeK8/qLVNtPw+TNzVAijW3aFR2xwIjTPTxYI1husIbVKxJ9d0iKR9oJ4iSCK3k0 IwvcYm265zsQQvfI9smk/AvSH5fZgwwuaNdylwc7r+st3Xl728ihsqxI/lBj+Na4
BtJBZN7FjyJTxrRFfWSWa3WsIx0ZT/L2m8+hQgObMUl/Os2kJp/cuknHz3L4vAoM vPxGCZD9TdSJdhfkINebe5eYFRaCHpIR7D/nuoj5kwXvfqwY9gWo+2PxoqMHgieh
6WCMOjHaK5XzCw1vUOJjSN9ItwIeemBzXRJceg8aud7IhG0O+L77i7YuHPtim3S7 vk8dra8J+gZMXTyjpA5+99O4OMxGVt/AftGRkfsqC9WqCf2Al0VfMzHrue+++QBf
YSttMIxQqIAdH8jv4hnD6AN0Th08q1ywNbu5XR38bP5XHbkf9YNjQhtEg+nyyXj9 eaA5qgox0MBKvVOP4M2q3Gyx5h9rY2zpJvDNVyE8C1LBd8w1rV0gmujETxmtL7Jd
Gf04k6cA0TvRpEw5ogWyUYBxGd4ei0g7VIJO4rEuKLyQAKUmEnlZFZUDZtFcvfps ZhPIjQRhYUQnIJHg95aAQCLVftTlmAxC7hOKdkzatB8IMT5k7a+jQIhH4E32LkzV
jwi0sgXNNYfKUn8FW+gVrr6CvCjmAg9utQwyXyA1m5jse0piCbZ3b3GcqsHOVWY3 fosT4/EVD1nje2H1oEFXu1ETYoUEi5vYhpuoClySvSbF0OCVzzMKm78KJ2pTOiwf
4kwqsR5HbI2h63oMbtpWKahl6/Jfn3tcXXBMl33PIq1djCLpjru7AsqeA5iU4nSx VZFQ9D0S1CHyx4FlNqFE6Wtys+7Ey1oKJ/kssdnU/PtjIf7byW4h6iaPobPgEsTG
PQC8e8zJBRbqznUnStc6H5jdwjyoBVAUwuznQ5y7gZJEPBB93NJlmdPAFSbDKVUk J7SKNsWTrBWJEafMFw/hac3siQolA3wydQKGM6aZca8HTHPgNhEG6xqsXl+jZDE3
-> ssh-ed25519 skmU/w Ym/0v4MbCpT6GDj6af+XvP4CDJwMxtb5j0V7q7gfSH0 -> ssh-ed25519 skmU/w 8ddVLvPBANW6Yh13prB9XopNL2TgiBUgQ/Bm9YMRJi0
60GyIxAQoZsCaFenruxLNJ/EPM4+FC6TJqIm1n2u1pc 32RaAev0l1fo1YXDt/7bt+PQLufswW5IBMsA2ExeEB8
-> ssh-ed25519 YoupUg QTGSH9IQ0QVi2B0sjG31DBkO/8xDS0graqdqt9Ej5To -> ssh-ed25519 YoupUg ELXNuwvFpEenuujpPvpQj4nOq6eTNsuvYSWtes+bi2w
p71gkqhmzygirJSnYG0unMnkSmRpT7rnLnZyYInAdu0 NWdr8Gu9gAcvgMNGicO0M+tJAGcFlitzsncEzym8Qi4
-> ssh-ed25519 KXqA9w UcqnmyCGG1dUYb9n5Vq5qgtetIM4gdNIC86Fzk3+Hxk -> ssh-ed25519 KXqA9w +74GDFMQl5I9bIwiPlb1b1Ps1765KX0Hy+aD4Z+Trnk
q1bNxZrSj34NMlMRKR1mjo5ZKmfNHppw6zEROvoIfiI 6icyKoj3IB3G6q56eEf9g8calc8ZFJ2iEx2DM+wnat4
-> ssh-ed25519 O6+Deg Ae1wrcRTAO0KZfPEDyfAOcGeoiAwXfP9o3GuZ6mjwxU -> ssh-ed25519 O6+Deg WdnWrIIUOY4Pad8xRlDM39YaO14ZuDxe0EGNIZxb50k
mtDV8I3HYn8UhbxrzjS5u1QVb0FTw6lVOnp2A07/mAM GhctvhmPkrorIbspTolOXvKWOErHEHnmWHO/RdLZRyQ
--- 5vDFOqATMrMD6kVxUGIs2Jgl0Tt/tRDGuHoyW9Z8Dgs --- m4LsQOOqN/zx48VYQzKOMZpMuKd74PIpCMVM+RUBwgY
ôFŒ}†Ñ7'(ÍÕëògûN¡HzJë'à éRpwÒõ0 <5F>T¬<>¶¾:;o<>zç“¿iÀEíÏ8y¼e­)<29>éç_TÞN
NÒ\Rž»÷äg(ÿ”

Binary file not shown.

Binary file not shown.

View File

@ -11,7 +11,7 @@ let
git = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDO40In82pEqQJexG9nlXOsYb4T/sYrb/4EVtGc0bfEb"; git = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDO40In82pEqQJexG9nlXOsYb4T/sYrb/4EVtGc0bfEb";
gwyn = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNmtdodpXHcwEsX2x89RyxjX5F6eERanzM4OXlNDx50"; gwyn = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNmtdodpXHcwEsX2x89RyxjX5F6eERanzM4OXlNDx50";
loki-test = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqCmY9F2nWasFtmBpk401lacclXeddDm+OTZ4+tNM94"; loki-test = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqCmY9F2nWasFtmBpk401lacclXeddDm+OTZ4+tNM94";
mail = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINVPhmR4A3ntas8nG1kVngegmSDdndQmWBl3RRu0JkQB"; mail = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICdqJn2oW+4AR6ghAlI6yAEQvM55qDwo31NCIVL1JWGV";
management = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICr5M2m7cic6fCaVNEesCn8Ii/VDB0EtyxYWs79aE4BD"; management = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICr5M2m7cic6fCaVNEesCn8Ii/VDB0EtyxYWs79aE4BD";
nextcloud = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHASRPSKyADQUBe6lQEo8EHixPwktbHQjAPX24GIoWwg"; nextcloud = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHASRPSKyADQUBe6lQEo8EHixPwktbHQjAPX24GIoWwg";
nixos-vm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOcmWE9b7GQKOOq61gYLdFA5uZ+hhpBYePmmdRDGwIVu"; nixos-vm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOcmWE9b7GQKOOq61gYLdFA5uZ+hhpBYePmmdRDGwIVu";

View File

@ -1,50 +1,50 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-rsa 7S8lxw -> ssh-rsa 7S8lxw
EcFPRl2pS60ygAg0fqbekezyc/JJ4JFdlsG0ePdEajg4d38oyPG9apVqP4jqPrQw aBBU4Bav9s75GJAd1K26RbqxMka8mbzTa6nskxEkiF+TGrxBPX/paas1S0FWrJ46
TL+PKDX+p/dtig5PSgw4Hu/2Yp3tu+FwMVr3Ri9teKm3hV+2Z7p0zUtWbF0lKjSE SF5jLUdQyS6JESiPaE70pttdam8NqvORUl3D2t0qF3Sn8Xs8arSMIZwg1ZzQ3v9Y
zT3rPHm6btlZOdzcItCOVZCQwWDSLRhDmUwgCKkhc/+u1AOdXwIB/GRSoY0Fw+Qj rZlcOlvrMla3uF4V9Q4sp4/MtxIQpPA6gwtbQOM7Y+xymj8D23UYRhnA4La6Wim/
1MGo2j64mgcoTes0jc1mYTlRC8+LgsN4blatxhKg8jhM2W7BhVCAZFjHBJ84PDwN LpThxfYNKtrkQYNnZvonkjqGk/F9jngxzzvE2bjARhJ7Exe1vxmYjdUuHmkR40L0
x5h7zbwT7YOQQKpjf2WdfKL8H8XMOF6Eb9TfYwfwwsLTSd60/OIxp1mFTvmSSjUW 1e3z4R28D/oOouVv22TSi2VIpQ53uYXqVMiaQddZr/i1MX4hnp/Krvejp4FOjfIq
xIUufjP2fdCorpZdNuYcczvb4ZCqcHjEC4Pom+J3HHAJ3mlImyfHFjTWWyH9ioNH kOw9DKxkhIKIW95w6pMzk0P5pBWwUQNQjLbJ4Ff3eRtBvW/U13glSIWGVQjX9ZKx
BCGoFx5Y+gZJ4aGH6c/8LhcNDqkfsQBFmBZhUbBufrdnI05KSn7qpqkVKFv47gQf 4pJyL5S873nIYBcUI08z6HiG1xG0v//D3sVRqQJ2oorEhV8oIP65CWMfGXZdb8BO
gcNWEaz72Q+SALfoovkiWIWd4iPGEa5d9upCTWi22TbeLX0FQ32m8ZZdqpRjPk5Q 4tmOGkCm37kujyYG9Q81+1t6EKKtXGxd1Il6amL1HJJxGc9IVtoqFNW7v9DEY0LO
-> ssh-ed25519 Xj0rlw 25T6wK9zLOaPeSIImsnZyBPsBW9IYz4gRtWFNErVFmA -> ssh-ed25519 Xj0rlw WpzUmyhMgLgcCRj9Adj66ScWj1WIl1gVUxLRnKxrX2E
T6cMJEGQBAkwVVS6OJg4Vmhtn/5BQzh7RDAetuDJ+n8 HePyxedNu2SmuSUS3uJW3Wa2r6seKdcpSTRy5L7AyQ4
-> ssh-rsa Ws+JZA -> ssh-rsa Ws+JZA
SWmUZlCpxl+nT3jfKdSs4gn5S3uIOIyeX2cq883MW8wk5fnK5RoFWMnyw2czrrvU knOTYdqbuZVjmi7p/6xLDrDi9p6A2OijMdrAqZq2N5vfMbJ8P186HuY0XA5h+VKZ
I9HYETYxg3Dcyqo2Bst68kutsAK/HU5+PLPSpcamfsFsKUhhCf8TgmS7N2JDXVA8 ZKkNF2G8IoIwCy9mS7AGFdF4eDZo8lzYYeMK9ofnI/myIIlkz6JgQGs/DZ61gXpA
B/3qMSHq/2IxeWImeWfYjL2HeNQkVKJzKcigeHfnmRBnlMhDddINWNHmQZrId95K WYsrjtrJVWX4JCGr/LY70mfpArCBcbbylBgfGkN5PA9zWRksq2bxFWfcmfMXeO3d
jXK5JTY6oy8R3xBM8Nvs/GTZr7JDGvkf7H0g6RXaO2fpPeHqnJ+FxUoHP9Q4N3SY cXc6wfFByMHPpBgnMbRr7isM31dX1QY1ShTlqQLAP/UCECvU+17N5ifxmmdd+A5E
YPAKauQ1jfCE5biMMwgp0CsKKqeSU+3HWJtxQC/lUKNevhM1Wlt/7DyCdPZXNI3f pDaoMzj3LGoAnb51WnPRQOvByPYhBMYs8yHyNYTGZadWEbL7D4mNENVKCCXYN8lJ
bhtdFKwsNMjw4du7kAptthEyP1hmGUL4cRVhWaSEm5rtv8tEWFCBDqMlEoxWhTla XqGbQ+TMbz2uBjeYxAfw73Lu+j9lSqprt+zWctia3gSS0B3+guS9ZE0Y8V6gbUYQ
vxom1Ha0r71qWZaKJjzZnoJri85NP2H48fWxT1BR4Z9NvW7F+FdH1i3Wo6YAqqrT pUKM5NSujipHN7lxM0KHGSUx+Xps8v26FMGrsdtER8+sZyW0AVU7NxJIXAs8/ltg
TDkM8Ln416ZuFyPMvONKTfXu++oRxm676AStQiE9dJ7LgnNVqNUxpmIRFaG+cXS2 dX8CjIvaf1HTePacnK6BvUrF05q+TxCREhsIT5kMqlbQKhxVi15U9XDsknhHMk3i
-> ssh-ed25519 p9NsdQ FBzDRXhRWTPPcKUG/EWyBto6jvVcxyUXaUAsowzObm0 -> ssh-ed25519 p9NsdQ yorA5e5TO9A7sr0RPVdjvpEFAwYYu9y2mBW4ejeJb24
T3/BXm54DIemtk1LFnmFK5zkckvMpWy13U1j2s/ONkQ iE3PJ4fCeFOYq6AuXDbYDGPbejRzS9OwtcH3r4aI8hI
-> ssh-ed25519 skmU/w rhTnzNijljL5IC86XINZfLHxmheR19/L4M8Uah1W42U -> ssh-ed25519 skmU/w Q0EtpejgoMhzzL95VKcSdfMU+Dxi6qJBVEqosO+9MVs
U5SiyGi6E7coAlQPDK3+5Zbx4zG841Mao6WQZq1feyA BHrAeP5cvRwWzo1p/b60n/kPxon3s4KFu8fPgyTq4Dc
-> ssh-ed25519 L7IrhA 0RobYpPYj6N/1PFz/NnYHACzN/1JyFZVdAUazfnFtwM -> ssh-ed25519 L7IrhA aGrGw+33MaWQx2yg8p+5AeMC1s4WkR/I34C8ITJoCm0
wG3KC8IY7i6SSr/nephEzuAo5IuRULz6cEfb6FC3EpM VnI3VDad59JbvHtR2EwkuSDhbQlkgRDUxnQtI+Ugvz8
-> ssh-ed25519 3TG+Gw 8umkEiciF1sgCp6BWtfTJnxE5elaHKMdxDNjcGej+zM -> ssh-ed25519 b+Ll1g 1GDdyvoFIw2O3kn//2gY+V8fbIB39Cgfyk7wwBBUjzc
6ZID5Kpcahzh28dfpqpW5MrjO5ESZr6jJEk8dpjWkDI mHYUsQecvHP2WIelk8+d8zo0z3iPGsnDdXYTChpBuEQ
-> ssh-ed25519 YoupUg BrX3EDvh1vNprJ3Uyl1Su3j/DdXqkKCMoeiClqwlWjc -> ssh-ed25519 YoupUg M2rU/TgYJDE76GVRffFVN/Pbg733Y6wM2NPQpvLu80E
FCfDO+0ctCYKeuk6+NXO2vaElbKTsSFa2pfv14mFWhU MIx5/izD2hO/E9UFsPh+xgXl+BcYHC0uMRsMFejN+cY
-> ssh-ed25519 M+LZtw Rn9E2ijMGFhchY3pHzAvoQg8D9X9KGQKtc1y3rOvwQo -> ssh-ed25519 M+LZtw wHpPj5btzpAUl0io6LmYGhlMmOlYnc9c3NW5dU+AMgQ
32/EwA5kbRoOHBpQwz+DLkpCl/5+e5W0gscJPWdTEc0 1QBDAPNtSLUqUfTEpcbIbOaTOLpSKlEHnhdt96J5O4w
-> ssh-ed25519 KXqA9w nEqyglzdbec3dQ3/SK7yEvOHJyJ1Z5tfNEhjKcpe5HE -> ssh-ed25519 KXqA9w vvbbLeXaEn0y5UMvivscB35Pth2DjMMnFYIfUc1Ramk
xvoriDMVN/w4A/5Z1NaCA1KFqgzncw0SOlRmvKf9+Wc ivFLLvKeKcypHy166ztIr3mKdQcwr1vWyWAQXLIhYYQ
-> ssh-ed25519 XTmJlQ QbNLU4jtxGSt8N/zMo86xaAzK3grg8zcNmuktggZCAM -> ssh-ed25519 XTmJlQ 4MUQHn9rwTMQa6t8Uv+bEplXvKmFN7Xgfgxe+FABUlw
cOZL6Ld9GZZTI0fYgTdQmaK6Qc/iMAAQvlIfLod9gl8 8/N8WRBCdS669fpxHQTJY5D6Ft0Y/BLA9Rt0ZEtLIFA
-> ssh-ed25519 +e08ww yKBGNAJg24eJmAK8nkY8MifOr6fLlhmPp/8XGHzTI3w -> ssh-ed25519 +e08ww nbUhRQ1zZFfi56p0b0Z+GKZVFJ8R7VFb0/pIs/FSQDc
luUbbgo1Db5O90S0ICkFWhK1chRVWZXeboUtQzvk62s Pk27rDSzmCfCw6B389aSYuQ7WFASmDUpFOtOj4Zxx5I
-> ssh-ed25519 OHRG5g oJoR61myATuA7SQgPgj9P6g1v0xCE3FGO5TDlrvhplI -> ssh-ed25519 OHRG5g eOYlGtdjfFRB9LOGi+MFh5ExXABCioGaNKlM1sLIXz8
fRQKV4kh9T8xg8TYedA2Ako3+OF5TzzJw+4X+4XRjWQ rwHykj7O5OTjodV7oX/CHtqbfPqn57mHJiJF2A68GU8
-> ssh-ed25519 O6+Deg p+9BJDn8DlHoK/6clXs0varTxH+swb/lgHj233CDSnw -> ssh-ed25519 O6+Deg hFFOVZWKBn4YMu7FGd5zikKRUCm8tl+nwcJvw96f4W0
kQLtCEeBOfpkuM0b86U1pLh7PZHzgLvA7Wbehs/bh08 aujcWoFqn7BuN9AMxn3dfVINMXCCTKEaMwgB5czz2T0
-> ssh-ed25519 NNd1zQ stZlBV7irO9IXGY4Xi7ZOT5weJ6uy25UuIptNCuXKTg -> ssh-ed25519 NNd1zQ 30qDtQDt+qm3443i7lrin4mjeuCgVCQ/hT/HAi+X5zY
dQQqsvwukRZsneZf+LBP8XadOVsY7MbvZpWXm1KT7S0 Moky1zJ7LeH1O42bfsq7t+3ptbhGpm58GRlr0dNkTkI
--- ufkGObmVOeUtKbWIe55hJ1WmuWX+BBCiuz67POqiBNI --- kh9Xa1cr75QMMHbpTtUKlnhngkmxaVJujdBp2+be0ck
ôÊM+ã¹Ì75“:€/®QëÙ+#´ïÚÍNþíÚ%û7¾mÙ¶˜¾òdj:*!<21>g3˜bƉÖ:!<21>î9¾Cú!뾸ÿ\ÁäÏ>®{<70> <~7í}"ëÁ¾Ç¾úc¤ ;õ)»ô½;ÃÐ\õh_LKgÓ<Â檘¤"Ô¥ö•nŒ˜vs!žÐ®¸œþŽVâµøôUDÒõ|…õ °pÀp}C])t
Xæî¾L˜Z% «IƳ¼NÈÁ`”Ó¬-bc ùQ F¢}H¢Ãá!Œm bbL