machines/gerd/services/lldap.nix

@@ -18,13 +18,7 @@ index 71e4928..63be13c 100644
      let server_builder = infra::ldap_server::build_ldap_server(
          &config,
 '';
-
-  pkgLLDAPCli = pkgs.callPackage ./../../../shared/pkgs/lldap-cli.nix {};
 in {
-  environment.systemPackages = [
-    pkgLLDAPCli
-  ];
-  
   services.lldap = {
     enable = true;
 

machines/gerd/services/murmur.nix

@@ -15,8 +15,6 @@ in {
     environmentFile = config.age.secrets.murmur-env.path;
     password = "$MURMUR_PASSWORD";
     welcometext = "Welcome to Friclouds Mumble server!";
-
-    bandwidth = 130000;
   };
 
   # set superpassword on start from secrets

secrets/authelia/jwt.age

@@ -1,21 +1,9 @@
 age-encryption.org/v1
--> ssh-rsa Eg40bg
-ozqqgXwf4CQyR4q8F8adFVpY2zcZVPsijzQzGisd2jMFb8iNuIY+/43VQ7z4u1Nw
-iA3n2OL+E78jTbR+Su5d1fonqOGYzQn7ABl/UVY5luk2BSPHLJDAfpbkV7J4F7oG
-cjlFtzCGC4OG/D86u63G69f/cKD08uTbNC3huafQ9KfebEizKYY1ilWelU6YxUkx
-h4/evoBocTCi7Z/htKOZ4TX4d7QA/ngSFh4Zt2UXf+ngsRSb5hV0S2rzldfX6K8i
-ihR7UYPG+6p3OYKoLIE77d++5W+YPt92O3Qgt9Fe2lcgjd7ue/x7Oiu6yYI2vnL1
-znwSJmlexFaMBtBnI+2omzS9zieiOdtuEEp9bhaIjHfjJ5Z9DVOgS+EDsO/NW7Hs
-Rha14TBm0sBLoZCwqa/kjqOYhdO3M7t4rFlfG9QfS6bmbODnM3Rsigwf474nnNrA
-BPAptWlSDC77AzTA8MAJSIm8QdMM4nHVBW9+jSO6aVGmcjA5bekwSxxxag11TKll
-KbQ/hbgX7fzKjXHyuLEWEnLMF7WP80GgMpS/la26rerwVY3YE2fmMtTaSItMJ5PQ
-9XSWBLuTPq2pet/2CaAUi3kAl6rn8qqHhRk4KysH3SFTBR075QTKZXLns4YS2v1b
-NJg43q7+frTniuk3Z5r6SKQl4LxFVIhFD/AWqY8Y650
--> ssh-ed25519 QSDXqg 2bRYFItddUsBsNarrVuZ82hziDABXzU9oDqMa/TIOCA
-S66bjnIuwm0OtFF5s61fIGmzTOdqQdXQAM6lN9F8/C8
--> ssh-ed25519 n8n9DQ Ps+E0aEBbHQK3TgpnTrvvFN0B+y//CgsFHW8vbvBplM
-/e8dQb2NfaBTT9GV1PPqXsK4GOcvOqGuv3RZgqP9R7w
--> ssh-ed25519 BTp6UA XNBs6tlo/ktovNv02+j9oGhzeYi+hV8v/y+yS3ySohc
-neW0pumQKrTSW2uVdcqyqs5BwgLwyTo1RuofvYdQ3H4
---- 8tBgSYlHoSFKkMSKuyPB2aJMErwByq0OTfzJoHFndC0
-2ߨ€CïÁ
˜‡Ì¤)柡%õBK%â~%‹Àõ<C380>®´Z7ü}ì7¬Ä<C2AC>‚#øÀ"ˆûX7A9ÿ)è-¶Ý
á¸<C3A1>ÆHþøYÄsǶe¼eSÐõâ\ÚØ<C39A>î#ÿ‘‘IŽö
+-> ssh-ed25519 QSDXqg 2i+hCYHZQ8bEtQJWnazPdAkDky907gzu1tMod6tIUkQ
+c7AoKQEZERJziS+b89OP9v3j5BFG1FTcc5yK4U7wHtg
+-> ssh-ed25519 n8n9DQ O1jM3fRClKiKGaJig/u+APxwi/MzIvs7l/HC+rDiQiw
++0VQR4gO/rxXZJRjfv/t+mfaDi0kUioTom8OoNoFDio
+-> ssh-ed25519 BTp6UA 93ld1x4OCnO4GshJz3Hf7mB2jFVGYqZQ8AwvB7cOqzg
+AMFa8ueIf3Fz8VQpWWrS6ncfrh+pdsU7RMR3ZjA8KLE
+--- qDtFEysXwYfNfu63ufZFt2lARP72Gkx0Kp6zs81VkT8
+Oj´}¼4VfĬj¢Ç\cBÁ!9ÏìÚYÚ¨­Ô(ìd2©\bÙs5…ïâ2ËhTRœ@êg¼ªÔ·®•„kì9¹S<½wq~ÕÞ%)º^B ÎõJS­ @Å©x±Í‘1[†Ì0œá>

secrets/authelia/smtp-password.age

@@ -1,22 +1,9 @@
 age-encryption.org/v1
--> ssh-rsa Eg40bg
-CkaMpn4DtT1YmwfIq/VwjA+ZiJGG+YgbnpjDJ4hjGS2muyLGQrubfN1YGnpxs+VU
-AJZLm4SI+Rpg03ZYY6yynF/fwQToriZi7FVwP8P3eWvkN1Dyiglpd9qyivxr9S4/
-KPIjoKqX9OTs+SFIJrGSe1iTg7Evf2NotzFUECD2CmHUpsm49/0kiI2BdldqANKd
-Qma9+kxnlEjOUDuf5qZt8KAkw63YQjHD8f/do3dpPnImXM3I6WApZpNiybeffrYf
-HgdIDbLw2A1a50sHZaW0cXfmnN0zD77mywafG1Di9/nlhR+gnPwhpGIZpnW5P2TB
-esK5NoQqLH8lKxjgN6UgS47ZhJ42WwIKHmMofLeqdt0sRD5WP5XrT2wocqAGo9KG
-FoEgwhjOeJYUJOzOjiu4mvSOo+0e6MQ6A0RtZSrJmm4i5pBBM/Xv99AYMndmVdRu
-QpGcZUBdYcPm0ZmKI3kCp8UsoXUIxWa6NvUDQ53uHKWxenH2lb8eLCPqS/b1Zt3u
-R8e6UwRMybHe8GdfRbqNBII9mrit9QNN5/2NYK+1en4gBDybc90pyDNG/0hibUMK
-C9HGeRePP80wxnCdd3dGP41VPLO6RKNrwV+v6dRFFoxxeMQv4mFpsXN5UzdbNYlx
-4Cbyk/V5DYcJ7M6axywjupKqKBLW6A2UGjNOt/yh008
--> ssh-ed25519 QSDXqg 0WGDOiWOROOs+wtoRhqbtD2VY45aj6/mrCG1Le4WhAc
-44SyaJeQ50GzA2YSaWMOyK1c9gzTfSPr+WgGk+rUGME
--> ssh-ed25519 n8n9DQ YwZQzHnRB9z6cmC/cjIWRW8SkmDD7ZSLBOgZTcEYinM
-ovMpSjMKtmItFRyryawduHCRSGAyiOEGLu/1sO4hfZg
--> ssh-ed25519 BTp6UA ViiHkHWtUBcuJ+TEp5y8uVC6LVBO9mpB+z4+fbyYHCY
-B2mI/K/A693I6fp9Zc6v/nfTXaUT+aKBrbbnGS0LwRc
---- ugNXNKEebHvng6XKc2FqbtIb78D9LK7YLhM51j62gLo
-ǹ&³ãü‚Óõ`[15ÎÁ0û®£ÁÞÒ¬Ä?Ù.%
-u•‚Àž>ÛÉàp~ÀïàiXþ4Q™œû‘’ãø‘¾xŸ
+-> ssh-ed25519 QSDXqg ukkpdyQwjxQ5ZSDRNp3scWW/UaL9KkvYjgOohagME2E
+TBz/F6ki/WRQ36dwWGya/+jk6d/CVit0uk6ftUGwkM0
+-> ssh-ed25519 n8n9DQ 4tAfBISscjJkXdT2ze7qwjSgXsKVORQdJ6BU2FWziBI
+KsgjA34+cX5JP5zQDJu2S42T07L1bUH6rFNLnGpGsCk
+-> ssh-ed25519 BTp6UA MN57AovukP5h7xP0TtdZJnbGUVGem9Ag4yrXeQPLOmc
+XvlsXC6kI6gbzrujxfGQII2bwPoXd7pAQfP3oXGqe4U
+--- qWkj5My+16z9Qjge9GR0ezFkzi4zONiEny+I/5j9qpQ
+
*ｦ{|<7C>o訒<6F>i_k}oｾ暉<EFBDBE>ｰ乕z)ｧ讐ﾈQｳｵｸ､ﾆc弥戻€ｦH｢､<]約･g\{W<><57>7:

secrets/authelia/storage.age

@@ -1,21 +1,10 @@
 age-encryption.org/v1
--> ssh-rsa Eg40bg
-LUblQeRsj/R/vMSQErPTeQgqi693Vv5rXPLVHpuYSs9ObOJF/60J7KX7ML9v1H0g
-TGYRWouHT2GJ8bNIzXqG/XknmoxaWQ2dVErgYDWsoXOrbSLkcwVGxTxNwE7Entf/
-EQZhOQ4iau2b2E50i1E42ndoUdxZl5SKuc7WKh+nmVsvsRwnuqlfUHKOxxRIZSTR
-Ioh5YCF7RSBzwQMG9+apfWyxFKirScpzQpLhpPex2quEyN+42ILEwqB4EXCQNp9u
-Quhd+ViFsgGzokalPFeGmxi08WQ/ugQTP+WLEKbwJKVyIAOeGxf5DhpKFo/yL5kq
-iOcKTpSbmcVfD+Iy/MaA6+xkmTQfyBmBCzSj7bNunHECgF9P0MlOa+ngMetOCKoA
-xjkE9yeDU2NWLavomfSW0CA34+WbzplAT2GPC3G2EHBXj4i8at2SYSWE9ZKKwZ+C
-Itu1gCeHF0zSL4VMO0aNXWJFKex41d8JW3HLwPQ72yTDXtaecF0GIdrQyzqbTqvH
-j8FH/yqBDUh/fCYl0WrGJPHusrJdcW8KnDxJrrvSfy6Y8Nc58RNJlLMBKSJtV+cY
-GJudKgVzldyk/euuE48IOYYRWKgxULg231zpKwsTpEUA5QFmCrFrzEv6Luxt9AHr
-lpC6R8DbDngPcuz2eiAAlZDYS5VeX1fA+5J6p+C5ldA
--> ssh-ed25519 QSDXqg XKVG8SGJGJBqdmxbC7SUuoJz7K9POE6GdD8XmSc4ASU
-XZS6GFbGyAJWjXvYmy+qbyRSy5UiG5OBn2yC1YjKLjg
--> ssh-ed25519 n8n9DQ PQzPn44XKt9FNT5S+KVjOQxuaxdIk8lCNHkKYfIRrAA
-K4HCgAUUHYnyQTaR3LA4+UG3wRXuuMzgktMN6ei6MLc
--> ssh-ed25519 BTp6UA TsftXyqWy2XP9Sfede8LklhByA7mRktIXENZZqzhFAM
-CHMa27eL0lxRuZIKoGJrejyBO77nSt9duIlyVQ3C8xU
---- 56a8fnKcHr4AKBK2wJgViNBaJdCQyOnlu1maYmyUu3w
-{k›¿Ó 
õc”˜ˆì·"È!›ø79…¼/êã®)ºó;goøü>€øð
¤2=4P€ï|‚ðìËÔAl¡¨.¤T¨Ü€Çc¬ðqv°'Ä$13ªë<C2AA>Qf 
÷Nâ<4E>eÚh.e
+-> ssh-ed25519 QSDXqg /Ywa18VQyXbCgwIBWGRDB0m9mNd7TtQH4HEQvJpxLkU
+NdigMBP4yDz1v6Q8OXGu7lOd4JpxnBJuaWj5xgz/I/w
+-> ssh-ed25519 n8n9DQ yAQO33Csz6+h8dEKmOvVbZUgxN+nPY6+OvE2W3wBNmI
+5v8JM8vHAmWUlnYiK+eBhp+BIKwbGSOS4UzFpxuvzEo
+-> ssh-ed25519 BTp6UA VnmGREd7Rn1c4sYJRo85cvnuH1QBTQxG6P+c/tdat1M
+0TBJ+a1BBtFBo4beFx5671hIq/pluFJ9wiUK59dZEc0
+--- qzbsERkRBc+PLfAg8/+MiwO2Rh2bWQi6YD0B1QiyzJ0
+<EFBFBD>ra•ËteX
PœZ¥Á	Ê!Y *ð§aþ™ß;‰í±ˆYöÏá&¶
+eñ4<>¡¹ÿéì¥UÉz )ºº2«
 Ê’ «¤>íº8SßozRÈÁ@·Âè(UÒ´rܹË$åUVóÆßäw

secrets/forgejo/authelia-secret.age

@@ -1,21 +1,10 @@
 age-encryption.org/v1
--> ssh-rsa Eg40bg
-cdfRtpoIBjibxukFao00jd+vmo86sFot7EZsTAVaJZPmfr90Uz1Sdm8RYUT9N68I
-YyqDm6+/253MmC5q0op5aQ2OdBU0ORvfIM20OvdZshyXfFW3W/zEpGIOaETQ5kb5
-RUvFGraBEYqouDI9laMAFPqOH+QJNNFJUq/9NgZ4YMFKAv25b10FeccRag1G+VaH
-LPSwjfr33rLBnWaPRBpTxZ/329IXPigLVGDHVX5UI2KUrfDy9iL7EeOOtRM4Tv4p
-yFv2DP+pqmEvtOaLw8b7PzcfWU9HbKZymgMedYSlOvdcWpTQKM3t5Jh0EH1IGa3P
-CBtqCRz0e2IBDvz4i4Zjq+c2jXMTnC7He2CwFFrz0pk6nkpPLxUILsYR6+sg6BwZ
-bFRXrDYIJ6MzAL5uIW2xN38mDYjJNhIKaKZN1XkVdEUd1T2UF1DP7sPx1GFGq4sv
-1wRJSns+GfrSeyJZfQ8MsSbfrsJlxNYPUisPhJnCfUIeTINvkz9dKi7DckwdjvLK
-PSGTWMR0IRr5ZyG6ZAkTWZLav0Q62p65naql+R2dGoAplDTSrKfXFY2os4vcrVx9
-tc69yvPaVprOWKzaDj+i3/d0mU+DjtxaZSqDZknwTKdfPuSa9Wd8pawc+z2h2PYV
-UNkmG02bx/08N058jXqGr1Z51zdELoDzGHyBnsx0ogY
--> ssh-ed25519 QSDXqg cWiW9EMp133eZS53sQhG+QQ5iIY3qWbAzhkPxFOgV2g
-fIibNYDLAxJpKrBtbM3QwaiC7VAl4JkKzcN6pFOeRnc
--> ssh-ed25519 n8n9DQ rJbwWPj7p7u60nMHDcaPdB/YFCFs6kyEdk6C4p4zbRk
-CdhG10sSpg6dIAHkK4GW47viXWqJyHUabTtQNp5o8B8
--> ssh-ed25519 BTp6UA ZMJOLB98mA4Z4gU5TRIS6XpOEVYyIEcHbPHtfEPGikM
-8Ie/JKkt+VRhMloiHKOZ0lQajtoIU3//Wv5qFFj++AM
---- BLxikI/qDgnFUg34RCLDcfpYHXEK0yZESy3G3SGFrWQ
-Qt90³¥tÿb±<62>pàŒ_*ýÑÈ×µ}àé¶ÄìæÐô— –zØWzÀ¼n|’+µlh_‰}wL*aöN-½•ÉÏA“ÙylÛeãÒD’iÏk
@üƒ]+Ú\?xZä0•oG¶ÿ§Bï—+Ç)Â
+-> ssh-ed25519 QSDXqg 6QDsf2ACEhUdb2IUxDaILcvoPLPdpXupn7DDTQCREWA
+8VYqwj6UoIee6DHG+bF3lHnY+NxLP8KkjjxynSiEUEk
+-> ssh-ed25519 n8n9DQ wAIhE1M0sMi+0tdc2fZDFzLJLlaZkhZOXIEkB2lm3UE
+iG5tvWLkYfv/klmc0LjUn+96RuYTRUrLbMpPicpVchc
+-> ssh-ed25519 BTp6UA GSOxjXyCvjwg/jS3pG3gegh9jcYbVHy3y4v/dUM7plQ
+ItU5OQJswLZ3nCpfUcLMhkdEVF6Iu+lPP0qGj9MU7h0
+--- ONOkuJRp+quOeMUJ6kf+j4Bweks4FAGurAE3xgk3wIw
+ðà7‡h#p€<>·ŒØ˜ÿ,ŒÙîúà‹SV|^8"‰)¢š§†‡è]ýbiàڡܶġTWêi Aÿ
+¹\›ò¾%X¨v
«
4Fè”9{<7B>FY’<59>"‹Ä5`wZ¬¼¸MÓ$eý='€a

secrets/murmur/superpassword.age

@@ -1,22 +1,9 @@
 age-encryption.org/v1
--> ssh-rsa Eg40bg
-nCNYViV7ZCLRrs61TQj+UXCLvttO5pvoEoDoNWDEavvp9dqqa6Ica0x4zH4Jt0nt
-Q84H0AYMJIAxbsf5aDhoYjrg+oJmrPNjh9SZt9IIeP+KxVyc5JFgg6SR1rL4fr5Z
-ICYqQJ5H4z4oNrgdVkEfWIVwDZPKLbOVZXWpapejt1y7Ghn8K8lHB9CINIkQz8Jz
-eHuo+PCkW2pJcyD2SP3qbuK9Y1U4YPFilnXy7/Of6Rti4GQ0V+IwrKJq2YnOipcm
-5QIFpBRNzc4T5TfI5bwdmqkzPPg3Jk3IAi4Nh5jtjy4BXHTbbxEERKvUneTN0UuU
-pbEDPsDAmD8W7j30MxzPyZE7lvEY1DNMAyJJDJRDxq2J9yXZH44hVoq/DzFBexR/
-xi069Bbh1WxGzI0gS4tPIcs4BpMrrM9wEMCbqxGjS2eFVmJdQVWJjk1iQb6qwuQp
-H5SDOu8N15tMbxuQmNdBITlrQlxs8I57vWqwVpvUWdplYn1/K0r419anXM/Nzdd9
-K/Qsd9OggnwYkavVyriB15RgrrF4H339c/wOTaEMuFRHj+YDl19ymFvmH6ssL4h6
-fCofKO5ckG6UjeXI0A59FHCCJFkTzo6C0unNoZvlV67Yx/Mo7Q48g/07f7hCeT1Y
-KR7PV9mvvfX0oCkYucqU4CtN8fPMbNKYeyxZX5RBBf8
--> ssh-ed25519 QSDXqg 7m0PVUfk/pQsMkmOQ5C+W5FQB5E+Rgn+Y6w6+7iQnlg
-m3MFGm5BpCWNRW5fkuJaX6Ki2gMsdZz4icb18Cp5l5A
--> ssh-ed25519 n8n9DQ Lrzz4SbA9Xoncjf+uf+msBMJOU+w8tRZpT+vo8W7rSs
-ZC1j0jrKB2jQdZunr5WP9HtO6/rT/ENMS1e7iLqduus
--> ssh-ed25519 BTp6UA +4coD6FkhQRR2+UebB60QuWukJdP83JDHowzLyEKCVs
-Z0nGjn/UJZjTDbcItQZKrpouyEK51ZwmIv9GIRESAw8
---- MmSsaZGxIH+bXG0AlFBanUC2O1y7i26WChXhTj39s9E
-94°mtpkâ¨Ø÷Ø÷·=Vî3M,ñ±)
-b˜¿o!ï°ƒ¡šÐ<1D>qªD1c³è­Eî OÔI纃#MÉ“
+-> ssh-ed25519 QSDXqg LoWIvj4OQjNPaGbtQYSUEKtkqvcVa2pPisjyXL6ajy0
+ZfLdRcsWa4Nc6HdiWO1GCgSgHm7aZeUdEDCjUCn6CuY
+-> ssh-ed25519 n8n9DQ e7DWlUZdaDPgoS0Ylnxtf80IN+QMtCJ48oI4Z4U9+0I
+/2ZleHBcAkWh8Udt6D2QgBOCTKkqH3GIsGsGexpAaxA
+-> ssh-ed25519 BTp6UA bgTa1+cFzW07nPhe/5GKW1RreVO5IqIzvPZTYpnrGjY
+7F4HnAnHVZX+dfOpc5mPB4/TTgPgw8hiIyVTEbffRQw
+--- IrCqHtOIS3c5By3cBTPQAGpM2GzCu61AhiavRjozk7o
+<EFBFBD>h
ｶ<15>ﾈ都･ｹ5+RBi}ﾏ黍<EFBE8F>ﾍ瀨	ﾊN$wﾄ:ｶ![ｵs<EFBDB5>ﾂ
､ﾞ<EFBDA4>ﾎｱ､<EFBDB1>.ｮgR･ﾄ｢>

secrets/secrets.nix

@@ -1,11 +1,7 @@
 let
-  user_eyjhb = [
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCpGGdH8BpCM9pUSANM9vYA4b/V2zGJK+GGpi8N/Qp+j32TRD6UsA0g42o4tL72Hsv3PKUU5vaZaXjeSSZYpwaNCe1aR7ehBesEvcgeiU66jBQ6JfMoArF+ZreveXQvtYeqcN6Iyijcu7vyqWIcybT5yOEiylQhB2bUd5lVR9KDAW3z6zhiVPxGmC8D09uZVxsGPfAPxyKvRs6Jkq0d67nDI9yUOtRJEdMvrDDhGzHQhKRuxl+NHtYCOa9octFZMcpEssmUOS97KNgBhglSZlz4a5PKUO7NmLZEgrCjw/aAKyepRenB3a7R/20lJvsN4YsIAR/rVH6bdrYhWKOjUrXm3PFPBs7CxdMP9qs4LEM1AMJ0dTw40AE94HfvilEV3HV+WSjen1dcHJNrSQiOAfXZPVjkkmnrum6p3R1gPcezhrGuWZv/RDgJIflo6Kd3heCe9gk1tV/lYswm5l9Cpg5gIUiMd01UfXI4FvxFQcE4AIBs8UHOhorIbjDbNTeZoBxXZFWMRUTVNR37hZRBnp/Ept0WOsIhlqi0V/oGRAilVy2a0Xs9dwX785W8Q9g5weT+fUR71huTjEEQnz7/VGcOPE64mD3yh7rmxYi6wMjoG6/NxzRBs4KRux5q+MAHxl0jDCgV+0fx78xtlH9Zb3/d5cgZ4TwPeIElS4g1b5FFBQ== eyjhb"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPuma8g+U8Wh+4mLvZoV9V+ngPqxjuIG4zhsbaTeXq65 eyjhb@chronos"
-  ];
-  
-  user_rendal = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGee4uz+HDOj4Y4ANOhWJhoc4mMLP1gz6rpKoMueQF2J rendal@popper" ];
-  users = user_eyjhb ++ user_rendal;
+  user_eyjhb = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPuma8g+U8Wh+4mLvZoV9V+ngPqxjuIG4zhsbaTeXq65 eyjhb@chronos";
+  user_rendal = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGee4uz+HDOj4Y4ANOhWJhoc4mMLP1gz6rpKoMueQF2J rendal@popper";
+  users = [ user_eyjhb user_rendal ];
 
 
   system_gerd = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJosDVq8j4V50/z6nj2OMBPhqda95HOS1hKLGvo8viLQ";

secrets/stalwart/admin-fallback-password.age

@@ -1,22 +1,10 @@
 age-encryption.org/v1
--> ssh-rsa Eg40bg
-Lkts8dUzBl9zmwi1Tewq7IHyw88i7l4fN/2ZhUkPxJElg7Yie65+cO+MDENLpBcz
-ajT2u3G3RxNX9ZLL3Cvm+zUO9b9+WnP5GWtJNWhGjz50yhG0PLEdNUMhJNOfh3L7
-4Y0vQERBYASZN0/M54l9hYpQrhDrRcbaNUu/rwz6L9zi/m22bWJ7bblH+2aGUcrn
-1fL7i1PrcLvrFD8AQd7Z6Lj8H3m2ekGQqlhfFlxQ3QbbJuNiWWKrWxcB+yiMJ0Pk
-z1kt9Hy7EqTIV5JmDc39J/DJnPECjjyzSBiZvgytHQFrQvpqJC7UK5HgqSEOdMnQ
-M8lQbH/WN0mZqiRkQF4aDPQQ8txJzTKjU2kv0/0VFN9vWkrt5hn1x+E1g/lGtQtz
-rfOGdQ63Rgj9tjZ1SWuZqxXrjrgYrPU0DCYCrUiEBYGFE+1u0BUwbZw0EBlpCcmD
-rtUWE5msKV0u8sfWdfvKfZINDqojgwuiXBsM03MZrHtM04FGjjsi35oq9S8v+fgL
-tVtmqUM7kl/Njxkmt0i2XfmEay55Yog+YSmhO531ZzutSZpYkDtdu3VzrFHRr0C1
-lQyk6+bA622kkzodbsxW+3j6CTThmjB9mWytnTIqp1Ge713NZ4uutTXtRMe9C3q/
-o6GlBs67BoCJJdhcKfO/XcosXnydZ12WJgu5a2H9chA
--> ssh-ed25519 QSDXqg tCaqZrmc5WwtSsf2Lc4bGNGEf6MyDjYuF134ZU5iETo
-S9ucBNixcBUeYn9rqQxIT3jP+rouJt+TkSaBR/9NIZQ
--> ssh-ed25519 n8n9DQ KMk9cehLVZ6r9ydN9h+56gsOlp5QtKG0jq6QOY4nq1c
-DyNj2kPP1Tj3Pymx4xLG0L6gyLjwnwV0lhoCtDLJZV8
--> ssh-ed25519 BTp6UA CKHRedC2l4HWpLwVWglqULDx0CG50wP7RsVzQ8EHqEE
-IWvCZiCLxHZlc3R2eVQfZ+4sKDqkKnF7JtnXX0lAQNw
---- klvizIOzNFe1hLJLBbVWne3eXKiT22y5huhbj4OKZ+M
-½É8m‰<6D>?æÁ·Vb5)c«‹¨Ó¿Ë¨!ªÉûE¾rn¯À‘"³”p©.uö{<7B>i
-<EFBFBD>ìkûVd,¹>)<
+-> ssh-ed25519 QSDXqg 9NdZ2auQY3xgJyg6bk9IXc54E7s0iBIEaqTJPze6aVo
+sO+XRHIh8+BzH21AuIdSN8V9eZK8bL7synmip7OF+e8
+-> ssh-ed25519 n8n9DQ RT5uVILvBUdHPxCcJ1pYgiiCGTgIpn1UrAYnrpgy3RM
+HfHBx5QVn8ahHk1NjxZWsfrD2W2D0E25mQrZGkiX6WQ
+-> ssh-ed25519 BTp6UA AY1xVYOt+wTYPBSweXv7QvpJOsEawEBufpI6nR0+0Ds
+OxwPG/E5EatvwUgvhqfW8dVG/r4fjbf0Nfawz/BBgD8
+--- 6tjacKndq1+4t3+EEnl+Sr2qDIlrhvE4WqtxPXZTUVM
+ô×°ëÝà8L󡈸zÆW™¼–n—Ö”
+voQ–OA¼S˜io×ÑO •h\î÷Ï<C3B7>É/hF1–8¿	#bƒ

shared/pkgs/lldap-cli.nix

@@ -1,42 +0,0 @@
-{
-  stdenv
-, lib
-, fetchFromGitHub
-, makeWrapper
-, bash
-, gnugrep 
-, gnused
-, jq
-, curl
-}:
-
-stdenv.mkDerivation rec {
-  pname = "lldap-cli";
-  version = "unstable-2024-08-31";
-
-  src = fetchFromGitHub {
-    owner = "Zepmann";
-    repo = "lldap-cli";
-    rev = "6eb61cef179696633cafe080a018cd085d3c3f64";
-    sha256 = "sha256-Jchj4vqlGWmjFtdMwZAnI4VyBh+/p6rgZrpA77xlSb4=";
-  };
-
-  buildInputs = [
-    bash
-    gnugrep
-    gnused
-    jq
-    curl
-  ];
-
-  nativeBuildInputs = [
-    makeWrapper
-  ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp lldap-cli $out/bin/lldap-cli
-    wrapProgram $out/bin/lldap-cli \
-      --prefix PATH : ${lib.makeBinPath buildInputs}
-  '';
-}

shared/sources/default.nix

@@ -14,14 +14,9 @@ in sources // {
         sha256 = "sha256-5Uf/jLV0CJFbWyPmkpF4kEVISvoG+fujvTAFIR0a2ek=";
       })
       # stalwart-mail
-      # (pkgs.fetchpatch {
-      #   url = "https://github.com/NixOS/nixpkgs/pull/333507.patch";
-      #   sha256 = "sha256-HAbfKQRnOjdK/rJ5wuePw4hEVQoFz9N0YujxBxROGo0=";
-      # })
-      # element 1.11.76
       (pkgs.fetchpatch {
-        url = "https://github.com/NixOS/nixpkgs/pull/337906.patch";
-        sha256 = "sha256-35ZTSIYmKmOcgQfWS+Ze6PdEHCaB2yn1q0/1nEt0Rh0=";
+        url = "https://github.com/NixOS/nixpkgs/pull/333507.patch";
+        sha256 = "sha256-HAbfKQRnOjdK/rJ5wuePw4hEVQoFz9N0YujxBxROGo0=";
       })
     ];
   };

shared/sources/sources.json

@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3",
-        "sha256": "1r3bzixpirkingic4w79dznszcxzj7y3pgds3mpg9yilmp0q0ahr",
+        "rev": "276a0d055a720691912c6a34abb724e395c8e38a",
+        "sha256": "1bdf6p7p4rdzkchg67w5vhfg23qs3381cn4x7v16qnv6hqid0i8s",
         "type": "tarball",
-        "url": "https://github.com/nix-community/disko/archive/511388d837178979de66d14ca4a2ebd5f7991cd3.tar.gz",
+        "url": "https://github.com/nix-community/disko/archive/276a0d055a720691912c6a34abb724e395c8e38a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "impermanence": {
@@ -29,22 +29,28 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "c7f5b394397398c023000cf843986ee2571a1fd7",
-        "sha256": "0znd8asz61l1dm5qnjcqcznjr138ywwwkpqyla571s9z0s3jybvv",
+        "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
+        "sha256": "1c99hc2mv0f5rjxj97wcypyrpi5i3xmpi3sd2fnw2481jxgqn5h3",
         "type": "tarball",
-        "url": "https://github.com/nix-community/impermanence/archive/c7f5b394397398c023000cf843986ee2571a1fd7.tar.gz",
+        "url": "https://github.com/nix-community/impermanence/archive/23c1f06316b67cb5dabdfe2973da3785cfe9c34a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
+    "nixos-mailserver": {
+        "branch": "nixos-24.05",
+        "repo": "git@gitlab.com:simple-nixos-mailserver/nixos-mailserver.git",
+        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
+        "type": "git"
+    },
     "nixpkgs": {
         "branch": "nixos-unstable",
         "description": "Nix Packages collection",
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
-        "sha256": "1b47065q41ar9585ra4akb4s4kjwcs3p3g4chrpps8704vz7nx0s",
+        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+        "sha256": "1ds3yjcy52l8d3rkxr3b7h9c0c3nly079bgakjaasnfjj3xprrwr",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/71e91c409d1e654808b2621f28a327acfdad8dc2.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/c3aa7b8938b17aebd2deecf7be0636000d62a2b9.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }