fixup! wip

2023-10-04 15:42:25 +02:00 · 2023-10-04 15:41:13 +02:00 · 2023-10-04 15:18:51 +02:00 · 2023-10-04 15:15:54 +02:00 · 2023-10-04 14:26:06 +02:00 · 2023-10-04 14:19:03 +02:00
272 changed files with 2850 additions and 4541 deletions
--- a/.envrc
+++ b/.envrc
@ -1,5 +1 @@
-# SPDX-FileCopyrightText: 2020-2021 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: CC0-1.0
-
 use flake
--- a/.git-crypt/.gitattributes
+++ b/.git-crypt/.gitattributes
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2020 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: CC0-1.0
-
 # Do not edit this file.  To specify the files to encrypt, create your own
 # .gitattributes file in the directory where your files are.
 * !filter !diff
--- a/.git-crypt/keys/default/0/D48A1ACAB1CDBD170151662BB1A0B4A45885A031.gpg
+++ b/.git-crypt/keys/default/0/D48A1ACAB1CDBD170151662BB1A0B4A45885A031.gpg
@ -1,5 +0,0 @@
-„^,w„ Έσ€@&µ<13>kϊ1 [P<>Λ^wύΗGXφ9Ήƒ„ΔόR΄mΩX~0<¨.Δ"$Α<>$φεW<CEB5><57>jΦψ¶BΧ®H+>€WΞ®2<C2AE>ψ&
-ΡΟ«d»ΊΊµe›ϊ„^ΉΎό|Α ΐ@<40>ν	<09>
bƒTπ’`<60>Ώpς¦ϊΨ<06>γ΅nπµη¤¶Ε*0<>θkσb
-Θ.X-θ[M@¦α7ΗκΉiδ¥>»ί<C2BB>DWΖω¥¦βmK‡γ<E280A1>gώt―ώκ·„^3 ΎTΗc@<40>ΝS5<53>0"<22>η+πBδ[[-!¥:/™ύϋEΦ°-90όW‘TΡq‡―Χζ=“Α»4{m$hTV2µ΄Ό+ΎΠo?c«TnZ©Χ<03>lJ!Τΐ	ρρƒ}:<3A>ll|<7C>ΔaιαΫ.U!B „…/~¶ΊΧ…ο<E280A6>Α¥/†6iW¬ki<06>ΆΦφ–ΧΚ)Ζ^M8<4D>τή<<3C>κ–™α‹Β%Τ<>GΓfφ+λ2gΑ3Ί΄V<CE84>
p†«IG|ΥlΈXB<58>$έ<>·lχ·«H!
-<EFBFBD>»λιKΔ‚Ω„©0Οƒ<CE9F>gκ•9
-qgk·<6B>ιCM―΄γσΥ'ΣvνΗ–h΄cNχZΝcό°gA”/R<>³‘vΕ$nι_Ο!Έ<>
!S<>
Vτ§fεIήΰ
--- a/.gitattributes
+++ b/.gitattributes
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2020-2021 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: CC0-1.0
-
 *.png filter=lfs diff=lfs merge=lfs -text
 *.jpg filter=lfs diff=lfs merge=lfs -text
 *.svg filter=lfs diff=lfs merge=lfs -text
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2020 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: CC0-1.0
-
 /*.qcow2
 /.pre-commit-config.yaml
 /result*
--- a/.reuse/dep5
+++ b/.reuse/dep5
@ -1,15 +0,0 @@
-# vim: set foldmethod=marker:
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: nixos-config
-Upstream-Contact: Simon Bruder <simon@sbruder.de>
-Source: https://git.sbruder.de/simon/nixos-config
-
-Files:
-       .git-crypt/keys/default/0/*.gpg
-       secrets.yaml
-       **/secrets.yaml
-       keys/*/*.asc
-       machines/*/secrets/*.nix
-       pkgs/contact-page/src/pubkey.asc
-Copyright: 2020-2024 Simon Bruder <simon@sbruder.de>
-License: CC0-1.0
--- a/.sops.yaml
+++ b/.sops.yaml
@ -1,110 +1,72 @@
-# SPDX-FileCopyrightText: 2021-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: CC0-1.0
-
 keys:
-  # sops does not (yet) support ADSKs,
-  # so all encryption subkeys have to be added manually
-  - &simon 6CD375BD0741F67E5A289BC333A01CBE0554C763 # offline
-  - &simon-alpha 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
-  - &simon-beta 403215E0F99D2582C7055C512C77841620B8F380
+  - &simon 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
  - &nunotaba 8C5091AEA213FB0642BD46F943EE19743FAC1D5C
-  - &hitagi 17FEEBB45E4245330507C960653378F10CA6E00A
+  - &sayuri 17FEEBB45E4245330507C960653378F10CA6E00A
  - &vueko 4EA330328CD0D3076E90960194DFA4953D8729DE
  - &fuuko 2372651C56E22972C2D9F3F569C8187C9C43754E
  - &mayushii 23EEDF49AAF1B41DCD1CD10F44A37FA8C15053B3
-  - &renge 06a917fc4a2a1b6b0f69a830285075cac85b7035
+  - &yuzuru F4B5F6971A1FAEA1216FCE1C6745A652A31186DB
+  - &renge FD4E1FB15DD0F36A77790229826C04C0BE319FA2
  - &nunotaba 3176be14f468c6d43ab2206b4f273abccd49806b
-  - &okarin e7370b48016c961ef8ad792fda66b19d845b3156
+  - &okarin 868497ac4266a4d137e0718ae5fc3caa3b8107aa
  - &shinobu 28677f2e3584b39f528a779caf445ebb39c882b7
-  - &nazuna 0b8be5d87a10a0e68dda97212c4befad1f9e915c
-  - &yuzuru a1ee5bc0249163a047440ef2649e770ec6ea16e4
 creation_rules:
  - path_regex: machines/nunotaba/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
-      - *simon-alpha
-      - *simon-beta
      - *nunotaba
-  - path_regex: machines/hitagi/secrets\.yaml$
+  - path_regex: machines/sayuri/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
-      - *simon-alpha
-      - *simon-beta
-      - *hitagi
+      - *sayuri
  - path_regex: machines/vueko/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
-      - *simon-alpha
-      - *simon-beta
      - *vueko
  - path_regex: machines/fuuko/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
-      - *simon-alpha
-      - *simon-beta
      - *fuuko
  - path_regex: machines/mayushii/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
-      - *simon-alpha
-      - *simon-beta
      - *mayushii
+  - path_regex: machines/yuzuru/secrets\.yaml$
+    key_groups:
+    - pgp:
+      - *simon
+      - *yuzuru
  - path_regex: machines/okarin/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
-      - *simon-alpha
-      - *simon-beta
      - *okarin
  - path_regex: machines/renge/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
-      - *simon-alpha
-      - *simon-beta
      - *renge
  - path_regex: machines/nunotaba/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
-      - *simon-alpha
-      - *simon-beta
      - *nunotaba
  - path_regex: machines/shinobu/secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
-      - *simon-alpha
-      - *simon-beta
      - *shinobu
-  - path_regex: machines/nazuna/secrets\.yaml$
-    key_groups:
-    - pgp:
-      - *simon
-      - *simon-alpha
-      - *simon-beta
-      - *nazuna
-  - path_regex: machines/yuzuru/secrets\.yaml$
-    key_groups:
-    - pgp:
-      - *simon
-      - *simon-alpha
-      - *simon-beta
-      - *yuzuru
  - path_regex: secrets\.yaml$
    key_groups:
    - pgp:
      - *simon
-      - *simon-alpha
-      - *simon-beta
      - *nunotaba
-      - *hitagi
+      - *sayuri
      - *vueko
      - *fuuko
      - *mayushii
--- a/19
+++ b/19
@ -0,0 +1,19 @@
+Copyright 2020 Simon Bruder
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/LICENSES/AGPL-3.0-or-later.txt
+++ b/LICENSES/AGPL-3.0-or-later.txt
@ -1,235 +0,0 @@
-GNU AFFERO GENERAL PUBLIC LICENSE
-Version 3, 19 November 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-                            Preamble
-
-The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software.
-
-The licenses for most software and other practical works are designed to take away your freedom to share and change the works.  By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users.
-
-When we speak of free software, we are referring to freedom, not price.  Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
-
-Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software.
-
-A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate.  Many developers of free software are heartened and encouraged by the resulting cooperation.  However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public.
-
-The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community.  It requires the operator of a network server to provide the source code of the modified version running there to the users of that server.  Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version.
-
-An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals.  This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license.
-
-The precise terms and conditions for copying, distribution and modification follow.
-
-                       TERMS AND CONDITIONS
-
-0. Definitions.
-
-"This License" refers to version 3 of the GNU Affero General Public License.
-
-"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
-
-"The Program" refers to any copyrightable work licensed under this License.  Each licensee is addressed as "you".  "Licensees" and "recipients" may be individuals or organizations.
-
-To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy.  The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work.
-
-A "covered work" means either the unmodified Program or a work based on the Program.
-
-To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy.  Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
-
-To "convey" a work means any kind of propagation that enables other parties to make or receive copies.  Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License.  If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
-
-1. Source Code.
-The "source code" for a work means the preferred form of the work for making modifications to it.  "Object code" means any non-source form of a work.
-
-A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
-
-The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form.  A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
-
-The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities.  However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work.  For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
-
-The Corresponding Source for a work in source code form is that same work.
-
-2. Basic Permissions.
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met.  This License explicitly affirms your unlimited permission to run the unmodified Program.  The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work.  This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force.  You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright.  Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the conditions stated below.  Sublicensing is not allowed; section 10 makes it unnecessary.
-
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
-
-When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
-
-4. Conveying Verbatim Copies.
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
-
-5. Conveying Modified Source Versions.
-You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7.  This requirement modifies the requirement in section 4 to "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy.  This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged.  This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-
-A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit.  Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
-
-6. Conveying Non-Source Forms.
-You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source.  This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
-
-    d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge.  You need not require recipients to copy the Corresponding Source along with the object code.  If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source.  Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling.  In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage.  For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product.  A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
-
-"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source.  The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information.  But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
-
-The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed.  Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
-
-Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
-
-7. Additional Terms.
-"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law.  If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it.  (Additional permissions may be written to require their own removal in certain cases when you modify the work.)  You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
-
-All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10.  If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term.  If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
-
-8. Termination.
-
-You may not propagate or modify a covered work except as expressly provided under this License.  Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
-
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
-
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License.  If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
-
-9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or run a copy of the Program.  Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance.  However, nothing other than this License grants you permission to propagate or modify any covered work.  These actions infringe copyright if you do not accept this License.  Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
-
-10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License.  You are not responsible for enforcing compliance by third parties with this License.
-
-An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations.  If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License.  For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-
-11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based.  The work thus licensed is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version.  For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement).  To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
-
-A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License.  You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-
-12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License.  If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-
-13. Remote Network Interaction; Use with the GNU General Public License.
-
-Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software.  This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph.
-
-Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work.  The terms of this License will continue to apply to the part which is the covered work, but the work with which it is combined will remain governed by version 3 of the GNU General Public License.
-
-14. Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time.  Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation.  If the Program does not specify a version number of the GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
-
-Later license versions may give you additional or different permissions.  However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
-
-15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
-
-END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program.  It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
-
-     <one line to give the program's name and a brief idea of what it does.>
-     Copyright (C) <year>  <name of author>
-
-     This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source.  For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code.  There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements.
-
-You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see <http://www.gnu.org/licenses/>.
--- a/LICENSES/Apache-2.0.txt
+++ b/LICENSES/Apache-2.0.txt
@ -1,73 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--- a/LICENSES/CC-BY-SA-4.0.txt
+++ b/LICENSES/CC-BY-SA-4.0.txt
@ -1,170 +0,0 @@
-Creative Commons Attribution-ShareAlike 4.0 International
-
- Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
-
-Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors.
-
-Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described.
-
-Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public.
-
-Creative Commons Attribution-ShareAlike 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
-
-Section 1 – Definitions.
-
-     a.	Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
-
-     b.	Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
-
-     c.	BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License.
-
-     d.	Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
-
-     e.	Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
-
-     f.	Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
-
-     g.	License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
-
-     h.	Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
-
-     i.	Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
-
-     j.	Licensor means the individual(s) or entity(ies) granting rights under this Public License.
-
-     k.	Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
-
-     l.	Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
-
-     m.	You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
-
-Section 2 – Scope.
-
-     a.	License grant.
-
-          1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
-
-               A. reproduce and Share the Licensed Material, in whole or in part; and
-
-               B. produce, reproduce, and Share Adapted Material.
-
-          2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
-
-          3. Term. The term of this Public License is specified in Section 6(a).
-
-          4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
-
-          5. Downstream recipients.
-
-               A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
-
-               B. Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
-
-               C. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
-
-          6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
-
-     b.	Other rights.
-
-          1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
-
-          2. Patent and trademark rights are not licensed under this Public License.
-
-          3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
-
-Section 3 – License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the following conditions.
-
-     a.	Attribution.
-
-          1. If You Share the Licensed Material (including in modified form), You must:
-
-               A. retain the following if it is supplied by the Licensor with the Licensed Material:
-
-                    i.	identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
-
-                    ii.	a copyright notice;
-
-                    iii. a notice that refers to this Public License;
-
-                    iv.	a notice that refers to the disclaimer of warranties;
-
-                    v.	a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
-
-               B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
-
-               C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
-
-          2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
-
-          3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
-
-     b.	ShareAlike.In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
-
-          1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
-
-          2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
-
-          3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
-
-Section 4 – Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
-
-     a.	for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
-
-     b.	if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
-
-     c.	You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
-For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-
-Section 5 – Disclaimer of Warranties and Limitation of Liability.
-
-     a.	Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
-
-     b.	To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
-
-     c.	The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
-
-Section 6 – Term and Termination.
-
-     a.	This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
-
-     b.	Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
-
-          1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
-
-          2. upon express reinstatement by the Licensor.
-
-     c.	For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-
-     d.	For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
-
-     e.	Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
-
-Section 7 – Other Terms and Conditions.
-
-     a.	The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
-
-     b.	Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
-
-Section 8 – Interpretation.
-
-     a.	For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
-
-     b.	To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
-
-     c.	No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
-
-     d.	Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
-
-Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
--- a/LICENSES/CC0-1.0.txt
+++ b/LICENSES/CC0-1.0.txt
@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.
--- a/LICENSES/ISC.txt
+++ b/LICENSES/ISC.txt
@ -1,8 +0,0 @@
-ISC License:
-
-Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
-Copyright (c) 1995-2003 by Internet Software Consortium
-
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/LICENSES/MIT.txt
+++ b/LICENSES/MIT.txt
@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2020-2024 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
 # NixOS configuration

 ## Structure
@ -63,8 +57,8 @@ On MBR:
    parted /dev/sdX
      mktable GPT
      mkpart primary 1MiB 2MiB
-      mkpart primary 2MiB 512MiB
-      mkpart primary 512MiB 100%
+      mkpart primary 2MiB 500MiB
+      mkpart primary 500MiB 100%
      set 1 bios_grub on
      disk_toggle pmbr_boot
      quit
@ -128,25 +122,8 @@ Reboot.

 ## License

-This repository is [REUSE](https://reuse.software/) compliant.
-To get the most correct licensing information,
-please consult the [REUSE specification](https://reuse.software/spec/)
-or use a tool that parses it.
-
-As a rule of thumb,
-most code files are released under the `AGPL-3.0-or-later`,
-most generated files are specified as `CC0-1.0` (as they are not copyrightable)
-and small independent scripts are licensed under `Apache-2.0`.
-However, there are deviations from this,
-so always consult the file header and other resources as specified in the REUSE specification.
-
-Please note that those licensing terms only apply to the source files in this repository,
-not any build outputs, like system or package closures.
-They might be licensed differently, depending on their source.
-
-If you think you have a compelling reason
-why you should be able to use part of this repository under a more permissive license,
-please contact me,
-so we can figure something out.
-Please note, that I can only offer this for files that are solely authored by me,
-as I do not own the rights to other people’s code.
+Unless otherwise noted in the specific files or directories,
+the files in this repository are licensed under the [MIT License](LICENSE).
+This only applies to the nix expressions, not the built system or package closures.
+Patches may also be licensed differently,
+since they may be derivative works of the packages to which they apply.
--- a/flake.lock
+++ b/flake.lock
@ -10,11 +10,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1701527050,
-        "narHash": "sha256-EphJZX+rhnzUUladmeXvmYHILftHLV5i1sD18pGbxHY=",
+        "lastModified": 1627835028,
+        "narHash": "sha256-LHTdNog+0EmRn+4DIz451vvQ2EeC8KwyV3/8JpX9yiw=",
        "ref": "refs/heads/master",
-        "rev": "a06c68c44862f74757a203e2df41ea83c33722d9",
-        "revCount": 54,
+        "rev": "7fc3d5019c907566abbad8f84ba9555a5786bd01",
+        "revCount": 52,
        "type": "git",
        "url": "https://git.sbruder.de/simon/bangs"
      },
@ -26,11 +26,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
        "type": "github"
      },
      "original": {
@ -44,11 +44,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
        "type": "github"
      },
      "original": {
@ -65,11 +65,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "lastModified": 1660459072,
+        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
        "owner": "hercules-ci",
        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
        "type": "github"
      },
      "original": {
@ -85,16 +85,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1712386041,
-        "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
+        "lastModified": 1695108154,
+        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
+        "rev": "07682fff75d41f18327a871088d20af2710d4744",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-23.05",
        "repo": "home-manager",
        "type": "github"
      }
@ -106,11 +106,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1712989663,
-        "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=",
+        "lastModified": 1695984718,
+        "narHash": "sha256-LQwKgaaaFOkIcxarf0xQXeDJFwZ5BZWcgmPeo3xp2CM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0",
+        "rev": "4f02e35f9d150573e1a710afa338846c2f6d850c",
        "type": "github"
      },
      "original": {
@ -167,11 +167,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1698420672,
-        "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
+        "lastModified": 1655042882,
+        "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=",
        "owner": "nmattia",
        "repo": "naersk",
-        "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
+        "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f",
        "type": "github"
      },
      "original": {
@ -189,11 +189,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1698974481,
-        "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=",
+        "lastModified": 1688870561,
+        "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=",
        "owner": "nix-community",
        "repo": "nix-github-actions",
-        "rev": "4bb5e752616262457bc7ca5882192a564c0472d2",
+        "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301",
        "type": "github"
      },
      "original": {
@ -215,11 +215,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1712897695,
-        "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
+        "lastModified": 1695576016,
+        "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
+        "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0",
        "type": "github"
      },
      "original": {
@ -231,11 +231,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1712909959,
-        "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
+        "lastModified": 1695887975,
+        "narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
+        "rev": "adcfd6aa860d1d129055039696bc457af7d50d0e",
        "type": "github"
      },
      "original": {
@ -247,16 +247,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1712741485,
-        "narHash": "sha256-bCs0+MSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4=",
+        "lastModified": 1695825837,
+        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72",
+        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-23.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -275,11 +275,11 @@
        "poetry2nix": "poetry2nix"
      },
      "locked": {
-        "lastModified": 1712934106,
-        "narHash": "sha256-JubHgaV6HUZarwwq4y2rxJaaj2a6euErJfCqpmhrhWk=",
+        "lastModified": 1696421393,
+        "narHash": "sha256-GarjKZ00NVXDgQZocnWvyhTWRm1LYZuZuJ4gEva+GGs=",
        "ref": "refs/heads/master",
-        "rev": "2bcb2b6c7b0e04f4ef8e51e00fd93a5e5cb00bf8",
-        "revCount": 66,
+        "rev": "c8a17806a75733dec2ecdd8f0021c70d1f9dfc43",
+        "revCount": 62,
        "type": "git",
        "url": "https://git.sbruder.de/simon/nixpkgs-overlay"
      },
@ -290,43 +290,43 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1710695816,
-        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
+        "lastModified": 1685801374,
+        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
+        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-23.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1712437997,
-        "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
+        "lastModified": 1694908564,
+        "narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
+        "rev": "596611941a74be176b98aeba9328aa9d01b8b322",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-23.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1712791164,
-        "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
+        "lastModified": 1695830400,
+        "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
+        "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
        "type": "github"
      },
      "original": {
@ -338,11 +338,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1703438236,
-        "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=",
+        "lastModified": 1657802959,
+        "narHash": "sha256-9+JWARSdlL8KiH3ymnKDXltE1vM+/WEJ78F5B1kjXys=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b",
+        "rev": "4a01ca36d6bfc133bc617e661916a81327c9bbc8",
        "type": "github"
      },
      "original": {
@ -362,11 +362,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1703801091,
-        "narHash": "sha256-ay1oI2IxhODG4KheqdxqlHlt6bUmvAogRZbzIcavR+k=",
+        "lastModified": 1657992602,
+        "narHash": "sha256-bFAR4Rvi/MWlvdtYZhCtRY6zDFjThA0QCthUqbaHjsE=",
        "ref": "refs/heads/master",
-        "rev": "9bddae5f112cdc471faf1a71d34bc4cc2497e946",
-        "revCount": 16,
+        "rev": "1b3435ec8615300fd81e96045ca7596e0f5a23f0",
+        "revCount": 14,
        "type": "git",
        "url": "https://git.sbruder.de/simon/password-hash-self-service"
      },
@ -385,16 +385,14 @@
        "nixpkgs": [
          "nixpkgs-overlay",
          "nixpkgs"
-        ],
-        "systems": "systems_2",
-        "treefmt-nix": "treefmt-nix"
+        ]
      },
      "locked": {
-        "lastModified": 1701399357,
-        "narHash": "sha256-QSGP2J73HQ4gF5yh+MnClv2KUKzcpTmikdmV8ULfq2E=",
+        "lastModified": 1695386222,
+        "narHash": "sha256-5lgnhCCGW0NH5+m5iTED8u6NSSM/dbH9LBPvX0x0XXg=",
        "owner": "nix-community",
        "repo": "poetry2nix",
-        "rev": "7acb78166a659d6afe9b043bb6fe5cb5e86bb75e",
+        "rev": "093383b3d7fdd36846a7d84e128ca11865800538",
        "type": "github"
      },
      "original": {
@ -432,11 +430,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1703729606,
-        "narHash": "sha256-5QlUMNPKv++mWlS2r3F8bffoSBHXq1qHg+V5mnfSixg=",
+        "lastModified": 1657939629,
+        "narHash": "sha256-8lX/pZNetbLCN2cW/O+vUz1rG8ig4RaVX5PWe5m4VLA=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "347789ef125df15b685e8295364ad8ed331fef94",
+        "rev": "2cd36d4aef875867ee1d7963541ccb3ae50b358c",
        "type": "github"
      },
      "original": {
@ -453,11 +451,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1712617241,
-        "narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=",
+        "lastModified": 1695284550,
+        "narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c",
+        "rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78",
        "type": "github"
      },
      "original": {
@ -480,42 +478,6 @@
        "repo": "default",
        "type": "github"
      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "id": "systems",
-        "type": "indirect"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-overlay",
-          "poetry2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1699786194,
-        "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.lock.license
+++ b/flake.lock.license
@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2021-2024 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: CC0-1.0
--- a/flake.nix
+++ b/flake.nix
@ -1,17 +1,13 @@
-# SPDX-FileCopyrightText: 2021-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 {
  description = "NixOS system configuration";

  inputs = {
    flake-utils.url = "github:numtide/flake-utils";

-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

-    home-manager.url = "github:nix-community/home-manager/release-23.11";
+    home-manager.url = "github:nix-community/home-manager/release-23.05";
    home-manager.inputs.nixpkgs.follows = "nixpkgs";
    home-manager-unstable.url = "github:nix-community/home-manager";
    home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
@ -67,13 +63,6 @@
              black.enable = true;
              nixpkgs-fmt.enable = true;
              shellcheck.enable = true;
-
-              reuse = {
-                enable = true;
-                name = "reuse";
-                entry = "reuse lint";
-                pass_filenames = false;
-              };
            };
          };
        };
@ -175,7 +164,6 @@
          buildInputs = (with pkgs; [
            black
            nixpkgs-fmt
-            reuse
            shellcheck
            sops
            ssh-to-pgp
--- a/keys/machines/nazuna.asc
+++ b/keys/machines/nazuna.asc
@ -1,28 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-xsFNBAAAAAABEACFObg8AdI3RPFxyl/K0tm3W9jkufQcYk/LwLP1Z2xb38EJZLUy
-YEJzdZaJei6HY9rMM8tQjgCzFi7OzTVqw5I1NAs0LGGlVKv/mjuQV99SKtB8ujFF
-VcuGBVDLGOx8+6sW63YojMJ6O7eMaKQhO2zSdzsVO0BqYyAy2niJz2gpOknnITB0
-zsj/uliLSgtPyo3zTt+tDD3oPAFFm09G9QNIXiyFBSL8h4pGBiHwSL7VC9JWM7rt
-BRB921LtlOt7W8hr29THuRP05tZJAwbN/W3NnLhOxpBXEHrcPe4Yt2Cz+xbLhn27
-h5sw4XcEqewkzLXwbB/CzB3FY97mL3ekoWXS+LZFBtkWx2d00+BVFZe+qTA8bRjO
-AEO7HUUw4U9fOwTpQLMqH53FAEB5zDAT67CTXsLW921URHlPTVkm+G1Yy3S2k03H
-6erBc0xBHqClnFCm86TZqceebEeqV2PUk/b2oBy2uSoFccI9Da9/dn83ryJD1c3U
-V9pfq5oOf77F3Z428Ds6SaWeQb6SY7zbHfu9SNnOxau9NiCJoRXfGp5LUCFhSLm0
-2Oc5tk+w2fMpP27XFccI1nSaAEnSUIb5o8ZHsxILIr/0JMGvxHfoWyiNhYu4mZEZ
-Mlfl+GmIONGhEz897KboCYlks5X0Klp2eH/lfgx9ECSHXMnE2kD9GFnX6wARAQAB
-zSlyb290IChJbXBvcnRlZCBmcm9tIFNTSCkgPHJvb3RAbG9jYWxob3N0PsLBYgQT
-AQgAFgUCAAAAAAkQLEvvrR+ekVwCGw8CGQEAADz7EAAC36CJfCApYkrLYSY59XUn
-tr7Jdl+tFjeYlu1+s/Rm7VgwGV70KfYPJw3nmETTcXK6g91mdVMsf9kUxDN4jYsn
-yvRSXRpiqOS0NSYbYgeM9n5uSKIfbCC30UcAmH7iUL/eIjmPe8x8PhsstkuZ9nU3
-OjAQh1mStUs0MELJMLzhY4PRXwOHFHRHvHJr5Ufcm1SOVbiJlDShJp+jAJTSftVc
-miwsA6jmM9GR96OskaN058yujzpQA29858/61qMZuyqflKIYW7ti2dHm4WCew5uN
-gPmmqUOJNkFavEgtEWLyTARqPb1Q3ptdjePDP07dOxoweB/1XkXauGk81I6cJgJF
-WTnZ7+LhqIj9qyQUPHQzb3iWMxWmSM+XFWbuYFTkbIcZNqWwV2kdqr2dl0Hmur9k
-WdYGNApGIhaFtMb2iSmz78kMwy/Jhz9i4XhAvAdG3xHxtr3FjJw8DM7iQl76gdJw
-fEaM5hLk9M0aZSPKZhxnCBtWgAqw+Wa6aXv6sDw5Y+EY+dW7TAEVEpBrLikO+43D
-yzlS7Q8+SZD73O14taPKCGa9H050QHB4R9FNrKBg92Z+W8WBnoxYI5Oefdcgw3sj
-qp57wibrJRyf+SmNY1vD/PIYM3dIMnIWsXYTS3/AwhZ9KIl1x2jD+LorMK+MBCub
-L72+WUfElaj3SjHJ12Cm1A==
-=Fu4f
-----END PGP PUBLIC KEY BLOCK-----
--- a/keys/machines/okarin.asc
+++ b/keys/machines/okarin.asc
@ -1,28 +1,28 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-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
+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
-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
-NxR1Jvm5bnGfUcnNlzoB4Q==
-=6o0h
+AQgAFgUCAAAAAAkQ5fw8qjuBB6oCGw8CGQEAAOyUEAAHW0hbAjCKylnIaezMqNiG
+yDwfM+MpNXaqB4sG0UUiIdgSUTk06PN5dlQ0Jfvh1I7P9y8CxqamlqCUXiqqWEOR
+Am3Q7oxQKQdSDz//2ijWLdNFcT7bxZvNKQ/T78UYka/qmuLHx2jSuakAX2pAUrOf
+K7mbElSu8LD0y8hIDEyxuzB/aL13sHh1LkOUCSEgZ977EEfIEgPidPwEtGJvEbhN
+DaP94cLNapv/lWux8+O5dzKi4R7ghXl6IvrP2LPXQSPF7C3mMZ1ZSX1nFxRjALXi
+xiFbrJFkwEQQmVro/3wX9BZSmt6VnFRKkXnsCLlf9eT0aTmTirtqHgfet0PHqTNt
+CxrlLKTZFN3ZFropGZ070ESs4i6WZUBpTdsYh/htyo5bWMcHO8J+K+Ttd1M8btM4
+RtpAc/2UXa4+dVpLOGqdqkmUEJLVLyGnj9wZZgkx3tWGhjnSohCW3YqffQYlXUFn
+xuiQQ8jKM6luuunMXLt6D9dzOch70z9bnjOm1Z6q/S3PIzn++awzA6N3VTKNuUBP
+Phs6hlcAeqdQ6Q2EiS5iXKqPdK1nd9cPKzHOJf1fwlaRPSKeCtXUgkjAClu+heEn
+rst1nggIhCBs+rHc518BVZvISLNVlj5LVwN0mKOk9YPuZItBCGX96WWJZdMHeZk0
+MsxjN+we2woCXG5SJGYOyA==
+=UTw1
 -----END PGP PUBLIC KEY BLOCK-----
--- a/keys/machines/renge.asc
+++ b/keys/machines/renge.asc
@ -1,28 +1,22 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-xsFNBAAAAAABEADPaPgumFF1TIRuWYWYbmhjCHmC/U5RzT2ymWwqwxaBsR+sZhHq
-4SMGqSYPoU21qEvJCYCHlJl/2CAaqToGVBnp7QTIb4EG9PyVnJIxNWgDAgIStCmq
-My7WJf+TXs4WLadFrT1g/qnR5kO261nKhF6/Us+q+GxEI7w9B+qywL95FkuhggRO
-qo1cMJwNNOuybnmXmwkWHx04JMB48m59kwTfOrVkNoM+H3zmairuM4pQdFhlYvnY
-UhdYzjv4joyBHWJb2j+QE6QcFDVcQMpvxQV0P7BztPEizSrzcDaNjxxOp38mMY0U
-ca8B0nNc/eZfse7f8bU7pb/JCzbRiQnNKGyi5PbyAi/rZoUAt5d4Qa9zwIQvDTo2
-8J6omiNIjuD7E1Y4HXsdjF9iYUU1iDodL36znZdc/mp7baBNrweXYjrLEsx1+ghY
-9Mj9yBk/lgcfXy9hL35QsguRHOaD4OnhdkD/V+kzrVTgI9pLO3XCjWHtdR2rumjb
-O4I8I7ZMNiTzqXfzlGxgNK1wvLSKDIIROn9xJenxe7BX+pkm4NHHF6qESVUrnkgP
-O6P/ClduwYhMDrbM24tcKJuBFWpBBRW0djdhSOL4inu0UL5roWb3pvPhctJk7pVK
-N+zd8LeVelJRNnN4y2SPx6m5ASIHjkVp74S8LfbuFI1EhrJEoe9IzWsZtQARAQAB
-zSlyb290IChJbXBvcnRlZCBmcm9tIFNTSCkgPHJvb3RAbG9jYWxob3N0PsLBYgQT
-AQgAFgUCAAAAAAkQKFB1yshbcDUCGw8CGQEAALl9EACCvN/6gqcq6kFi4BeinyoE
-BFCYt4kdLPw17yyMXSMBY+wdy8tp1z0Fe97wIVU/zYoHQYks8r4P890kNHj8QftI
-rQ9zXrJvzAzYGfE0EfIARSZY5dH9LT/qi0pGadNJ+5ru33cKtTEHDXwyI4sF/0a8
-GmNtUH1Wd+EFIbi6C4s9BEjuin2dhJrqUvthwj++Exy2jk4RXk1PTDhwDPmrGfvr
-TnA8kjppP23ytVbAflE9mEOKMx7lEatsgtZsnzxqW4eF7/xuIVOOJdkTFvKGV0No
-I1q83EwfkSZioSncH3SFSEL3GN1yCXG7KLFbYawzTIabEozSmi16A1C4VVtOLeIB
-++MdypKMArLGReun0P5t+KCUmjqfkfOltXgfjIlTKy6/9ZiIyuueLstJG0L2aByQ
-s4WLkDgnqBfpd+t5KsIkwL9bC20myccoKr1+GH48RRxP6fmujh+Dzq9rhwWA4X0E
-CQD6qldQPQqQsO4LdNCmNgrElME27HceoYMxKiwUvcnL76kcAddkJIh96NMFu+Bv
-457ekx/CLR/LZW3HVg7nie+VcrHFwPvItLlosciARgOwUmJ5hIvqWATuBJs81Q+O
-edNZDIQ31dhdm5ThVF8+fWX1xpdtegHkY1UeoYqlPktkakpIjoHtMMSnQueL+U7k
-C2y+adnVye+TTy0KfsIsLg==
-=kq4d
+xsDNBAAAAAABDAC3Us97TCrINyQguwEoA6YIF4jWaT1dSzg3BDnkN/g5q9EO5sLm
+v9EQolXWaZA6D7Jc/o7cYlv0cLX6fekMs06NgVfDEq0OMhMlPpA73jt5vkf1izgX
+7tLDt2K3UFFSdzdtuIQ6yPnX/UdCuitzOaLqNrAOu3gRlfRHJKrKlQ5RcW059A3Y
+UHAWlwc5++bni0GRYrdPLVra0iArwf7UEEzFNtOWMFLwYNuJWUoGPdArVZlP1Xr+
+yTg99ba+aUSE70CAtV78yXvmySGXX1qpMu3NZ6FgOzT7WwAO+VaZtSZQopyJRgSZ
+2m4t6f1TjOabjxhbjaqhsBZ0I9xkCHklQ4hpnjR1cMuZSXrQXKiRmU3stwsRDh8n
+X35TA5BzLg0duKfCDCOih9tEDVpAJqc6YcfQEnknX0sDGTKNoNRncAr54i6c/smj
+cqAN0pgGI2poy9nKY4n2eTDv60NBH7Xu98REz8fwj6VEPRA9/IzOZVWouShXkmYZ
+BYxp+foOniLc/+8AEQEAAc0pcm9vdCAoSW1wb3J0ZWQgZnJvbSBTU0gpIDxyb290
+QGxvY2FsaG9zdD7CwOIEEwEIABYFAgAAAAAJEIJsBMC+MZ+iAhsPAhkBAABu0gwA
+U506lcB0MSDmtY1fpGTtTNAGYFvX4gltnRK0RWgjBlSsM2lFHIJffBWrlDjAQz3H
+GITZf5OkohrAMYGQ5+i7c5Q+Z4BZA8bVSSFd+B88riBGSW+OQHgrNBacS0grmlIX
+fRlT3Y5FbQRMz2umXQkafzCBTME01CZ6CGQNtT6WfaSj7iDwTLqDY762EuN5j3RB
+TRs26zYfTUiJ6qkSS8wxzVTRcpgt9RNzfjDciL2zGt8hk2wBAvfGZwtbmj6m20nJ
+gEVoygwabnXRhvv4NjfuNvUVMU3jJ+EZ9zffSxMCHANeECT31RlkOWmnqBU87/hV
+11eKxX7oIVvl9ItAIhQ52I1SyuXFAyTp8kRo+q1zlRxM3gAj3z9XCnqJmjqXioK4
+Zm7n+lQNZ9HPTnVWMwckESwPRlySPxhrCBioC2OYKi01k8P8Y91IS36Yf5h68Xbs
+LlLsG1jMhiuNPbyuL4YHM5VHf/4QGofmoq7z+kxmCJcrRXMPSQX445tw24XdbW3G
+=ATyf
 -----END PGP PUBLIC KEY BLOCK-----
--- a/keys/machines/sayuri.asc
+++ b/keys/machines/sayuri.asc
--- a/keys/machines/yuzuru.asc
+++ b/keys/machines/yuzuru.asc
@ -1,28 +1,28 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-xsFNBAAAAAABEACrSqXAEWHXWjyl/FX+r6d0WQmn7/40slxrnBQzl5ERnEOKtzR5
-hMPioWhfFFKeNbTxYp6tV6mbiIm7NKSCOC0o1lkt16Sb8SU3Tzi8uF4gCl6gxmwW
-iHG4k5CYij/jMw3YMX9NEpCVPjita/FXVxrN2aq96cMEgf7kQU9Bs+VmN2nlGCl0
-ATI4tZyJrxjO2okWEfsK3OT0qhqsQrQdsv8QhsG455pv1tmhvgwDY22swORQbBYC
-4Jgp2mtPX/LPXzr3cxnG3hz+d/A9tDtZK9t/uEc1sMMSEws6FiKofVNL00KTvx5/
-1N5PPEACovBmGx17KLYZVo0pNDvIzPvp7UdZ3gbdoK7KvRPzzJ8EdSB/IPP2883w
-bAplPpP6aGkYog3bPsp9o9t5il5hm5ASlKchKZjUp5Mes6sRrnSAnq5zJGpE3bMz
-0NnbcOcuRBNF/cie0eX2XpL4ooI+OTUC0cUa/nnmvRbvH9INVydAhiJmzxhduLvz
-586SzGRoHG1FNumT/I+jQDXgb2hIpZy4keDzsBlfuOCixjKyJPKf39hCbKbiNyed
-R+e8EqqqSwKBdN6neha5o0NPldQRp9BV+uSaVtr6NwmG6nRKMg5QSuxuab0qckwG
-3C33xjBFvodVoYLKTgvYR2qw8QFgI33MKrctQsUW4od1w5rfPVsWTsboowARAQAB
+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
-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
-GjYdNSdHdZaTkT/4WjVD4A==
-=5kkr
+AQgAFgUCAAAAAAkQZ0WmUqMRhtsCGw8CGQEAAIyAEAA89dyQvXx4sS7I1nRlMw9q
+Agbi4h1lrCifEH6srlInbg3kZNgnlsDY+cVCIiy8m/Oyupn0U4uduMI8P7R5kgWQ
+g9+FKFXoLK8P1kO5gani+tWNmBW49leSN8un9YAviKele5wDM/Dg+rNbWDaYHKu5
+SspZV/SiP0JkxXOgxkMgOOl97kNmvv6O3qYHPG5rz5P/YV0pdDSi1cfhdREvTPAl
+eNqzMrdEuE/GUrYJYeF8kN+TswBubTgy4WBqQdMlS+Go1B/7HQd56pl5BHiHM8HZ
+l01ljbgqdYdggmXt7CI90Txe3RRduzKS4ncEQ1VVQiXEmOzU7emu+DFwknGnSgTW
+gW6Nps3u2XhcsJNczf2PdEzDAv0oNAp4So7JdTGetkJ1Yw4quS0l1XWWBm+cf376
+nanAGkENvuBbS36kgHNjNT1EnUnyJoMDMnc1AmSSlTf/ORc+JrzM4PtMonhWJTAU
+eM66tozyJ3qYWApiI2doYwMDuh/u3jvqpTddxklaNFUOxIA2VITP0EgCFkVjW2u3
+0gPY2tV6AtcxcUn1NnhS92xf0//O4fcGOwlTvNaPqDuF0mk9OazAPQ5L37mfNZzb
+XUc3AyZXRZNhlE+aNfeJSKtzFCpGUJfstPmkdOwPxK29G4GDbjzWevpYF9Rv6Xpq
+Ky38rXnis6Hpih/z6/7HOg==
+=5Ki8
 -----END PGP PUBLIC KEY BLOCK-----
--- a/keys/users/simon.asc
+++ b/keys/users/simon.asc
@ -1,43 +1,52 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-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
-H6R7fxacajUC
-=361S
+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
+R7VFGCA=
+=7eg7
 -----END PGP PUBLIC KEY BLOCK-----
--- a/machines/default.nix
+++ b/machines/default.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { ... }@inputs:
 let
  hardware = inputs.nixos-hardware.nixosModules;
@ -33,7 +29,7 @@ in
      hardware.common-pc-ssd
    ];

-    targetHost = "fuuko.lan.shinonome-lab.de";
+    targetHost = "fuuko.home.sbruder.de";
  };
  mayushii = {
    system = "x86_64-linux";
@ -45,7 +41,7 @@ in
    ];
  };
  renge = {
-    system = "aarch64-linux";
+    system = "x86_64-linux";
    extraModules = [
      "${inputs.infinisilSystem}/config/new-modules/murmur.nix"
    ];
@ -55,7 +51,7 @@ in
  okarin = {
    system = "x86_64-linux";

-    targetHost = "okarin.sbruder.de";
+    targetHost = "okarin.sbruder.xyz";
  };
  shinobu = {
    system = "x86_64-linux";
@ -64,16 +60,11 @@ in
      hardware.common-pc-ssd
    ];

-    targetHost = "shinobu.lan.shinonome-lab.de";
+    targetHost = "shinobu.home.sbruder.de";
  };
  nazuna = {
    system = "x86_64-linux";

    targetHost = "nazuna.sbruder.de";
  };
-  yuzuru = {
-    system = "x86_64-linux";
-
-    targetHost = "yuzuru.sbruder.de";
-  };
 }
--- a/machines/fuuko/README.md
+++ b/machines/fuuko/README.md
@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
 # fuuko

 ## Hardware
--- a/machines/fuuko/configuration.nix
+++ b/machines/fuuko/configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, pkgs, ... }:
 {
  imports = [
@ -21,7 +17,7 @@
    nginx.hardening.enable = true;
    restic.system = {
      enable = true;
-      qos = true;
+      uploadLimit = 1500;
      extraPaths = [
        "/data"
      ];
@ -33,12 +29,18 @@
        "/data/media/video"
        "/data/torrent"
      ];
+      prune = true;
    };
    unfree.allowSoftware = true;
  };

  services.nginx = {
    enable = true;
+
+    recommendedGzipSettings = true;
+    recommendedOptimisation = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
  };
  networking.firewall.allowedTCPPorts = [ 80 443 ];
  systemd.services.nginx.serviceConfig.SupplementaryGroups = lib.singleton "keys";
--- a/machines/fuuko/hardware-configuration.nix
+++ b/machines/fuuko/hardware-configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, modulesPath, pkgs, ... }:

 {
--- a/machines/fuuko/secrets.yaml
+++ b/machines/fuuko/secrets.yaml
@ -1,3 +1,4 @@
+restic-ssh-key: ENC[AES256_GCM,data:wA7JCg6Y900s6+1JoevMzbr6fKRN6jbfUuX166VS+TUFhFbn0npz5gKkAQpC8h1io1WaSCPJkJMzr+viOLlnVwqe8zFGm3ZJlKSEqKKK+CatZ95+zKACOZuBAC/2E6rep6JnL/C3/gKMKibVmAL+9TkTX6nA83xwhM65JPLN/+bP29bq0Cr2FopgZgNPQjb6ANB4POy+MUktet63DZ4dJwKvndiCRg4EMLIOqFopbQei6Pxc1F/lC3yBu71YgB4TSGQp/6tXjfFOuXQpI0nFrZCmLYcW03ZqOBQbKg3w4rwlqtnl25/23jpT0kqWp99wHUGMCib5+iywPUMSNDwAsz0fq04JGpTEM9cuxkLWZVfCpguNlgaiwCObyJkA2CHXlIn6KYsDOa6U/Uy9mNRPae52j/E+JdLQycOwT5+n78j0vqtvS69blUC/E7j2IWe17SI8JVCiYFbZXPqVm43jdEiQ9jU4gXMsu6NKppnBhFSrMVUHScS3gR/xnTfrabrr2FWJwIOjdGdJb4pr+nfZ,iv:ow+hzt5YGGD0FDvN+XkZtW74k4mwW+6HqWZMtOwAWDg=,tag:HXogIkcSTq6Ep4M2MXEMew==,type:str]
 wg-home-private-key: ENC[AES256_GCM,data:6l3CgB4qCsPuyYOWuwU2vNiEeC0D1wl6yZvXGGYVsZfYvdPjRz8j5yV7ekQ=,iv:slB/qr+cxi8r7cnTuZAd8CuzWVnvp24Li6A/AnZaFzo=,tag:ynh1Z2+IELAJcgBbHwFC0A==,type:str]
 wg-mullvad-private-key: ENC[AES256_GCM,data:4smAYjzrMz6bapthHwTdeDJSvnEqnGmDFRZjJwnXWXLSYnEhzhvRttVrmFw=,iv:94o7E8IlZ6V+wez5+Zr9xv92rr06MlUfBCvtMW8VnEA=,tag:SJjrbBseVyWwhf9IHRi7rQ==,type:str]
 wg-qbittorrent-private-key: ENC[AES256_GCM,data:xahW0lKU7yhinWJylyetdHWcdPdeKg3SMAm5WQhJEIIAFe+i2zeiSb2erq4=,iv:wTIsR7SXp4janh6QLA7RhzGdR7mDAMtAqROxFxKfneo=,tag:K/nDVrBv0ctoynxAEStr6w==,type:str]
@ -8,76 +9,48 @@ sops:
    azure_kv: []
    hc_vault: []
    age: []
-    lastmodified: "2024-01-10T18:29:18Z"
-    mac: ENC[AES256_GCM,data:askmYGMX50W3U/86DBj9CXhLOZdBrTjbMqRtvegDjfFkOtHLInGuh5urfXGnEBDLtLTjGwdWHCU5DZz9AvBNcl0X6wOM3BGxkMF7+CrZ2FL7ZYw+hJ7JOywNryO/vJLdUZ1MUc0uH1YZdYYHjD7nkyVeDj6aDDkO0UOiLsDNEDw=,iv:gpY4O08YheKFAanPkccp6I7z80ygqMj2IdQnYK9clwI=,tag:OAre51qIvnhfj/vwqSy3wQ==,type:str]
+    lastmodified: "2023-07-03T09:14:17Z"
+    mac: ENC[AES256_GCM,data:++UfJymDA0rdFYa2lfG3eYQBuqLp/3llSazf8XGNV3H/LqDxC3H9BhWrVhA2itkextBX+Lj7DxeHQLR8oMb538YI00z4Yt1U62sMfjajJEZI/BSnugDum2LqXCigOcC4+1TldH4490GQ2aij/aBqMxrFnqmkVGsqnqKLDxb5kTQ=,iv:QL7CuO14839+0vX1060HEKqdY/4HRFapInOyovn8lNE=,tag:+wMAltwkCAASa48QSzI2Zg==,type:str]
    pgp:
-        - created_at: "2024-01-22T00:20:01Z"
-          enc: |-
+        - created_at: "2021-04-06T11:27:21Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdApd5fpI1rAWa2hEaoASuyhgmYixdVXWmzjQJhwpGaaxIw
-            C2H4YeQ+KznZCxF3mDjP40s0u7fTIiO6o4FcbX+dxOcGxdGZQUcVevaHmjflvOH4
-            hF4Dub78fMESoMASAQdA+1akzujPUkSYGKB1DLidjjoIqIoNnj5H6BKgON3D52kw
-            v7UYLYbBGxVK1bWyW5MPkQcz/U0pvHknDOusmpxncqVxycULOGTTEhDjRpp+YPxc
-            hF4DM6AcvgVUx2MSAQdAdvJ9f2HwLQyhk74QTek8Ws0hOKkR9X/sTcq1jh5lcnsw
-            pZ8iJJ42qK5QyxjsvFsWSy5XVr4ox692aiwssztfFHIFG8y77NmybXL+Y7BJOSGi
-            1GgBCQIQYTWrLZCbusHNwhoM4gC/YqeR3JnlnAuz8gVggCa6bWaALdGXcaflgRMX
-            XIq3G5jsz/bR2rv90A3RrEvrTmMOMpij2lsmGYVkluPJsisDDCMeYmQa0Imc6x7v
-            oqDzRp0oRSDVmA==
-            =qGmR
+            hQIMAwDgSONkM+d4AQ/+KSo1N4aEuIAF2JMX+3RborUdEMIJNqIQsBYejPF4o5UD
+            25XVDt+GrC4Lx6OJsWobLOHm+FDLPzm4Zfo+grU+JaEBo0ZSthUul610iqChwEGF
+            zVMkNKARsZE7lDQ3uN54Mq/A7RQaav4mrt1AbHTOwBR9UdG5hrEJ8JZjObS7Gqz2
+            /OFpX4xr214IA9ALx+O2UIkSAJT9u9Ann/xcKL5GpwE9etcGZbYqOhAPaSzbOSDr
+            BtWuM8Z5nKb1O90pXEe16yVUmFXyO7T+lU1gDrDReSXJJFg7zcjMY4s9rro2H7xq
+            u0z/ufl4sf1E5u7fLLpzrVcqKJAOw+fvfoPeqMrNsGy3r3AdATw9jPp6giRoB8qL
+            xm3gGvs/VedBBqbXMDSCTIuhBcTu3/rrTWb0TJeuMz9RM01owkvtTrL3zjwK81BK
+            pNTwz2a49ylCiDS8Vin2u2jwjoRlri4mPTzw5pvcGqNAoNopv6cjawGQ2toCD5qG
+            tqx0hY0uXAE1cnfewFC63VGFbaBwfCYLryjGLefRH7XFOAcqZ3dlZFi5lJTVnnXO
+            44uO7dW8wfJj45USIEoG6D0BiRU7JPUhgPIjMa1cEI4XpoBSj13EACxovE3z5AYa
+            pX72eJHMkKZ5u+eRrXkrFSGFWkYBGKtgIdbgXn1i9Zw/Ewbf7Qz8kC83kxkih7jS
+            XAEbvfL1DTAHDEyAXFoI2ekIoTTGAtCpsadQcTZ3+3DeWU5R8X29vflEG/kSeRO4
+            m2npmJ9OCKyEN+zAd/WRIQ0wChFgadlTugsDcmXazdvzJ1qJiuNGmzpRn3QF
+            =dltN
            -----END PGP MESSAGE-----
-          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
-        - created_at: "2024-01-22T00:20:01Z"
-          enc: |-
+          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
+        - created_at: "2021-04-06T11:27:21Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAQ2tZrdSOP+N/2+CuaNAiSpw339XBAZE8fYfEc4FV4y0w
-            FUTjIbRctKAyU3ZoucMyElRKjlnhcNb/3r+pNzIqspE/PJXgd4xmhMVw5ote574r
-            hF4Dub78fMESoMASAQdAvfTRT3gFwB6vIGMW1+mR8aGWhvb021lYUqgesQlOBXsw
-            7bcHi/I+B6bwbF6/6nkccoWQqSdLFIXf+d0biFqtxlJxzKMnT5tZ6LcfMssI4R8+
-            hF4DM6AcvgVUx2MSAQdAZ5tBUzXBKzut2ygV/3Mk7DMQ1WNuk8Hyo7Sad65ssXow
-            iQzZarz+XIjKENnd2n87iSuYXKk/zHYmygJOUlv2bH02N7jP5X1QYlqtd5mdRhDb
-            1GgBCQIQ4ZwPyN81LkydDrCBNEQ3+rSgiN2jp9pZe6A9Nk6pR6mswRDC8/Si6v0J
-            59W7pkX7DFA58RaIpMbPvqVOdVjY4jFOnwt7GZHYSItvmbSuulZZJr4qR5B0drWQ
-            mdD0v2K963Tpqg==
-            =aEWp
-            -----END PGP MESSAGE-----
-          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
-        - created_at: "2024-01-22T00:20:01Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DLHeEFiC484ASAQdAHmEpe3x/65AW3G5QTuNSd1rEr9KPVmPUG8ewZiU/1xEw
-            S17RzFsJ8zD5n4BL6jC/mcCkaSm9ngLbVFGuEspAtUrmPzEQFOT9EE8UGhyQeB5S
-            hF4Dub78fMESoMASAQdAd2Rc9l7t/rB+AJFgk1XgksR4OM/HT0FiKTK1OehI+jcw
-            ihQKyJNHqhQ74Kv1HlSsyAG9nKJA4AZ0W3YfElKS90STrD/g0P7TWegL97LsXaqr
-            hF4DM6AcvgVUx2MSAQdAMrhVNU6d6fVHqrVaggQIxB01J0sS2IW1T+mtSAC8aisw
-            VEcSKyalAZAMS5CUcdPpZzeZELYNpRJ7B0n5WHC+QboMUXA0B5eVMrb8c5hFqXdC
-            1GgBCQIQt70LOwtTpmbWL2LFZ/Xz1TuPGhyv3fJfA4u1NaYhRdkp/+4h1kIp+UfQ
-            AoQWhr9mdtGiqW69AfCZAbmnVTLBe/9GRU7a3adM/p5BbPLbLb+74nUs/mv8q8SY
-            gEVVHTjvN9xEqw==
-            =WU7j
-            -----END PGP MESSAGE-----
-          fp: 403215E0F99D2582C7055C512C77841620B8F380
-        - created_at: "2024-01-22T00:20:01Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA2nIGHycQ3VOARAAivyxBqm4MG95W6YeiRZ54F1ljeE30osfOy9fIHDceGpU
-            Uf6fUFsljjS+jJeBorg1s2DLH+kl1NnI3TwJFxL+RQNUXvKpT4GyTkf7V7iJ1kSZ
-            7cfTkYAZ7+ZTeXk1StvKEck3EUIIR5rh5K1JdLBWdC5BQRmastGKKoRgZMR+kMKi
-            OoMsIo/aQqeo1L+CvL0RHNBC0nEVW2UvipeLOiKmdxwRaXB5F5/l7CSOBjh4FILR
-            aFOV+lpnZ9OBBpA0PPGpOw6hIXdOFPVH/72IBgaVNB47+70T/8QpSJ+ZVwrSoXOC
-            lonX3mBawpdYDoiGQLho0jnCQCp36ZTQIgLvqsYwGX/zt5P7w0ZFV0mxYiLnlBQ2
-            5UMoburfJSujVs5j/p82xv7jv4xIH0OYfmKlLpni+muxLZa+GXfyehWoQlZOuH4+
-            dZR9OX9/Scryg5O1GfB3Ehs36ei2tZnquuziefc+I0R8AqXvEqtjq1LedRDCfBcH
-            yRjVeSNggn9jtqv2W/hZ+iUFvBSXDKXF8r6LnNelZTy4IWi39BoxWAIiYzjws7/v
-            7sNQVa2C+Y+PW+VRpFR74xov0sYVqEDJ7gKSZLlYK06xhzfSp7J7ceXKUeurFFJR
-            5JzKNX0UHIQ4sOZdWW9QzbaRfaASqt9Ycu2065uewJLwkQF7MGuh8d/8KxCwx8rS
-            WAFiPNHJDUzPShfOMAxq3Ktt3l3XzM9WIIIZT7JBWm7Rm5FRZIKWgV2EXPtJyLho
-            hM7UIfxCTqsy3YXJX5fsSWc0mAjObSz6GzQniWGAQ+/xXh0/9aBZCzo=
-            =p2GO
+            hQIMA2nIGHycQ3VOAQ//RC1NMySQoeqfTGEKFB7LwC3o0yLTMHAqoi4qm2Q8jKxH
+            6zSjHNoYI9+2VNEWJcSvUwd9ks79jkVOAWO+Lmv2h1QT3RrsSsj16VZwl+ORp50/
+            +PDrZjaimMafAKaqGJ3HaPlzFX7jUjCHS0yCaF6WIU1ztRLVnHAv3p8dsPzQ1w+7
+            p1h0oQ2noWibl2GLGI3+1O3sv1N5tusTGZWFacG6VsTbtbJmbVCO5FQRqX7vcJtM
+            xfClghFPoHCGbN5W1NWpo/a/lOLUucqO7bFB5DIOoXme6SSS7lrYQKtjBQy/4DRe
+            r3VIjvS6ncVUIYPPnEMlxI3MPUB2lwJLG2B89XNNWwfwREUXTG4DEg09Z6jMUqVr
+            yNO67YCF95fNUQFMQ0LWyVsWZW1n1ef7/iKtDHNoFubCVGjWimIa3ZDX/e4WemEN
+            ww7dab2RXEY3oTLJZwAFMN4jeqUfpgH1TOvcs9OHwF0CQjJIDyDj6uyt6wYqITT2
+            dorhmn1FN/tUUNn4hE0iRjFaD1QrN30KZ4pQ1S/G3IkHGzJ4AlelO0j9yE2VMR2q
+            E8wEhVtDlO/VAYZSx7tJ7jd24gFsGlL70OfSXvo7jyNpo+OjaN9yy5Qy8iogwpGC
+            Jua/Y7+XORx3+SVB+1AUNSwCABOhWL2RQGnGxRRQrST4uEv2Gn6IV5sQuPz6my3S
+            TgEtH78YDDWHFdEE4b3lQaPAR8NGNvuE0btjpdeR7QoTOAkmg0SaUNqAoqrz80jj
+            7kdIBtI8XA2CW/oXYcoxHlkqbPNqPAhaRu3YDci8oQ==
+            =ukYv
            -----END PGP MESSAGE-----
          fp: 2372651C56E22972C2D9F3F569C8187C9C43754E
    unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.7.3
--- a/machines/fuuko/services/languagetool.nix
+++ b/machines/fuuko/services/languagetool.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, pkgs, ... }:
 let
  cfg = config.services.languagetool;
--- a/machines/fuuko/services/media-backup.nix
+++ b/machines/fuuko/services/media-backup.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 # This creates a backup of my media files when a specific hard drive is
 # hotplugged. The hard drive has a btrfs filesystem inside of a luks container.
 # The filesystem can be created with commands similar to this:
--- a/machines/fuuko/services/media.nix
+++ b/machines/fuuko/services/media.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2022 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, ... }:

 {
--- a/machines/fuuko/services/photoprism.nix
+++ b/machines/fuuko/services/photoprism.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, ... }:

 {
--- a/machines/fuuko/services/torrent.nix
+++ b/machines/fuuko/services/torrent.nix
@ -1,13 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-{ lib, ... }:
-let
-  endpoint = lib.splitString ":" (lib.elemAt (import ../secrets/wireguard-qbittorrent.nix).peers 0).endpoint;
-  endpointAddress = lib.elemAt endpoint 0;
-  endpointPort = lib.toInt (lib.elemAt endpoint 1);
-in
 {
  sbruder.qbittorrent = {
    enable = true;
@ -19,14 +9,4 @@ in
    enableACME = false;
    forceSSL = false;
  };
-
-  networking.nftables.ruleset = ''
-    table inet qbittorrent {
-      chain output {
-        type filter hook output priority mangle
-        # AF13 = Class 1 (lowest), high drop probability
-        ip daddr ${endpointAddress} udp dport ${toString endpointPort} ip dscp set af13
-      }
-    }
-  '';
 }
--- a/machines/hitagi/README.md
+++ b/machines/hitagi/README.md
@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2020-2023 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
 # hitagi

 ## Hardware
--- a/machines/hitagi/configuration.nix
+++ b/machines/hitagi/configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2020-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, pkgs, ... }:

 {
@ -21,7 +17,7 @@
    mullvad.enable = true;
    restic.system = {
      enable = true;
-      qos = true;
+      uploadLimit = 1500;
      extraPaths = [
        "/data"
      ];
@ -42,6 +38,4 @@
  networking.hostName = "hitagi";

  system.stateVersion = "20.03";
-
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 }
--- a/machines/hitagi/hardware-configuration.nix
+++ b/machines/hitagi/hardware-configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2020-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, modulesPath, pkgs, ... }:

 {
--- a/machines/hitagi/secrets.yaml
+++ b/machines/hitagi/secrets.yaml
@ -4,77 +4,48 @@ sops:
    gcp_kms: []
    azure_kv: []
    hc_vault: []
-    age: []
-    lastmodified: "2021-04-10T09:42:48Z"
+    lastmodified: '2021-04-10T09:42:48Z'
    mac: ENC[AES256_GCM,data:kKi9fAbikpohqIUEBR8c5ge0/fStxkrnWXfVhPvQMMeMO+rN/UPHpHJJMCC/v6TjFMC5ckTKTBflpGWL7xYiREoKONLIx9tMtaH02NrTs/MxVJZ4Ji+GKG0TY8mKGfidoJ4tM6a+8Yk1kgugeePmRXwCJDQKxQyEFyZ3BNKMxcA=,iv:l0OmGCg+DTs9KuFj2ZdW5DDH/0kKxjjX3ej43+X9x5c=,tag:/x8CigyZZJQIV3ZvqqVeXg==,type:str]
    pgp:
-        - created_at: "2024-01-22T00:20:12Z"
-          enc: |-
+    -   created_at: '2021-04-10T09:42:21Z'
+        enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAhnTen617FhDP4kxRunYZV2fsmEYbvw8K5S0R69dBWgAw
-            C2wdjH0PXsDxuz21PFbqb0k2T1iHuBiVIH4psDLGVaM4MOJamcFwIcHK4uLZZvU7
-            hF4Dub78fMESoMASAQdAz5HfOjvVVkQIaKNIhk63trrZLb9fhXs8NVulb6R69BQw
-            NgdhzIKZ6Srg+Z35jBNcsuqSTsYQfcv3iL5bvOyqAI/wnxI3SAfNweFIiJw0P59X
-            hF4DM6AcvgVUx2MSAQdAAmbYw/lRxofcaejX5A4hLEgU2NOTT15nzqGf5Ft/FFQw
-            3lf8NEAN9o1T+p0fHo+mQM2SbXWcEZBZkdQzgm7ky+bme9Uw1jORQOogUykyj9xU
-            1GgBCQIQzuJUUDp+qsDmhGaTtdBZUl0J92svOwnjIuKB4mvJcbvuqpyaxdiwODVz
-            pj6kWaOQTNtKR7w13Qgz1GGD7t5qtnMp9Bu3hTMrrXqV7XqAp3jK+m+8OtmDC323
-            tX2td01cvwr8ww==
-            =LyEL
+            hQIMAwDgSONkM+d4ARAA491uKx1mGdZ4QpjGkVeS5O8UowNdiLAvSnBZ31BGbzQc
+            MrGffPpaDJgjxRfZ4yaGVra8OKOsGg5gAinTc+SCNaHjhIqKFpyQbKjFUDGlu4RW
+            9flBowWQzz0VP475zxTALQ2i9ZrDdAIBMtycA3XdcZx241h4Ty5gvnB8WIqNp0+n
+            9RpOtK4jEZ+SSJXSGlI2RR+3cEI863N0PidepFf4wsqKhWvv34p9kQ3rVCt8VTMG
+            pPelbcxLdx6JfVXFKHSKjJApW+cOUcaVwOU27GefWHclanZWMOYsl16+eGKnmSqB
+            sTiH7z9o0khVxU5vVq6+q63Xu9reaBoAHIq/tTwpTswxGhAoY4CXbPqK1pVFcnKV
+            RfIxkjYffYR9x5W1zWuLoVwC3ueknGWj6g79aMVtcC8lJoRWT/w+GOdwW7lJGex1
+            W56n2+jcnnWtL2ljvUz3AuoJlx3dluquX1Q7H/76U8Gy0FN2TzgBoQw0jo6kvnX9
+            BDLzN/mtA7ph0oWDMCdDSKMW3OBWg3C9Ak+nmV67mIDnysNRfT93fi2OJ7Y5Tb1p
+            KuoodOOo7BqS8hbiS9G4ZUImGECb+GlivwuuoJ7LPrEPdvn87cWzsjDimTyQLgPi
+            RlFPVpw5nsVy8UihVvs/tj7LX99O4B1NNxXlW0Yj1qgcOhPBpvDcNms3o9GK+cDS
+            XgGalgUfb4BNzDclTwNYVILdNYM9AG9Ic5iJCZDNVtUXN65ptHHlCtiut08hqbFV
+            2+mMRJvH5gRTI1l+ZDAoHRV2LgWcn5s7xjENksx28xes9qH94GhWFK+b0yeoMKw=
+            =XxbY
            -----END PGP MESSAGE-----
-          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
-        - created_at: "2024-01-22T00:20:12Z"
-          enc: |-
+        fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
+    -   created_at: '2021-04-10T09:42:21Z'
+        enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAm1dAnFLB2GBuSif2258t7ixnBXzB0+y5BGLP+y1y8AIw
-            PywjeHtwB6QKgZNmqArSsqzjOV8oCVfDv+yerMkuG4Hr24rAl4H8yTIGyF3p0QSS
-            hF4Dub78fMESoMASAQdAdGP0AsHD69DsE380RhSsPKGij4ETUhrMlikxzANg4jow
-            jImzPHVLXCi8a3j8gwypovqPCHkhrxBvfCOErSktYLLRks9ekME/S2E2+s2OrIGf
-            hF4DM6AcvgVUx2MSAQdAFkQpv3jPCNxHHPbDRErZ9Cpe5apb/38leQATEN6R0Xgw
-            G/8TyOYavyaUvNUWxYf/jRwCKEp9brNKtfSNEm6xJkQ0AmJexvk9RnokgfUDYR1L
-            1GgBCQIQ49V/6WXlwWfOmPMQ/IfbnwY3QussWqT1Fd2DwEPawXSqIbp1nEjGaRmg
-            xKF9kGlRNHiOafHr1LLpJfti/NmKiB3o38p/aZQXJ53tn3TYLE9v1mj5Tj5OtsxX
-            pWgrjURY0s/puw==
-            =YdU1
+            hQIMA2UzePEMpuAKAQ/8DzlMIWH7nDMIeM8HlDckfzeGgYhzr6lJ40vjtYtNqt3j
+            OF3i+6eaBX/SMsqStk7zLj53sNp++pCGev+TZV+1c+yJd4t8fllLTuRh2rfPXONT
+            Pehu3VhsudOjXKxBJcWmyfnPhtLjtIxdKEQpVgLFiEbbDW+OCSn1RveSiQ63/pyd
+            Su0BNYGmpF89/jEA1ttfknhxd69wsuBKGrxQc9P4ZPQvZajnbhQ2TbLeuLnub6yb
+            QTUNbJkAofw19AgBXY77AX+qreYq4esrAMDsz8ICnisPSO6g4FJ2feMc0Tvf5fwA
+            B0janl3G6D1znUG88tjsjUwv8/x/MHsGFJQvBLm4vqLOFoPDaJ9cO0n1Pv5uFtQB
+            XEwFFgkw9TY1gwsR2eJE/4qSiFaW1JYBHx70/Wyn1ZlJMmdUVh00RhY7Xjn3LMkj
+            JiA+LxvzbTglsMSvkswPbIfUUmB4Ws42P3fF55hCXkxd8jj0NjxByrfFy0VXNgJQ
+            KVYtcQS4ZWXyko+yllEV2TbxmTQilaBEUUdty4hYaoLtSX0jh3s8ZVN9jTv7SPcs
+            VhURedXKmtzogujft1wN8lcqzVGQhWHws2qjOMEiMmeyslooUptg7FkBt/Qw6z5j
+            rlJvWeudR20LCHjjCJnPl/eoNEkQkpOeb5kz4NV7n1okA0jEcOMBbG3+rWiX+JXS
+            UAEGnN0ClALycCU8Fj9lnswEd5LP20ohZUbzk30K2K0bqRregxoY+UMWAQ1asSdK
+            Xd4DYz27BFFPHmrpM1F5Gbxhvy+NiFYNu7+2DCkuLGNj
+            =w8xW
            -----END PGP MESSAGE-----
-          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
-        - created_at: "2024-01-22T00:20:12Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DLHeEFiC484ASAQdA+Vig+61+7PNXNsMR8Kjf/5iA4Cvva6R2Jb5Eqbwju38w
-            2q1Aq4ZuzqluJgdObUJizhG8A87pMUF24U7wc1c7QJzCn1DZwwT4LL07EI+Kfsc9
-            hF4Dub78fMESoMASAQdAD6uMKMhN5w5gm4z1j4D9rq9J12Snb3flwmcREs3ckm8w
-            ZB66UNfq/ClThzr+L+MrnLkBZBIcLXpnZIWc2mr6TIerYdCnlTFgB7brQX/Wztm3
-            hF4DM6AcvgVUx2MSAQdAwOgcxmmXQe/mOK6WjVTh9BUxvWpclp9WKslO0BB5uXkw
-            lOp/UFiySxZTfLxSNExfdvAE1xz4k0mgkGSRnKEAZxA6JpIA8CsodkhssUsSkshU
-            1GgBCQIQHbtdTFPwhQbrCzU3C0FbBtwGurGUbvqj1nCcYaYZhroJ7gJexEk9dKgV
-            ahwaBvaqXBVijrjg8DRmzzgJWoYYKl9FkA93115IXV5AsJ/xjz0Hq6GETLvH2Wkc
-            fT8aDvn9w9qOhg==
-            =iP6n
-            -----END PGP MESSAGE-----
-          fp: 403215E0F99D2582C7055C512C77841620B8F380
-        - created_at: "2024-01-22T00:20:12Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA2UzePEMpuAKAQ/9H88PfyF1okYtUiO+hwspq7NQibEXDxWRu5oT7UykVpyf
-            G9gA4OEfuvYnRXyqiR/CuffDGb9skogQy5yMM1qk9taCv7CxQVc9XBtxlvu2hRty
-            H610g7AvneN82MPWaSNjPLwtYebDq9TaTMddbXKCTLOLjT+NC5h13h3Mk8ExVtoX
-            BnxkcioP4S8eKkZlBqTM1EHvSSxNgwuiT6sceOT4RscE8Yirv7D0EJyRoMU1Ufa4
-            AqiS15l+UMtp/Qt1h6YQ1s7l6e/KxM268m0MHJcoDfP9wS/ca/fmZDUrswPCHgcY
-            4ejmhyqOxGqYIc43wQtjucQF33ipQPc3GGcFaz287/vf8lqoxyfxJk+GdJinsPHf
-            JJE/98A4oEqFyS5iZuy+PQBbdHepSHuIrM4QdAMulyVzPnGdYhD1gKv47q3AxbIX
-            F0htqTZAHxZAw8nBrtKCU1dgfRy6nqPifsmlcglleCJA/0n2hgcJyg0Pos3MesWv
-            wu8AIRni8hUfzH1vsOId3Ij9/TMidyUwUJ94BX9TdIEUMsESnuF/AJSww4ny7Vsy
-            iYAYGLaWPQvduux/nESp9jY7TUS8fT62fbB02DdDXd72Ua/vViPpnjHYTlAQz0uU
-            FWgf5zmkR0p7WqP87sx49cHKOhqBu2uXnBRI04MlEIa8FyoZZtqEAs1nB83PEfLS
-            WAEvl5Ca23bXNIjc7TCym9BCNeQ2zBVmSlSlT2GteiTvkiWbCIn7H0Jtb61ewUUd
-            R1E2x/J87iWrrRNfzn3B06DBJ+WecaRE1Tec5ba5BRdj7xK3vUUTPq0=
-            =7yzB
-            -----END PGP MESSAGE-----
-          fp: 17FEEBB45E4245330507C960653378F10CA6E00A
+        fp: 17FEEBB45E4245330507C960653378F10CA6E00A
    unencrypted_suffix: _unencrypted
    version: 3.6.0
--- a/machines/mayushii/README.md
+++ b/machines/mayushii/README.md
@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
 # mayushii

 ## Hardware
--- a/machines/mayushii/configuration.nix
+++ b/machines/mayushii/configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2020-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { pkgs, ... }:

 {
@ -21,7 +17,7 @@
    mullvad.enable = true;
    restic.system = {
      enable = true;
-      qos = true;
+      uploadLimit = 1500;
    };
    unfree.allowSoftware = true;
    wireguard.home.enable = true;
@ -44,9 +40,6 @@
      disable spoolss = yes
      usershare max shares = 0
      acl allow execute always = True
-
-      server min protocol = NT1
-      ntlm auth = ntlmv1-permitted
    '';
    shares = {
      qemu = {
--- a/machines/mayushii/hardware-configuration.nix
+++ b/machines/mayushii/hardware-configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, modulesPath, pkgs, ... }:

 {
--- a/machines/mayushii/secrets.yaml
+++ b/machines/mayushii/secrets.yaml
@ -8,72 +8,44 @@ sops:
    lastmodified: "2021-10-05T18:14:40Z"
    mac: ENC[AES256_GCM,data:Uck/kX7BE3gqpMD8wgsksEX3DKzNSUinSRAPqpafH5UbVfQLYVOD637j7wltrtcHSOLjqGSrSbf6jhql/Ve3yTthYB72cHKcJ1UOk5cTD9xCpUJCx56Eid0yj9UZpifIM3PLRjnqqZFF2TYa/s8HcmsY4uvcN+U5dyXYpS6XYMU=,iv:2mhjUTxjU9xH0wFS0ZbgQ3GYRL+8BQboeQuVBpAQvsI=,tag:ZhAKuPo6iPE8890tkxHdaw==,type:str]
    pgp:
-        - created_at: "2024-01-22T00:20:04Z"
-          enc: |-
+        - created_at: "2021-10-05T18:14:16Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAqZLu1WtuX32MApKS3+WArf1Dx98sVvtRA2f+3Ohg8xww
-            ybR+vA85q5Bkj1qUwvcJjfz8YcQMqQO3UfiAjxq1+nWpFKIRga5F+4q6wNReEOF9
-            hF4Dub78fMESoMASAQdAQxvlhs2ndgxb1gyOdu7Pew2iWRQArmXbde8e29WpU0ww
-            L06LIRbKDCbVuOpWBQ8QH81zYsZtEuEBysSLF70QOZ9ghfKJlcosjpA0+4LCA7Dz
-            hF4DM6AcvgVUx2MSAQdAk72KyhnWhZHppYXecGMJI+kFP/R+VKAsi4uWSgbNDkkw
-            Wkj6UTYvOvRmwqKk1fFoGw5W5Uc3f4BUslCgY4ZXUGt+5q8VkWZJUR5ROqnA8dLi
-            1GgBCQIQDZX9QeIpllKKKXLMiNKGMJeRkXBNgUZf/veWn0XLL0DYsmKgidn4bCJK
-            VD7gNXi7XT9uSyZoArN2bWjN71ajEq9xEWBDocpBaM1YfThhwfJfClpHVqOwZGoV
-            Z1xkfw6KRye97A==
-            =8YPu
+            hQIMAwDgSONkM+d4ARAAvcpLQ4pl2zWfpNnyoi5Vu7Ok6kiQF2UveJQkxkvgQom0
+            TtvlazVEy7kBebM9sgYz9NtcWlTFTMCXC04gpJz9fGYAyssnZ9+D7J/yekK6vyEY
+            5vY9Dd6FX9HGOQuG3wAwBr98AgNHB76Rt31LBSUjIzNZj6RdsbakM2GRIRocFB9V
+            mykpRozkE1ju9l+E3NqnBm65AhjEX9q8W48oyrZLd0lFlfo3Lseda3AlGIMz+PV+
+            MNZ9jTERJZQStpeenE2u2+cS+tMJZbXGk0QBY3+Clz7fTOBlA30ePiWefy1ix3XG
+            mIm5WM12GP5cCpLc1mwAJvyNi/kTw4Myfy0+xth9j65nZCOl2xLIAGqgfikcmQoc
+            /NKs/ijpTwSaqbh3o2vmlmYoif7UkVDxoz/cQKoh9Boa0br7eEI6beKwL2bvDcn9
+            KBNYBeHftt08+sPrg8hSLGjVSpcES9IH6u1WHUWnQYH9ykN9b2VcFeMVUjjYsyWd
+            AwO+quTMF0dfo6es6t21/whzE5TrYZQGSAZzaGASPbzk9MKWQ92hJxICPyyFuZFq
+            NOdWZWRQfYS2Ia9HXqdzcEIiLtLBm4gZ6sZQ/vkv3bBKFcq1rZ2UqfJhsaL9eOsw
+            QiSOoiVpjOAq6SXLF6yQnTmPZczQV02XSvwtNjBSD3yXAIMsXt5JyIW4bCcEIJvS
+            XgESvf5cIkUUA/zmoSmiKFNhHDO7X7b9xMPAE4BqnJqFRL5iBkY9Wkwlv+DFOCDw
+            0W6U4V5dFtnGYMudnjQMp0qtsHeDkfhj/IQGAY7RuBaag7HnmBPAzWnYmgE7DW0=
+            =Fru9
            -----END PGP MESSAGE-----
-          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
-        - created_at: "2024-01-22T00:20:04Z"
-          enc: |-
+          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
+        - created_at: "2021-10-05T18:14:16Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAacLEX+butwRGjnGZjCjt/sTW9j/tc2CsOIP3ZPcgbAIw
-            sJ2Bal1Z3aiNxmmd2tmd2nXfTg/mg8SVM8jnPPIU3KFowItSjkjEhx3/AsFtTHSy
-            hF4Dub78fMESoMASAQdAzpthZ6HLXK5RQ/pLw7Q2h3RoqiAXiZBnsWrTRk0ZAQsw
-            oRPM00dxW6pD7iHNiTtnORtEOUGyPdvMx/FD84sCbyXD1+xkx/5r3MyearZp+o4f
-            hF4DM6AcvgVUx2MSAQdAqCq5RIpvlAPrORN3cwkUA3H7yfVK+DKOOZ4tVO7sAx8w
-            u0EHNfOJdQ0Dwa5NVfGogygIZ2zbfqnj363bT9DM6c2OLVNooE7Wdex2ftXhU4xw
-            1GgBCQIQLtnpAO+bPJjZ7CNk+5aJXMiajh+Cx7xch6jqQ02fAD58kRrz1qhFGwTm
-            25wuNQxMUK0uqA8OX3FLwZQ3+wOCf/rhimV0xBGjyLsvjJbYRUA3yBHYkPdJiBge
-            6wmfCzQngJlSrg==
-            =b13z
-            -----END PGP MESSAGE-----
-          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
-        - created_at: "2024-01-22T00:20:04Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DLHeEFiC484ASAQdAWPE87/VvXNDIwVYAbOPF1JVKoTCTIAkjLCRqjCyuK1cw
-            ZnvHOOA129hn4Lz1Vn6BJvmY12Ri2we15bdoNFVhuh15YT3T4uQfJ0MtEv/UdXZ5
-            hF4Dub78fMESoMASAQdABJ8zofCOfdUNnibN/X9/rEd1a07Dk1tVAXn09mAbPXow
-            ZVhFuJ9KH9tLCc7taRpMryOErxY8KOKoM/9BDsSPFrUp86b7mFAzH/RZKf2Kor9U
-            hF4DM6AcvgVUx2MSAQdA1i5Oiu6JIqkfpPVmFxU+C/u2RIPZxzY467U7PlADrR0w
-            Krr3U7KfyNvDOsLHg+0/ehTvAg1LsK52cg8Dd8pWbZ7Xn7r+kYdLZJU0pCKIq8oX
-            1GgBCQIQhBrqjYzS8kFUYgDJT8g7A6H3bXdLywblyilTB6HEhN/kB1HxvF6Si/wb
-            3HO2zcbk57zDIdki8OaMonl4wZxd8NqOZaiPUph0Hc8lEWCfbegFYSTLTrQNyrRk
-            pWA4/yuPrciAPw==
-            =om6+
-            -----END PGP MESSAGE-----
-          fp: 403215E0F99D2582C7055C512C77841620B8F380
-        - created_at: "2024-01-22T00:20:04Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA0Sjf6jBUFOzAQ/+KOp6PTM6m8T3Qtbs/8tpnQPQ5g0QM05iuRdbofEgCls9
-            +HfEayd5AqO3VoIqgPea3amtxHUIunVXc7edlJCuOFLDxZJysZrX1BFoFHewwDKQ
-            u1h/tLAhJJpE5wA/iewXtXus+jXgRXThFSiXR5qwQGnBWdsK2XNnTQ67vBjEeH33
-            My1r484LxAZst5kCJ92VuHJevqjvsvp6Pw//zSutSGKUcUnLp/J4A+rlfglItCpv
-            vhzULQXmb9d/kX2DY46nwxjw1CfRyLmAWVhLE2RWhm6TR93eDs+G10voO/Egd0OF
-            /xOI6o3gW3fP/zhWgBQ5E82Fx1mhGdnTDwTL5UGGbzK3zS/g8uSHRiEzIM51wdjp
-            GjqiZRCHO32fGYnnX8lF+z2HdyTdnUoTS6Omch2YTrNs5aDV75qif/9yaKV7yRb+
-            0LrOaoWaSM0vfN/0gwEPd7FVt07Kov3Yxpfa/GxPIIZWAkwpAcI57u8KzeSfzYCp
-            odwMgu43TdOoL+IRiQxz3IziiY9+eQJY7pOOE1+6h8BSt3VjAoiGqwWQro8xC3eh
-            HR54/FnLrYOHlVmle4VvuAunv1HZ5iAq3dz8t2VG+Q36tPl9JjPTcCnnFdAtErDN
-            7mkw1zba5bBrlzsGiSK+7f088hGOkisy/QpptG90BVhDlBLJ2tl+fhN2LrDCVX/S
-            WAE0t8aZHva/fpbSYi0dxd9lF0/LX7lZFDNZyLrvcsaFraFC8Xx3Iodu0qtzbjSk
-            IXJ0Wn0aWVAPQ9X9mcuEzgIMWkYYdCW7ssuCdWhmZ9Gvqaf+UCb22xs=
-            =U1in
+            hQIMA0Sjf6jBUFOzAQ/5AbFqOiaNS2Wy5al/H0AVNbpPNPHYYYUaAiDYitdwNgur
+            oChxTYVP+h1UVwNhy+5e1XnLpEwJNcLrzfeQgxr21CqBcaSbOzEE7G9/COX0TD7z
+            pyEP5aup2TmCx8Gzc7Ugjbfiksg1m6EhoZV1k1bsuh5mrFMQqhnhI/xQr0Kehl9E
+            dggOw6IGfu7rZ77U++AHF4b22ZqR2LuRdhpHAvC4H7qlCXIiRlV2qQBT7ArnaOG5
+            7b9WxPI+PjJUNdm/O3rv/ooAtdYz+mvsoZJIMuS0ruxKNGGO0SInxY16QFECKixY
+            n7/q5OmlNTVr4i9++JPSAu0enQsqOscSZm7TctiGF0ekHEn+axRsrMBi8pqEzu08
+            nHb4HXmf/jkdlYjg/K34I4mec9jy1L7a11y6lfsAab1FnabbKJjgm3jrBMMoM/Fj
+            hEH7CWpAAvG0+rwJ9EmuVjq1gGbi6Q8mBpmX0g6/hfSao/YWOhXMi8tDmRNeVWpa
+            eBYhRto2SRB0MhLbOeZyC3UkDASDBIsNgmFz9JTbwLh/opv6anqE7O2sLmKIuXDA
+            IfLJk+ahm05Fdv3AfbPsWGevo1OzxSOxRYn5cDEuF22rcZNDOuRylLJIkkxF9OzN
+            XpsgV7aoSYFgG84u1qa59dE+rvKlhSi8xLQm2mZTRB6L6sDZw/gQ0H4AeXCZC1XS
+            UAF7lyInB6tXrEoNCCIdON9JSrBmSyARMGLoPOX6YqvPV2MQ4OEWf7BZ+SPRgbuI
+            ZFQLv6hk0fYb0fb8xHarmI8krq7k9dsqYxBZI5DjVaPz
+            =7LEL
            -----END PGP MESSAGE-----
          fp: 23EEDF49AAF1B41DCD1CD10F44A37FA8C15053B3
    unencrypted_suffix: _unencrypted
--- a/machines/nazuna/README.md
+++ b/machines/nazuna/README.md
@ -1,19 +1,13 @@
-<!--
-SPDX-FileCopyrightText: 2023 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
-# nazuna
+# renge

 ## Hardware

-[Alwyzon](https://www.alwyzon.com) Storage Server 1T (1 Xeon Silver 4416+ vCore, 2 GB RAM, 1 TB HDD).
+[Hetzner Cloud](https://hetzner.com/cloud) CPX21 (3 AMD EPYC vCPU, 4 GB RAM, 80 GB SSD).

 ## Purpose

-It provides services that need large storage and a fast network connection.
+It will host most services that do not require large storage and benefit from high availability.

 ## Name

-Nazuna Nanakusa is a character from *Call of the Night*
+Renge Miyauchi is a character from *Non Non Biyori*
--- a/machines/nazuna/configuration.nix
+++ b/machines/nazuna/configuration.nix
@ -1,8 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-{ lib, pkgs, ... }:
+{ pkgs, ... }:

 {
  imports = [
@ -10,27 +6,7 @@
    ../../modules
  ];

-  sbruder = {
-    nginx.hardening.enable = true;
-    wireguard.home.enable = true;
-    infovhost.enable = true;
-  };
-
  networking.hostName = "nazuna";

  system.stateVersion = "23.05";
-
-  services.nginx.enable = true;
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
-  systemd.services.nginx.serviceConfig.SupplementaryGroups = lib.singleton "keys";
-
-  sbruder.qbittorrent = {
-    enable = true;
-    fqdn = "sturzbach.sbruder.de";
-  };
-
-  services.nginx.virtualHosts."sturzbach.sbruder.de" = {
-    enableACME = true;
-    forceSSL = true;
-  };
 }
--- a/machines/nazuna/hardware-configuration.nix
+++ b/machines/nazuna/hardware-configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2023-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { lib, modulesPath, ... }:

 {
@ -9,8 +5,6 @@
    (modulesPath + "/profiles/qemu-guest.nix")
  ];

-  sbruder.machine.isVm = true;
-
  boot = {
    kernelParams = [ "ip=86.106.183.111/26::86.106.183.65::nazuna" ];
    initrd = {
@ -50,10 +44,14 @@
    networks = {
      eth0 = {
        name = "eth0";
+        DHCP = "yes";
        domains = [ "sbruder.de" ];
-        address = [ "86.106.183.111/26" "2a0d:f302:123:8d61::1/48" ];
+        address = [ "86.106.183.111/26" "2a0d:f302:123:8d61::1/64" ];
        gateway = [ "86.106.183.65" "2a0d:f302:123::1" ];
      };
    };
  };
+
+  # no smart on qemu disk
+  services.smartd.enable = false;
 }
--- a/machines/nazuna/secrets.yaml
+++ b/machines/nazuna/secrets.yaml
@ -1,81 +0,0 @@
-wg-home-private-key: ENC[AES256_GCM,data:fqdPyTa/0Ixr0sO8m06Q1xoAFYBA3q2P4Ho7k6AZBakcKvaXyqFiaISsIuk=,iv:tFANTuH8NHs7cHGduzn66njpCfK1tyydRlBCwv/ffyQ=,tag:Q+dBhMjjHG0cZlfindxBhQ==,type:str]
-wg-qbittorrent-private-key: ENC[AES256_GCM,data:ui0klTtpg1DYl2A1R1PbGngnv0WFY7/qjcTdUpmpTiZVmxJxCdMId/ussvo=,iv:2vpZN1rjipjdBQKRAKv9Qf5EP1PSUBGKWg9j78WoXLs=,tag:WxNLrGNCa9ozYJjN9xRK6w==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2023-10-04T14:34:22Z"
-    mac: ENC[AES256_GCM,data:LjETyB9nqN6y/mevYOGXSkWNCNtu/fTXazy3VmZANNQCTuP5J5j6QmS3o9u+VCmrLpntpeNa+BT5VSbHgdlN70zdvgSZFhKSw/cn66L+dfO9bqUwDVDN2S8RSE6RGbFz4oYxS950JHEOKPyD8svtlT8xLq9seeMcvwp+KcSZqMY=,iv:70PeKVRqKj/6/o46TAzICQZDi83m4qPTTR1K3S6JiOo=,tag:9rQR9e9ZGYMgbklV9lWdLA==,type:str]
-    pgp:
-        - created_at: "2024-01-22T00:20:14Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DLHeEFiC484ASAQdAxEWZvBqUtVlpHTdCLfV1DO2DMguJ1kETM/iBI9hUg10w
-            4KBoLkO7Ocji1ckCW4dyY0m1t/MCKBvr8SCCCFXpcFC76kRUjxPUAu1+Ge18NRvf
-            hF4Dub78fMESoMASAQdAj5+rduomE5D69dcXApn3UWh0WxzHcn95AyhS71oB8kcw
-            V+H3UzZ9R7lVkDKeceulZXbkvE2IzrJw16KrlTre1fEEk9fy6CkzxgXPT5ipO4t8
-            hF4DM6AcvgVUx2MSAQdAdoJ/hSaEmC9eiKg0wcDaCiGvhfMtmPsC0xtw3zQMNzcw
-            AiZu7iRIC2nmNQrPJ+/uG2WNgZG/Xl8H+AC0xvEJjAKDFLd5nd8FQtBL9KBOaunv
-            1GYBCQIQc5vXqxoHJ9lXVIbJv5+Gir49SSWiexaeUsHVNuwFjta/HKOkkwyQIu0u
-            TW5K0A+OOaJo0FYIuWnA+BUTebIFSbRHGV+MAU2iRg0AkSfJSB50pJsF667XkFdw
-            2R+vGqmYVlg=
-            =micy
-            -----END PGP MESSAGE-----
-          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
-        - created_at: "2024-01-22T00:20:14Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DLHeEFiC484ASAQdAkYkb44Yn6alZy8i6rv62X9AmzuqrsFtadEzUKUixDiQw
-            cb/p+ABh+iu5F/LDiTKM4ypF2jJKEHjWUJ6PbXhhl5X8J5+Erl/p2AF2vlMPxlAL
-            hF4Dub78fMESoMASAQdAxWk+zrk/Mt2R+VsKhFQ+mhjJDoorY5+3rSSmI8oxbnIw
-            XPCctjc0jNXoAYsr1esuXeHm4gW2W+1Eg8ZsrfNi+gZpvKjWCvsJkWd132/gR8v+
-            hF4DM6AcvgVUx2MSAQdALSpJ0HcrltayEZx3jbxa8e4C5NV0qneAJFGNTYimZh8w
-            W6QzxMs6Q9PmFTjXwOy7fwW37OP/xw3EaKTWZZQ5see9fwG8mkk7JEBmymb40nnO
-            1GYBCQIQlk1kd0EcfWZzNQ+PIKxyY8jtLLw06NGEUnJu5UElcMS6zb616RUtw7h3
-            SIn+/jOxnUdWEOOlSavKUWgqEaID3vgdBAB/RBkF0v76wTrZcKa2QORDUQgwmoF4
-            VjH/F6dxXWA=
-            =Oszh
-            -----END PGP MESSAGE-----
-          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
-        - created_at: "2024-01-22T00:20:14Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DLHeEFiC484ASAQdAjzgyMWrNc5GsAEHQObWpCkz/1zcJ7kHfd3Wn88aDPzcw
-            +D2kSbSMqGXc7IRW/czBgY/m2j8z7alj1neDIx8w5moXKWgjWubDryVJVoXQV19A
-            hF4Dub78fMESoMASAQdAbvYXma4/upOcBXhIwox1co1c4HZh4n5en12in+rqJVUw
-            /gvqzxL1B+XKw958yj8288gBUcA1jw6l7Dx4BARGsrbA9ShRzRzXqi1atpbE6+Ap
-            hF4DM6AcvgVUx2MSAQdAooPut4kS7cYZI5XyUFEr+WWFVKbqxAxF0aXoH8yozkQw
-            gSzcNN+YJA+DYTPjhTPq/RYkU3uJ2KH0pYuoGa1b9Tl5/y8jjTme5CCMhkjSDk6R
-            1GYBCQIQdEXOH0mcDpGx+dVYTFz/KkRAWVOYXfRdm5JnjkKFKIa0itL3+bxf0SWT
-            5Q4SzvInxXosaCJgWPqyoo7mkcIYhiX7UwSvwJdn3QUbeno3cbLsVcuBe664UFNw
-            c59WB35H+Uc=
-            =1la0
-            -----END PGP MESSAGE-----
-          fp: 403215E0F99D2582C7055C512C77841620B8F380
-        - created_at: "2024-01-22T00:20:14Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMAyxL760fnpFcAQ//Wut5sLyYF+Ubwj9mYVWUOP2kiILKHtgAzExx7IS9mQtd
-            EwgbP/eXF4hWF1uEf0BDAY2J0uQRjB6rzUgoFZT3/+445dVBHd16x1Nqp1Vu4fFh
-            k9bntD3ePjH40eLfvAtTsUrKN91HMnJzR9TXUgYkuQSvkFYQYrz9XPujJj2IoR65
-            PWp8ZvSYEmKk8bDpE7oinwAhHXocgnRR24mJv5OgHNB1QLFLegBK3F40zJJMPaZk
-            WsoJgrbW3E4A2KxSOyU3aip2vRIlDm7+Yfmd+/P4cfh/ZVKjcvuG4+BdSCxmwZhi
-            JxWcXRu6kVWpKKlRz0WK7g/PQhsqdqDQTUrsk2lWG/jXRX5+F1kg8PK0jSCE4PH3
-            i8YCJzfdVvyruZMZZ4I6lG7kOKisMqnH/tS1VqR7itYaEBNRdjG98sThxpqw5CJo
-            j7lktnZRL+RUV6Zk9Ph1s4WnCn61fcQhBqxP/vEue+gC+sIvVuOF5uw3Ecj25pLQ
-            cxhF6pPSOvayy9qcdBG4/7ljdiEIeRaX8gUeBxEQhe2dh5x8nCZowLEQTczEil4r
-            We8BLjxdq/qEuO85J3vYsID44iPwOjOIGVeapAt+H3LXxk/tZZmpHf5Wbj48guSq
-            6IEISOGaG+KQ83EA2+tVWa4143dImofHBwc75rmxXJeR2kGCjwxf6DpcNWtvUkLS
-            VgEjHS9eL+zqSo0fxJcpTTLZx088ssS0dARtIGWj0jqHytsgl1kVq3HqUDBvCp3h
-            pdCYy0BkVZfesU5j2+lmfGZSUtgRyFIaoARprTRfp9VlvxBWkRI+
-            =py9c
-            -----END PGP MESSAGE-----
-          fp: 0b8be5d87a10a0e68dda97212c4befad1f9e915c
-    unencrypted_suffix: _unencrypted
-    version: 3.7.3
--- a/machines/nazuna/secrets/wireguard-qbittorrent.nix
+++ b/machines/nazuna/secrets/wireguard-qbittorrent.nix
--- a/machines/nunotaba/README.md
+++ b/machines/nunotaba/README.md
@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2020-2022 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
 # nunotaba

 ## Hardware
--- a/machines/nunotaba/configuration.nix
+++ b/machines/nunotaba/configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2020-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, pkgs, ... }:

 {
@ -15,7 +11,7 @@
    gui.enable = true;
    restic.system = {
      enable = true;
-      qos = true;
+      uploadLimit = 1500;
    };
    unfree.allowSoftware = true;
    wireguard.home.enable = true;
--- a/machines/nunotaba/hardware-configuration.nix
+++ b/machines/nunotaba/hardware-configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2020-2022 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, modulesPath, pkgs, ... }:

 {
--- a/machines/nunotaba/secrets.yaml
+++ b/machines/nunotaba/secrets.yaml
@ -8,72 +8,44 @@ sops:
    lastmodified: "2022-06-09T21:24:49Z"
    mac: ENC[AES256_GCM,data:ULMv1q8wvG+tX+51Sv/wkjA8+v7OvnZntji09+c7KnepYUyIqeNdg6MocfGa9xeYpvFD6cWgmzE/JBdYRoTsaznC53aey6QGjYrAD4u1qeAN9FFYDFJ1/GLXmqqva4FzyFidhbMXCHx77YSRFd3Uhuig7xarHVKQZgLjXFIy9iM=,iv:YYWan4L3dqLDXH3slgHAnmCMvUQfaiBRTkMEH+l3PJk=,tag:MnAGpn1t0wRZn5CUTEsOow==,type:str]
    pgp:
-        - created_at: "2024-01-22T00:20:15Z"
-          enc: |-
+        - created_at: "2022-06-09T21:24:23Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAVvZpTZ6B6tmjKsB91b3sZPjzZ07KL0HXflJ2/pYsPFYw
-            nm3arYf+1DJct11C/5DLSi6D+nLkFypXMtQjAPXhDEdhOOyNPDExE9CEbe4TeQuQ
-            hF4Dub78fMESoMASAQdAIlLQbtxpQ/OaCJbeR2LWebssrynWmOH3FAhmpI5EZWww
-            gMTDuxROhh6f/tjmN9mJvZknm6Aq/7EgNwie17o6cx4iEgY3z0sc+wT8gT7DkjmF
-            hF4DM6AcvgVUx2MSAQdAYf5/lBl+h65RmaZYwQ/Hxh3wIpM/LRmQg1Oi6F39kXAw
-            Ekjzq4P5YMWPAkE65DnFO23a0bXQr++sHOwkHhQITg6awJ0sWY4jRn1TlghJoCJj
-            1GgBCQIQC6OoQlwlV8kt4Jay7wDtQmoF0XccaUhHJk+wAefIPrpE9mGoNaztexQY
-            K2U0aC0Jygxwc10jXxdcQnasupAOmUMq7wH/12ODbVwRerCaBIj5HX9nXgZwg7iW
-            PDRLILxic/uC6w==
-            =JRCy
+            hQIMAwDgSONkM+d4ARAAnBOOyi6XBeqKTygfBBjdorieYpOu1AkALtWtH7OqGL1/
+            NAYQGt55dJo+p1ngfPrG3xD3533GrlcM8yOqdhWc/QYx8L/U9HYjdzwrTGqGlN8c
+            67gQWSrCx/pQoCFy2vz7MssYlnXSariQJmKMaOhDhNjF/Cmp/4Ap47U33KSJ/Gaj
+            u9KgEE9CC/0wnqhZR8CdARTQjJqRfv3gIrTKU37GEPpOYtLUhxtmi2MEt4mH27Ab
+            4kq9aZYOr7hECpSTiE6Y/aKSnAYhl+2CMo0g7Ob/XTOuaKqEj4mkcYdYeb2oAbyC
+            QKZjLkqnmo8gl9qtM1smRPk8akrTBd+IV/dYa8kqqB3HhNp+BuLjwQT7ZXkf/qtO
+            BEeZvKdwHiHubyN/Kop9bqjfeXqw5t4t+9pqVRtOgmzwcjVMSzyG4hYyy6Usngj6
+            7BtW4xaysAWv6OY/9cqMjG1xpr9sXNdKFj+QuNqnjULWH0UVWxAyxWGr0VQZmexD
+            aP0dDk44YJtZ9clfFRkrWyLmpHg4ESU8mW0gDQSeK6zdzguJfYdK7qTGdMh5DdBc
+            XezuJD/D1/DeGN0WbdDPxrLRh2by3kVvWw59O8mu9RZLP4VyXT2Azh37zUzjfYA+
+            SmdmLaoiQrswu3fPw/6v0E76M8BPiIRqVhqWTSCL4BOvuWpvCld0+ajm2YySahHS
+            XgHwhe29ZFpH8hJAOqkAdXV2b8Y3pvCARA2txjH5dmHHmPxEwQXFafpTb78B9tJX
+            JaUkGzL7UhWoBK1/uNvaxJEP8CDK4Bnob/OTr3vuIrgS6I9l5XKR00UBnwI0V/E=
+            =UG1k
            -----END PGP MESSAGE-----
-          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
-        - created_at: "2024-01-22T00:20:15Z"
-          enc: |-
+          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
+        - created_at: "2022-06-09T21:24:23Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAKcw7+HNlWoPMEjI/k2Vc6Ug6Sa4hfOILzeH429aT1Www
-            3q1GUhE1cugCw8WN/Dd5G7Ee8nGN+slU2oyxbOwLGfbiKTl5YDHgn/iNnnffYhK2
-            hF4Dub78fMESoMASAQdAyjWq8loWLP6rv8vdxypkadi2ttEeUX4UtXLZqj1ex2gw
-            ZsNVUXTfEQSRNCLO1lrUE8WUcTdFyQWEnUqL4OT9Zf0z3JXu74fYBqGnnl9wY2ow
-            hF4DM6AcvgVUx2MSAQdASLoUugWfDb2QqtSVAQTWyO+zSFFpQvhZSmFzRZ8/cUIw
-            teMcPN/7gN3GWINS9qBvvK49K7xdjwCON6BOR2G7MWkMlEms6AuYbfiXGskS9Pmq
-            1GgBCQIQTcFv2IJfbtWa8BXycxacXUHQ7pDj5XQREf78tKWm/TYcRvjkO7g+w/Jh
-            mptqnEP02ldpG/RFdi0gFOLMboXT39rgz4omlPQEOcngMhLqapPkn0lLIErBMpv9
-            z4uBLuh2JKx2dg==
-            =vcN6
-            -----END PGP MESSAGE-----
-          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
-        - created_at: "2024-01-22T00:20:15Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DLHeEFiC484ASAQdAM6/fp671Y1m9mmXJbA8qNaOFZuh496DRUGc18bQt+xkw
-            tHmgnMDdNnoWI61xI9+nXXPMVtseCy+5bnp3eV8WBfZiaWjawz23RTkACD4rPF8H
-            hF4Dub78fMESoMASAQdAyXCy5gcrYLY2aa6j7uOMpVEHgErkPkdEWYaBP2aSFAgw
-            JCt5VMs5mH3jeoetf6xsjXFZ0HwX/AiU7iziHhP6dF3YkNxAAMHz8N6Wxrk0kAVO
-            hF4DM6AcvgVUx2MSAQdA6IwZDGZyutIkapWVlyV8zKnV2cGyWDy6LbZOi4EFYzEw
-            1YrCol/KxrSskchywqtKrBguE7mnmLjKhs11kPkdcEVkVUKknLvEtXeyS9HntdzT
-            1GgBCQIQOuFVBYoAjjRL8IVUMrnkbVt2OHfhErvSpb+m8ynBdVgdVWkEoFCB1AZg
-            J+Bs2X9qpEeqQF9Y5bTV5bGxgt+7QBO5Mdbu+n8kKFW6L9M26zOaQ/rNZgjwe/CJ
-            qB63Om5VoRytYw==
-            =HXoQ
-            -----END PGP MESSAGE-----
-          fp: 403215E0F99D2582C7055C512C77841620B8F380
-        - created_at: "2024-01-22T00:20:15Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA08nOrzNSYBrARAAnWZ30736o1hjy/6IDmy2CDqkwDjzkPbA9jLSawVfFYID
-            VIh+OvP5A1LkEVRNJ4HHcRpWFkel6UY+oZZDG+vQ1FU56q9c+buDIxP74RX8bX1q
-            Rq/L1yaKINANKgM7IEePI8Cwogk1yQhqRni8V4l1dPItvmvS62Ziwx10Tyaytghn
-            MGP/HjJxnig3CnUQ4fyg/cH/p7YDJvlTLqNvtTt9UpXeT50KJzrDyTpaMLRy/6in
-            zq8GKu6PjaSg/8+j4n6UJv+2f7yJFmeDCHA6+f4G5fSbiVdztHhjgSImByNXOQwJ
-            /hDJvtAVLUd8I61l/23eej0ZcLC0jWpChhVgFP/06Aru8KMXnZmzp9DxU/ugZKKE
-            1WzEHyrS7Cpw8+W3IyR7RaGZoxVjJP+cRDExifRwF1X7m47yoqTX+opxTHJpVmIO
-            BTkz/SPrJNarSOFm4Whi5X/9fWp7sBWenE+5GhR1UxX1YfdYvNhxxHmyprpj0u6T
-            GTOm+gTbsrB+xFgR6HiT6vmHQq01y7r+CgdHsl3faYpEkXxFj5wIm/VNLN70bIfF
-            l8x0aTtb6XuKRR6LduUYk7urixf+m+qQT+RnqEh6P/hCyvtDTmEwFwBixVtVKct5
-            NSk3SGM/KGn1L5YSiV9mMlsXlc9r+bn1VqO0PFOarYAofJFVK8kKKJ6Mxpmc0KvS
-            WAHbJfLusF94/mhhmra0nf3cSbIhrWT/Ju4M0N/wOIqITe6G7/PmUFSaZX4BvW0R
-            LfP8xqV/yW+UAf74gfy71cChe+C/CAsrVDnyKbZ0e16msi4rFgS8sYA=
-            =jYcw
+            hQIMA08nOrzNSYBrAQ//dwgWnxN57/g6dsk1H1ekB0aYEY7tRUG540i5hsAVovZu
+            w6COdNawTCsd3LbwL6YjN8jNAD0KiRmrj7qPOwsUs2GBsOLLDIYg289uHi1lOP9U
+            YvFej2tbGht32yZc2oiFKLjs+hByTymunwtLLwks8onrLYHi5plxXSi6T0DZxlqq
+            jgIfs42wWbfs7Tc+XucrDe4PppIR8f0OlX2JlgcNEWTxLwZWwb6czJhL8772Gs+f
+            NVszm0ug96f5+QuyWiiW5Slk+IbYkB+9dRIAJMbdrKOOAj9xzczSquxfPHwmEFBg
+            7R1C/+tiNtkdKyqMEtQXYftxYIx5/2r5eX5fftByj9Z2cI1wlvUz0UfljFrlSd1t
+            3uqfTomNuLZuWOCIscYao66DL24zaBextmb029xDctaYAwrQzjwei7VbQcFFFoL2
+            vKT+twFCJuzO3gxYy1fVDgUKSkpELc8+ArhHeKzuJZTI4ycIxLyPhoQq20FH6dvo
+            QTXUI6dbz+Uxzy1eiJR/wpf4S7aZdrtjChhirTx1laG3WoR8IZnjP6LUAMYRHXYn
+            NkiSG05ReM1lEciUiXzH0qDoWxkBBpKr1e5x4Y+RetgHHwfcT/Wm4sDLqznxCgzl
+            zIZDrS74JYS+AKdCfIKOBtcpOV1CdalpPL0rL/HJYphdx1994PW7+Uj0raxaFvPS
+            WAGmTR9mYjo44Sovvey7u57Y8D5fH4m3pOGpy35nKfsUz6js3a5L6Q69n4j2aMeM
+            ceBjiAKtIH5SYx42cjZLKADAyYn8FOwthsUQrhttf6gHRfCSse3N5Aw=
+            =tuw+
            -----END PGP MESSAGE-----
          fp: 3176be14f468c6d43ab2206b4f273abccd49806b
    unencrypted_suffix: _unencrypted
--- a/machines/okarin/README.md
+++ b/machines/okarin/README.md
@ -1,14 +1,8 @@
-<!--
-SPDX-FileCopyrightText: 2023-2024 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
 # okarin

 ## Hardware

-[Ionos VPS Linux XS](https://www.ionos.de/server/vps) S (1 Xeon Skylake vCPU, 1 GiB RAM, 10 GB SSD).
+[Ionos Cloud VPS](https://cloud.ionos.de/server/vps) S (1 Xeon Gold Gold 5120 vCPU, “512 MB” = 443 MiB RAM, 10 GB SSD).

 ## Purpose

@ -22,50 +16,32 @@ Okabe Rintaro is a mad scientist from *Steins;Gate*

 Much like the namesake,
 this server requires a “mad scientist” approach to set up.
-However, it is much easier than setting up its predecessor,
-which had just above 400 MiB usable memory.

 Ionos does not offer any NixOS installation media.
-I could only choose between various installation media and rescue systems.
-Also, installing NixOS with a low amount of memory is problematic.
+I could only choose between a Debian installation media, Knoppix and GParted.
+Also, installing with a very low amount of memory is quite hard.

 I therefore created a VM locally with a disk image exactly 10737418240 Bytes in size.
 On there, I installed NixOS.
-Because encryption with `argon2id` as PBKDF is quite memory intensive,
-I had to tune the parameters to ensure decryption was still possible on the target.
-This can be done quite easily by interactively running the following command on the build VM:
+Because encryption with `argon2id` as PBKDF is quite memory intensive, I had to tune the parameters some.
+What I settled on was
+`cryptsetup luksFormat --pbkdf argon2id --iter-time 10000 --pbkdf-memory 250000 /dev/sda3`.

-    cryptsetup luksChangeKey --pbkdf-memory 100747 --pbkdf-parallel 1 --pbkdf-force-iterations 29 /dev/vda3
+To make btrfs use its SSD optimizations,
+I had to force the kernel to see the device as non-rotational:
+`echo 0 > /sys/block/dm-0/queue/rotational`

-The memory size was obtained by a successful run of `cryptsetup benchmark` inside the initrd on the target.
-
-However, since those parameters are not ideal,
-the following should later be run on the target host itself:
-
-    cryptsetup luksChangeKey --pbkdf-parallel 1 -i 10000 /dev/vda3
-
-This will determine the memory usage automatically,
-use one thread
-and set the parameters so that decryption takes 10 seconds (10000 ms).
-The memory usage will not be as high as it could,
-but it will be better.
+Another problem was the usage of VMware by Ionos.
+The VM I set this up with was obviously using KVM/QEMU,
+so it needed different kernel modules at boot.
+What worked was setting it up in the local VM with both libvirt and vmware modules,
+and then removing the libvirt modules once it was installed on the target.

 Getting the disk image onto the server was done
 by first `rsync`ing the image to another server (to allow for incremental iterations),
 which then provided it via HTTP.
-Using the Debian installation media in rescue mode
-(as for some reason most other options tried to cache the file in memory and became very slow)
-it was possible to write the image to disk with `wget -O /dev/sda http://server/okarin.img`.
+Using the Knoppix live image (booted with `knoppix 2` to avoid starting the gui),
+it was possible to just `curl http://server/okarin.img > /dev/sda`.

 Because of all the pitfalls of this,
 you probably need more than one try.
-To make debugging easier on the target, the following option can be set:
-```nix
-{ pkgs, ... }:
-
-{
-  boot.initrd.preLVMCommands = ''
-    ${pkgs.bashInteractive}/bin/bash
-  '';
-}
-```
--- a/machines/okarin/configuration.nix
+++ b/machines/okarin/configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2023-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { pkgs, ... }:

 {
@ -16,12 +12,27 @@
    nginx.hardening.enable = true;
    full = false;
    wireguard.home.enable = true;
-    infovhost.enable = true;
  };

  networking.hostName = "okarin";

-  system.stateVersion = "23.11";
+  system.stateVersion = "22.11";
+
+  services.nginx = {
+    enable = true;
+
+    recommendedGzipSettings = true;
+    recommendedOptimisation = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
+
+    virtualHosts."okarin.sbruder.xyz" = {
+      enableACME = true;
+      forceSSL = true;
+
+      root = pkgs.sbruder.imprint;
+    };
+  };

  networking.firewall.allowedTCPPorts = [
    80
--- a/machines/okarin/hardware-configuration.nix
+++ b/machines/okarin/hardware-configuration.nix
@ -1,49 +1,46 @@
-# SPDX-FileCopyrightText: 2023-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { lib, modulesPath, ... }:

 {
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
-
-  sbruder.machine.isVm = true;
-
  boot = {
    kernelModules = [ ];
    extraModulePackages = [ ];
    kernelParams = [ "ip=dhcp" ];
    initrd = {
-      availableKernelModules = [ "aesni_intel" "ahci" "sd_mod" "sr_mod" "virtio_net" "virtio_pci" "xhci_pci" ];
-      kernelModules = [ ];
+      availableKernelModules = [ "aesni_intel" "ahci" "sd_mod" "vmxnet3" "vmw_pvscsi" "vmw_vmci" ];
+      kernelModules = [ "dm-snapshot" "vmw_balloon" ];
      network = {
        enable = true; # remote unlocking
        # for some reason, the DHCP server does not transmit the static route to the gateway in a form udhcpc understands
        # this works around this, but is arguably quite hacky
        postCommands = ''
-          ip route add 85.215.165.1 dev eth0
-          ip route add default via 85.215.165.1 dev eth0
+          ip route add 10.255.255.1 dev eth0
+          ip route add default via 10.255.255.1 dev eth0
        '';
      };
-      luks.devices."root".device = "/dev/disk/by-uuid/1dcb9ee1-5594-4174-98a7-a362da09f131";
+      luks.devices."root".device = "/dev/disk/by-uuid/67f2990c-636a-4d80-9f6d-7096fec9e267";
    };
-    loader.grub.device = "/dev/vda";
+    loader.grub.device = "/dev/sda";
  };

  fileSystems = {
    "/" = {
-      device = "/dev/disk/by-uuid/3ab8f4a7-952c-4b6c-93c6-7b307d5bb88b";
+      device = "/dev/disk/by-uuid/8e3082d1-4af3-4d5d-9fde-d30dc7552d41";
      fsType = "btrfs";
-      options = [ "compress=zstd" "discard" "noatime" "ssd" ]; # for some reason, the kernel assumes rotational
+      options = [ "compress=zstd" "discard" "noatime" ];
    };
    "/boot" = {
-      device = "/dev/disk/by-uuid/97aec56b-5fea-4445-83dc-4a20dcf482ce";
+      device = "/dev/disk/by-uuid/883c77e8-53bf-4330-bd9e-89ef71ad9518";
      fsType = "ext2";
    };
  };

+  swapDevices = [
+    {
+      device = "/dev/disk/by-partuuid/d9cf5716-25c8-4f72-80e3-696e0dfe1079";
+      randomEncryption.enable = true;
+    }
+  ];
+
  zramSwap = {
    enable = true;
    memoryPercent = 150;
@ -59,8 +56,16 @@
      eth0 = {
        name = "eth0";
        DHCP = "yes";
-        domains = [ "sbruder.de" ];
+        domains = [ "sbruder.xyz" ];
+        address = [ "2001:8d8:1800:8627::1/64" ];
+        gateway = [ "fe80::1" ];
+        networkConfig = {
+          IPv6AcceptRA = "no";
+        };
      };
    };
  };
+
+  # no smart on virtual disk
+  services.smartd.enable = false;
 }
--- a/machines/okarin/secrets.yaml
+++ b/machines/okarin/secrets.yaml
@ -1,80 +1,52 @@
-wg-home-private-key: ENC[AES256_GCM,data:RkdgneGhH7prr/tkvHJeChQku2eXve9pV/SvtwsOjeinYO9veHw0rimdonY=,iv:vK6zNpu8F+TSLDTaif686Awjhs8WS2XJHzMtlvqlsIM=,tag:aKhV+kspVu+0CgPmYersxw==,type:str]
+wg-home-private-key: ENC[AES256_GCM,data:4L8aIvgFi+mBjnyVy5IkPaeJRadJ5NCKZprSkBPwMNiVaIscjAdp2yinBSk=,iv:6pBo+6M4EkEjz184XvisWXEoomqJXa4M8Qa4nJHI65U=,tag:3DEsmA2xxAlx/PSbD3HOIA==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age: []
-    lastmodified: "2023-12-25T22:06:33Z"
-    mac: ENC[AES256_GCM,data:VbjyqrqDLCBDD9vGOHxSzsr9a5ZFFBJUkBRxJYBLereMDvInPFZnTwplHHkS5TdDFFAsjrcCgpCuPsUIbDdxFUNNtjdIe5JJwFMwT8XEFrgcswMGSKD6mIH2VBWop5pqoAV0eQ3YfKtDyhNHwixR8a+Z+hbGAY01Z19yteo51ZM=,iv:69EeBag+iUEoa18I0w1HeJKRwSQVCMRqUdV2CzUzMnY=,tag:WViKXJExL33jQAIWHUS8xw==,type:str]
+    lastmodified: "2023-05-06T08:49:32Z"
+    mac: ENC[AES256_GCM,data:B7e3sh96p2DlqM2SgHWoJ7RZ2q5tnZ6lohNc7UKmwG1HTkrPKW/6jobW2InQnbZn1bPmCERoJIF9QyUz+OxotTiKIXxSL7BJkkfpIkWy9IgjIeADjevHkplm2rXONiXaM2sD46bPKbuRzuhbCZtNwUH74gTVfKPVLVrzpnPRC74=,iv:TTXlBGhO7xLCC3Ad+xiQKmy4b0n0vuQRaCdoe7vpzSE=,tag:dZCharRGK//w48ePu7d2eQ==,type:str]
    pgp:
-        - created_at: "2024-01-24T12:19:03Z"
+        - created_at: "2023-05-06T07:18:18Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdA4PdmtZTlpcdfuYKSuKN6X4EGjh/l2D8Jxt7dg1y/Z0kw
-            ScG/nWs9hVMFTBeqSM0eHgFfcZhBB/L85eNf9thktTUbcWq0GEUcz5mwUqILtkfA
-            hF4Dub78fMESoMASAQdAMcVZokes0YKtbUZp7b9zq303WXPga5yn8LbhnaRrHycw
-            +ECn4t8y8SXFICpAZ5n+xj5U8MdmdKOzhNQLleFKIHtWdyeUlwFi0qYYP8MRCLTB
-            hF4DM6AcvgVUx2MSAQdAIzXqgZ8WiIxIV05BumWLsyZUChwvDQc47NMd5ehhBEQw
-            I1LY11LTNENypr5q0mhy615kIbsdhpzAVLf4Bkf921zABsfFzuY5zJHqi8SKVm7/
-            1GYBCQIQHPC99/GrpHG703gozt2I0P2XMhlRpzj359qStWaQZ8NBL5Ugo5BLvphf
-            1/WYAlvnH4Uov2TxKdQs65IJSadQgs7lBWB5gqHklZ76E4Q+00oMQxwGjzMdddA/
-            hRlLbnUDE1Q=
-            =ol1Y
+            wcFMAwDgSONkM+d4AQ/+Mg9Zf4S9cmANlMgjcq8aj2ynrW1roKJGHiVqHfuL84Ua
+            yv32BJegPbybVAcQLDU7V7lgtz+5cbkvkPYJSeFT97q0oNUCgoXxSRWu3sNtbXGc
+            Zph/Q5YDgRll96n1Rsz5eJr6exd6vtikuGGx7XXLt2PIuT0u9ROcCntmFQfkPKD2
+            Phs8dcsAI8R8JtVur+cQGBWAtPhmII1nY/oHbyOktD0eYbRQ/+0jy4ja/NosSOqG
+            KXPdUCvS6ZJeB6jwFeX4iA+s6xwDB824wSGOUyV5QqAwAuQvaEn/4J4OD/FD6vjy
+            lk7FoTb24ukQFFHrpl6vv04R/7Hc47EGBCI3K+zL4yw+X9hGw6CNTOH3J05J9Da6
+            iUxJE6adyBMajS16b8oGVmfLAv7Fuf0oIYDJYGehqWVEEVEEa+7/mvir6nQkyK6C
+            96vxfP9C+vaJslLm4mrsCS1oXOoX/nKs3uuURKIu0a0IWfP+zFA0tSzbugllndCN
+            wQgB+pOA7dHpyhQcbKgtLNONAudMsOTdApYE0Hj7n2GL7l2SBc6lJRRFx80JYago
+            TFj1mUi1Z3gh9JxDk55XO4YSD1lgRXareb6eamSNB9cmujzniRczT2Ktc/5J7k82
+            dc8X1YNn2sz7uO6tba2t6Gn7t4rkff8wr/7SP2oNdmduaj413wQnJwF+zOpzIAzS
+            UQFxypUHMwQf5PtUs7hSA1Evo9XTZg1dGKNr1rQJR0tV2advXaymOKmunVxVdovX
+            KrEkT9ON9BqHMJ08ZSwFdHmw5nFHhCVQUcziyYBzG9GtoA==
+            =2yjm
            -----END PGP MESSAGE-----
-          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
-        - created_at: "2024-01-24T12:19:03Z"
-          enc: |-
+          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
+        - created_at: "2023-05-06T07:18:18Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAaXq+nn0DDx+RAkEC+x+yeP5xbCIdXkR9tQCgWx1s0jkw
-            VRgFkiBa6IsS0vmYknobXkizETtNjEhJ8vNw9nP0zPdjuUZBId2/bJZa7aFdIFRU
-            hF4Dub78fMESoMASAQdAMLbBcLnc+5UVDsx50SgCVjQoHO4JGE53DE6Q+frDEiow
-            rVFbLxWlJ/aw9baRdKUMkIUJftnImUQgolXvEfUjdS/oOdY69r4psLlHLQX11Ow1
-            hF4DM6AcvgVUx2MSAQdAUZV3q/IXwUbRv9EokTe+4o83XzeS1h4GK3/3wjnKDHkw
-            xHFJR2clEMDlaq7Rx3FTr2a7MlzSnzBLtIwdw5b9ytuRvHjD5q7zCf5bihYnvdjV
-            1GYBCQIQFt+CYziUXtEHjJFC1t+S3qkyPRAsVgZL8WlxbKzteW0NOdIZofHx6skG
-            Ebn8aadKcGg534DkwEt5DpIosXKUx4LN5xsCNoU9dHFYMSFE2nzJE4KNFJ8tzRQk
-            G+tyNMgCYhM=
-            =2QnY
+            hQIMA+X8PKo7gQeqAQ/+LQlvZXjbIhj8ph2io9T5Si9ZkexxPBh3t8f6pOCyAZro
+            oI50vx50huckq1OV6zxuHYdnGD2rUpgEPXxxVTf3vKgAw2pIIPHQJn0G7xOO4/6a
+            dyIHxCU+iwZmAzh1Dkxxx9yr6z1CaDhdFCSEbwKEIuOZi/VAserPVJU7owRCIR1g
+            pphBTnOwL8hUo69JRUtZkG4lrLDRNcksn+uPNH6WvCiE6OTw1tI+qCqEFzHXKUMB
+            zmH/caMZFM2mf+wUODmH0y8adn0A9Q+vBWEjfwQ0p7LUmTscZ7ipytt3EjyJ3WxQ
+            t7vqXacm5Q8tlCVnByYUQEcYdJPJFvOLAhwDTcqQSwajq+Gee0uQyOTaNh9ZOl2I
+            5pL1yiLgBMg3MlUwkpZM3usRvSvdPmiv+cR8TrrWPq7EYpdrOCY3v3trGsYE+x/e
+            fw1oRUItvv1cPXMWEKpwEX+2ueN7BTRrxujkor7z9FAN4SAw6XbO4YTLw8/0r+/2
+            2SlQPO6UBGO4nj+f1kC2FzFxkLDz0AYtEXpNa9WgBVxMuMJ1c3jrJ11dhRwrlDyL
+            h5d6Aov+HMW+e4pdAVDI1z9lZ6SWVpCZG83PuAkOXdFWiBOoYt70BM1rLn2w1bBn
+            vfC8pOUaWNTyrfrW2GdY8QOoKPLkk8Lm1zaUWQ/J7/jErMTQRhp9cULLaQ+nKkrS
+            VgGImUPZROF6VMQPlKcm7ZMTpUP6XyuInbh/GlaRAaULGXEqQ7RqBDI4HXED5w6G
+            GPUmbAlFZmRTELDFekdI3N2i0JgEMaZVlzNbnSHXLcyJbEtjDWa7
+            =qBwQ
            -----END PGP MESSAGE-----
-          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
-        - created_at: "2024-01-24T12:19:03Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DLHeEFiC484ASAQdA6ojEbZ8HccTtorNbyw9aVKO73AJy6jTGV/qLt+FWoRgw
-            SsOLiL0UmF1OV7zmXE0ihkWivPqLHtp1U89aYucpAA69DIh4+6M7GUk1xDMxFfRo
-            hF4Dub78fMESoMASAQdAV2z2DgUz2xWopnDzXywdpHb9eMe9ZxdABxpOJ0ECeBww
-            wOC1x+IKIbIRZBDL7jbVUOk1G+GzCL4M7/G7XFSTFYMKvMKkc0Rh69pywFuGaqG8
-            hF4DM6AcvgVUx2MSAQdA7bKGjcW81bzf58FlGGVDy/HjNyuEPNSVZXy0M+/WZAcw
-            3iXR9MecA97bKKKhLyNSdYmYlAjZJVIdwd6vjNWjxaB7BIWTYhudTjHesLMxB0vc
-            1GYBCQIQlp1TDaBVxalDkeCEjDMRFatgJ3CwulzzW9B8qywOooS0BNtNbtTKGwEh
-            AxDL+wdeqkPABQ0wQ8hYGOw5z665jEOC2JbqbQ7N6LPQZRx/MowO2dGT/kKh2U9H
-            VOK1Bc67BzU=
-            =3z3V
-            -----END PGP MESSAGE-----
-          fp: 403215E0F99D2582C7055C512C77841620B8F380
-        - created_at: "2024-01-24T12:19:03Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA9pmsZ2EWzFWAQ/9Gl4dO83SmvGHyhEfile6G9ZUmhxwU2RFpPwEmjh4CV/v
-            z1k2zgdF200a6tj96977VhjhIG/LZioEi41M1QdIqgkGsKy89DluCY9RDTqMmqzo
-            w65JhI+PQqdQuKlsbUh2VLql7LijoIUxuBPowWG1lULZtEvRuCchM5rLFiBSC2YO
-            DA0T73kC2P89CNZlOllZNnVRCRrxm7IsEO6Mo1yOeJL16mYqC9qGGKnvYEbsSm4n
-            7ZZJvxXGnNzaXisyyjcJNgtsJAUX4TTlPH+Y2jpkhdHUvOkiwVQEokmnqTIKUp0e
-            7Dc6ZXApFQ1DlMMsjLwy+5AQJQZbY4p4jo9rvmON5i5DLPy4rN5yf8W7zwkuy2gN
-            Id53gxDZxHw0+mRsfYRrdOvmfUqqz79TyWVV8bvHR2Mo3shdL1fsWOzTlm66Y9Vt
-            4coJxgUsJEFdnsnXAFep2V18Ypg36b9wQXtZDXWtTg36UliZZ95sUAG2vHQDS50b
-            5XG07m1w8YgQSeiCObteAt4PqxEs1GYWmtRUmr4jvRQQzmVXCQP6+o0QJ5WK9bKl
-            auwT+H7POBJ3l+h9ykvmOidkAzeN7EWIirzvhDHsxvCklGCyo+Y3W5ZaLaFGfc/3
-            pdj1G/REVT6aQMtSuYUsD7QoZeiNNBNJXAtUuUS6mWxch8RnkW718wxYZLvi03jS
-            VgHaVWepbw/q0COmjyofCt1qZH+WMKSAguiQ6PHWAdP3hnzGgd7Qo84W54Fb3m1R
-            da72FFnILc3IYImbJI6QgJxAeS2K95nIWKdSix07c+m0zzFkemnB
-            =F0pC
-            -----END PGP MESSAGE-----
-          fp: e7370b48016c961ef8ad792fda66b19d845b3156
+          fp: 868497ac4266a4d137e0718ae5fc3caa3b8107aa
    unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.7.3
--- a/machines/okarin/services/proxy.nix
+++ b/machines/okarin/services/proxy.nix
@ -1,12 +1,10 @@
-# SPDX-FileCopyrightText: 2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { lib, ... }:
 let
  proxyMap = {
    "sbruder.xyz" = "renge";
+    "nitter.sbruder.xyz" = "renge";
    "iv.sbruder.xyz" = "renge";
+    "libreddit.sbruder.xyz" = "renge";
  };
 in
 {
--- a/machines/renge/README.md
+++ b/machines/renge/README.md
@ -1,14 +1,8 @@
-<!--
-SPDX-FileCopyrightText: 2022-2023 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
 # renge

 ## Hardware

-[Netcup VPS 1000 ARM G11 NUE](https://www.netcup.de/bestellen/produkt.php?produkt=3563) (6 vCPU Neoverse-N1, 8 GB RAM, 256 GiB SSD).
+[Hetzner Cloud](https://hetzner.com/cloud) CPX21 (3 AMD EPYC vCPU, 4 GB RAM, 80 GB SSD).

 ## Purpose

--- a/machines/renge/configuration.nix
+++ b/machines/renge/configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2022-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { pkgs, ... }:

 {
@ -13,39 +9,43 @@
    ./services/buchborgen.nix
    ./services/coturn.nix
    ./services/element-web.nix
-    ./services/forgejo.nix
+    ./services/gitea.nix
    ./services/grafana.nix
    ./services/hedgedoc.nix
    ./services/invidious
-    ./services/mastodon.nix
+    ./services/libreddit.nix
    ./services/matrix
    ./services/murmur.nix
+    #./services/netbox.nix
+    ./services/nitter.nix
    ./services/password-hash-self-service.nix
    ./services/prometheus.nix
+    ./services/psycho-power-papagei.de
    ./services/sbruder.xyz
    ./services/schabernack.nix
+    ./services/wordclock-dimmer.nix
  ];

  sbruder = {
    nginx.hardening.enable = true;
    restic.system = {
      enable = true;
-      prune = true;
    };
    wireguard.home.enable = true;
-    infovhost.enable = true;
-    wkd = {
-      enable = true;
-    };
  };

  networking.hostName = "renge";

-  system.stateVersion = "23.11";
+  system.stateVersion = "21.11";

  services.nginx = {
    enable = true;

+    recommendedGzipSettings = true;
+    recommendedOptimisation = true;
+    recommendedProxySettings = true;
+    recommendedTlsSettings = true;
+
    virtualHosts."sbruder.de" = {
      enableACME = true;
      forceSSL = true;
@ -59,11 +59,6 @@
    443
  ];

-  services.postgresql = {
-    enable = true;
-    package = pkgs.postgresql_16;
-  };
-
  services.postgresqlBackup = {
    enable = true;
    startAt = [ ]; # triggered by restic system backup
--- a/machines/renge/hardware-configuration.nix
+++ b/machines/renge/hardware-configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2022-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { lib, modulesPath, ... }:

 {
@ -9,49 +5,40 @@
    (modulesPath + "/profiles/qemu-guest.nix")
  ];

-  sbruder.machine.isVm = true;
-
  boot = {
    kernelModules = [ ];
    extraModulePackages = [ ];
    kernelParams = [ "ip=dhcp" ];
    initrd = {
-      availableKernelModules = [
-        "aes_neon_blk"
-        "aes_neon_bs"
-        "ahci"
-        "sr_mod"
-        "usbhid"
-        "virtio_pci"
-        "virtio_scsi"
-        "xhci_pci"
-      ];
+      availableKernelModules = [ "aesni_intel" "ahci" "sd_mod" "sr_mod" "virtio_pci" "xhci_pci" ];
      kernelModules = [ ];
      network.enable = true; # remote unlocking
-      luks.devices."root".device = "/dev/disk/by-uuid/dd131862-29a2-4464-8c7c-5a3fd1bab8ff";
+      luks.devices."root".device = "/dev/disk/by-uuid/75f9aa9f-bb40-4d83-9f81-18e4f2ce8d57";
    };
-    loader = {
-      grub.enable = false;
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
+    loader.grub.device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0";
+    kernel = {
+      sysctl = {
+        # Swap should never be used unless the system runs ouf of memory.
+        "vm.swappiness" = 0;
+      };
    };
  };

  fileSystems = {
    "/" = {
-      device = "/dev/disk/by-uuid/31412044-8ef5-4f02-bbda-55af44e344cc";
+      device = "/dev/disk/by-uuid/5905aaff-e4aa-4abd-a1cc-f93acb0762ac";
      fsType = "btrfs";
-      options = [ "compress=zstd" "discard" "noatime" "ssd" ];
+      options = [ "compress=zstd" "discard" "noatime" ];
    };
    "/boot" = {
-      device = "/dev/disk/by-uuid/40F5-721A";
-      fsType = "vfat";
+      device = "/dev/disk/by-uuid/07908c38-d35a-4b25-9934-31dd8da9959b";
+      fsType = "ext2";
    };
  };

  swapDevices = [
    {
-      device = "/dev/disk/by-partuuid/3143e511-3247-475c-b7c8-52880140bd7b";
+      device = "/dev/disk/by-partuuid/552e77a9-40d1-48e0-9439-0a3c2b506a80";
      randomEncryption.enable = true;
    }
  ];
@ -67,9 +54,12 @@
        name = "eth0";
        DHCP = "yes";
        domains = [ "sbruder.de" ];
-        address = [ "2a03:4000:6b:d2::1/64" ];
+        address = [ "2a01:4f8:1c1e:88cd::1/64" ];
        gateway = [ "fe80::1" ];
      };
    };
  };
+
+  # no smart on qemu disk
+  services.smartd.enable = false;
 }
--- a/machines/renge/secrets.yaml
+++ b/machines/renge/secrets.yaml
@ -1,92 +1,60 @@
-forgejo-mail: ENC[AES256_GCM,data:3AlFHzVBA5TE4qv5ubG39K0varV8/HabO0q/RJZSD5o=,iv:qB0b5nR4oxhmWFkPaded6N8NDlAw9EK9z+xb5SmyCME=,tag:jguaVqFRBzU42K/69F8CBA==,type:str]
-go-neb-overrides: ENC[AES256_GCM,data:1xy+SdsSTuerRox4skitg1mKLr1MoANFoCzz76TKSA31ORo/oUWVGrYxfusZxrFQWjYGRFpSYzmkzPn1RoWmbXyfwPEcisvjenXLNvwcyoontBd7TiiLdukEtya6RfGLRGKc8tfCzbDUWgiYz5IDMFBvKGnewFjB+au0/Ge2+2DTw6M4negjCz343TO/vbyTr5xT/5smmKz7Ouk9SbEo7yEuHkQPQfedGw2PYT82zdXd/Eje3Zq2EB4xcUU7beGrF1zkOdXQ4OVqB8XnkCnuLtNlnJtsffm0rbPDPD3/nhHKpJ8jXrN54V14dSnHW7yOifGMIus0VFMRZcIT7A+BroM9qzJhW3F4gsF1Bwp0CF+6zLLRjgpA0EOyvOwpLIftBZfMIpveAH62MVY0IBfwDdkI1itEOjj9EhTrOGxBx45Cj6Qk3Mk6ncyr15+E+KAmQRxZJrEW8Grk4PyzuxtxYd0n8LSaRUe1eNVUhHkQNpo/zvAPgrzcRnM91EwIoMvlNmwyC63j1h+OBKlXQgChAaB1O6HFXQY=,iv:pnw0jIcMqA771woDYNHxWMWE6wHGaNsXi5aBXOFAHJU=,tag:Wbcqb0FsctZWOS6u5s82mQ==,type:str]
-hcloud_exporter-environment: ENC[AES256_GCM,data:5gDTeg4C08BgNxBFtzZ7ma6JiafwF4ly5URAG4WxUTlRaUmF32fmbPdAZmveKiKBA8cc6ewcEIfIVJ7d5tbbqCEX+vbf9nr1fuhN05Z6lfsJNLoATclX,iv:GzEnudGDc6+6BJgDtaNnOnT7IK8Z0fsYfs/oJzKO2UA=,tag:LYCvRxNeKdMmNve0aWswrw==,type:str]
-invidious-extra-settings: ENC[AES256_GCM,data:bThgfyu5ESIyTLD7Q09Qici9ZZw/QYfCyBSjtbNb1EglCy0KHZrvDDAN4uDpdKrHxv8ctoN5Db7tRf5LUl6iyW7A5z9uYg481EXq3Sx6tZztepX0vg==,iv:FZ33tQWRsNEPjwuy/mH/N4e4PyjLx7sbv2G+9S5uigY=,tag:0GQn3AgoM2BPC5iCt5py8w==,type:str]
-mastodon-mail: ENC[AES256_GCM,data:RT/fS7cqbcePd2qe7CR5jRh2jtKaS81ICbMUOlPUQsY=,iv:C7GYMB0U2KIfXuEnYaoIEfV89/EnJS6V9iG97X8zkPk=,tag:L4SVe6aYGcarvX1hmMqQOw==,type:str]
-murmur-superuser: ENC[AES256_GCM,data:hPuMK8wbqD/3qKXQbOActq/VJZ+6jFlddQ==,iv:68ZhkpkfxakCOYxFXkCSP/sBamETeSs4CGTRaoBS6co=,tag:5UuYCxDiJ6e2CXjDV5/5yA==,type:str]
-netbox-secret-key: ENC[AES256_GCM,data:lOE95j6CGkbfJQTLeG41g3BPKNhm0arqxIGAzwvXQyeZLBauAdqufQGKD7D4kPNzdZs=,iv:6HWXEr6Ju4IywP+2jpuTfER/bYI2oUgMSZEJCkq4XX8=,tag:TPD5TTr4Sew8lxPS5WIu5Q==,type:str]
-prometheus-htpasswd: ENC[AES256_GCM,data:tiewfUfpvrmbrgk6AsBdiP4ng4TqG5UYf1mFcWOzuk8oO55rfZu+Naummz5RRYhJZil43nHFvn5LfIWkJv+CyPMZjpj7xRp4vb4/OCCAFjEzHhrzYVBYNkHM+ZLUTewEXuPVtZ6CZ5uviTExLN2V1moG3ExJdIoyUD16qh4=,iv:SkH609VxIVKJLmHUUNzICEjxHSyjLdwXfw0b7iU6png=,tag:BfNGcUZmk9ZXUvhoQZn6iQ==,type:str]
-restic-ssh-key: ENC[AES256_GCM,data:9quBzUwv4qylVzESG94wSgzvuodSDM/smPh0j+LYJjXwEN1xksBIW2/Jv0XmF3Q+AWUF/C/lA2jteI3Mf6Pmn7zlqa3H7GwH8Os6/arQI3ywH2dHQLAFxgST2J0AlLGeZcJbntxW0buYw+Rz3q5Jbo+Wo9tQo+2EVvqX320qWBsEwinnahbUhZym3fipyE9g6JxGa3OFGiIn6JAQhst63WgpOfehQsAYu2bdW1gLrgFtURzDQQRQ28RxeD+nMUWRpQcq5GrX2rfSA7sengfQbmP3Ln1atp1YXctTalHsj+n4photBqLz6OfLaFKBqbdKRbinUgVAEarAocEOKk/qf1C6LS8yKjV9Mh/tKeCJQrCI/AccEP5DfMNqdRaWjoQxvjBRKaupPE7Rcuja++K/jm24nP9J8WDcrRSm0tlrVq2JnPHxJv+eUsZoGkvpyOs9AkTG1H2BCckYS5ZG4atjKoBfUvc3CitPNmPZcjSkPrkdRMZbu1BWR+cixFH9rFAUvVIn+e7sWGnqMA8xGXZS,iv:rLOTtmIFP7rwF9JY9ardO9pNqNh1uaobHKtQaGwSuGk=,tag:pCd4ZV0FjfD18qj9oQ236Q==,type:str]
-synapse-registration-shared-secret: ENC[AES256_GCM,data:qwUjGPINIuBC3KYqMPmnU3l9uJ85DJsJFixvTFQTSuR+fcq6DEjx03Xk41ff7NJftAi+Gt0QLdqKp+viJfW7eU6iHKyfcgPE/nj46UECCWLM8HISxPFQ9IrP+DIo02k=,iv:C9jhBPexth+gnAs6+DBtEmP2qsWZoKmgw6ILbtXUScA=,tag:M3U+03I0Bj8Nhuu4GB98xw==,type:str]
-synapse-turn-shared-secret: ENC[AES256_GCM,data:9MAsVAEnoF703p1enN70BXqlKZWacYmPCL25CNGdapZulGbMF5rAbpLxkJ3JiBNBYQt+DXSSb6zcmsT6yIqQZ4lW04lwtFV0RPJLfbfW9vUJQ3Bi5NUF,iv:keDUMEeintOwbBQzHHqVl8EFyQC1zqKG2LDvnBFSBxE=,tag:ymSwjZ+qC5kLIxMxlxwcAQ==,type:str]
-turn-static-auth-secret: ENC[AES256_GCM,data:HyFKdLn9yClXwVGv4/UcC5QfnqjTK2ui43/SRJiJYC7soP+BZnbtCTFkVe04H2smRQQi9ftrXLWQQx5DdGZxpg==,iv:tIwZcq4pVzWa1bl7zX/YsEuaVCyDenJnPGL0RhF9lmg=,tag:ddXaLQ3U990eupAHLyXx6w==,type:str]
-wg-home-private-key: ENC[AES256_GCM,data:5mj3Z4V+EidhQ4cjwBwarGUnsmCoNUP/P09Oeq24rrfM2yr4LhxXqEWVfKA=,iv:90PD4O9jBRF9qH9xmoYBP1dHmtQiY1dK8QvuJ5NceL4=,tag:xGU1VrEiMnEdQCNB4BqnAQ==,type:str]
+gitea-mail: ENC[AES256_GCM,data:593Ks8r3W6i7oTsTu7d9NUQpeX64l2bU9/fo6jYHkPU=,iv:NLPh2B85CWmr9n8mbB/XrprG8kfu9AR3v8PqjgEsIjQ=,tag:q2fPoOtuFrEmXIe7Rvfj2Q==,type:str]
+go-neb-overrides: ENC[AES256_GCM,data:nogN8wqu5U1BXIAZwgKpTFbOvt18lVu/slJiimz0eJXi2UODokkHhCePGmiqaf+O7YUF7TQBriAas0MtwsDpE8MJIM2Y6rI4padW82WUjbUfiYNkqX04w7PO0uLPqApSjKVg6EoVi9Bta/03qBKQovvOnY/nDfuk81rQ3BgNnsuQn7vuNMx0UlsrN+sOryufz5214decJuAbTreMEWE1+9KBPgu2bxtaPrE4Wns5pSDYK6EjmFabe4xufIBxO5F36KzVmUojx2ZBiybYJr+LAy6xhMFE/SLqOClYn4bo7B8yt5v6zamrVTsyliqgs7m8NkJ3v3IkfCXStXgf+niWodKOfpOjEXNEOmV7FeNQurBvGX7cNeRz6wIw/gly/v2VRVz0trZ+A1pFXfmUYyj/yjfQRB7YSt694rgzo3IoDzqEuz28X7hrqdxERSUwnwh8ZdAClnjz3C6gcPHky4iZeLmB59xq/7FZN3wrpBwjNR3VCVFQh4KE3beqKJYEbNquA+NX7JJ1rlmBciIsBtFg4T4ItHr5HsY=,iv:ivOY92kz7Ibtog1drbWYZmcimYJYdCwzxFh2bWSmQx4=,tag:aaz7Kjv2YQqvdm6WGWvuRg==,type:str]
+hcloud_exporter-environment: ENC[AES256_GCM,data:EtGDTr7bnQeHAx1TjzmMSGFaiuZM7AzGIyDiXhfd2V9mVF7ebuaWnMw3ioN4gbvXT5rrxkFr2xNj6IoVl/oPgjdWxg32zwT862zWMwvbLTRGMYDUUovF,iv:+u9vx4A4IoPLIbwzagm4R31aQ9bJzMWFOc4ui62dgcs=,tag:oh9bOyLGOCBgujZvMJNmQg==,type:str]
+invidious-extra-settings: ENC[AES256_GCM,data:EdQ6Kivp1FwGqcSm3lT/phJ5NfP1WiV8lugvhEaQFZU/Fa/e9LP70F0H1GB0wy68qCjr2gMPaeE+B96Nmsy6Twuyp+CqrHw2suMuUw5sKW1E+sbomw==,iv:87TB5i9fz+0TYtV2ElNmFohsxStxcnM3V/Kuv7pbcT0=,tag:5MQNWdknw5IiYsrJv3HoJA==,type:str]
+murmur-superuser: ENC[AES256_GCM,data:Jac1Vs3tiSmL/qLwDhPhSoVzMNT0nAP+cg==,iv:ReUkEjCkEqUJKzHzIKdp77szhHitiDBXaxQnNWKQU9c=,tag:HfVrtSJwDPrHgZlKxcUiuA==,type:str]
+netbox-secret-key: ENC[AES256_GCM,data:OBsB7Lj66AvgXIvieKnZo7AwGavi1rQ9RG2sJihxoHjJQjvbu8/kIKsiBC2o8mTTlxI=,iv:yqH2BnN63Ag4dgQr8iTA2V0WUw0qYaOTeVG/2PN7EL0=,tag:Ne2vh1GA0BCY5jh0nylgtw==,type:str]
+prometheus-htpasswd: ENC[AES256_GCM,data:glClg69iOdFMKNtQexg38+81aLkxD9EHJMD1IpuwEQlMNuUC4mX9EbRYbRnDE1jY4AeVsF3Xm8RxH65Ga5LYx6V2lOQrQRr+KFSLTLW1bjBnPi+9VoambTL7S3YyR5BnJAghi3mkIegv66DSaezprC+bGROcwgSKvdR/m5U=,iv:VLWlv4cr52VmZAVeXq3GDjoPE11DmiIMJnGek+lNiV4=,tag:WBNYdT+D49qXfPh6R5uXnQ==,type:str]
+synapse-registration-shared-secret: ENC[AES256_GCM,data:PG50Z6fP5hLJwREosB6t1EqV7qKNpFAi9j1b7pzdSUEGFoOXiW9kDeV3jBjwJdFNRFaOX0lK7+AH5I/BuBvqHDRTi2guFiQPPvX6fo+fBnD9kR5Fy4w9hr0Z3NA0Hhg=,iv:bGP8J+fSgdghtjtjXnL1hXAEFD56zacJhJmJHX0rIFg=,tag:SIUOXU2MvdwIuxkrKqScgg==,type:str]
+synapse-turn-shared-secret: ENC[AES256_GCM,data:nerJ4Lc9zQSJ2HU6VpO+f7gAviYdQGgOxGqqFapYb1QwvFNlC25yT1SHkY42ZkYy97YBBednXjaoLTnRFbRmzTe80eyWzjlYneouVB33w8zx7xiwzDyk,iv:7vS3whvzi1FDpTAcnDsZZXrr707L9Fo5WAL+k3orMCM=,tag:n11U3bYSzmTCWu9Wg/cmKw==,type:str]
+turn-static-auth-secret: ENC[AES256_GCM,data:hcV+n7A7Be4Q9I8FXBEZQZe8N/Ph0gAD5YFoedTc9nXLjDWY4Y44BnLf39KhFjQuC+KuBoUhkuYsM0OqCRHgcQ==,iv:gqJiwWJnBnDAQ2H4dlxQqkw/+adXcPCEC2YMZYlrQLs=,tag:x7ol6PfTbf/09Sw/dbthGg==,type:str]
+wg-home-private-key: ENC[AES256_GCM,data:j+L7Egy3coCajL/LBGcaEbN3WuFzj7aenEQoktcIeKOTMmrA4643bCSDuUE=,iv:gKJQfrMMaeF2muJhtfq0h/GJ7VXGk1axGPtRFccLhHc=,tag:Bsqe3QBNdXo8vWo1p9pxfw==,type:str]
 sops:
    kms: []
    gcp_kms: []
    azure_kv: []
    hc_vault: []
    age: []
-    lastmodified: "2024-04-26T10:40:21Z"
-    mac: ENC[AES256_GCM,data:rjLzGWhG6YTq8hJWvQeyl2pIGcy/2+UN4Hi1c5Cah8Z+LenYS93MIDVAwcb1c28ZWTKA6SiFyMd5pdMVMVMZP+WccnlwRvPySZhfyGtLXG8gR8yk35pUF+9WvrTvnY6geTPGoQTp/CeujEX9ceZ/s5Wq2vnt8JWdUIhLK7A8hiM=,iv:yhbtxFm1AbolC7t0m3S6hRJQ3paz/c9A3dA02e2l5mg=,tag:CoS0jG38DIdJTrFGcM/Hxw==,type:str]
+    lastmodified: "2023-08-18T10:01:41Z"
+    mac: ENC[AES256_GCM,data:EDvu6s1YSg9nQ/3ANPGIeTKp5Q0KxWx0ui5NKd7XTmO7Uf7T5D7Nb1Zz2uLcLwgYMQbNPBd+H2AQrDTy7ULaG7pIkBqSF7xcWqXYAuOJMVaJfsVJbqFFEeV/7zuJX0p8W7iLZWJM+6FMJsmkOY8VSelIMx3jTLwmuw0Mr2hbisg=,iv:9X2Wd/eVOZJKpfLjYM8jjvyumXrew/U0AChiUVhJ8TI=,tag:hofRvvjajNSibrzdxze0Fw==,type:str]
    pgp:
-        - created_at: "2024-01-22T00:20:10Z"
-          enc: |-
+        - created_at: "2022-03-23T13:59:53Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAecnfv38WCQ8Qv0pMNuv009PzldbVWeyeUFO4ku9q9w0w
-            zBjSFRW15EubJZC7kbB1G3bOATEYS5pJgraXlUOE+mumax6YkXzEcrzHXS6fnm62
-            hF4Dub78fMESoMASAQdAdeZFtFSOR3SvRR6w9gd9BIb22shVDWyu2tMK0WMdOj8w
-            rS3m4wI20FX1axD30ATt/3OHMCUFNk4IOc0yLGX2+xPtBNaEEbYbrsh9s7KdT/7Q
-            hF4DM6AcvgVUx2MSAQdAKo+Smohz1lWF/oyZm6WJnTScEDYBHnw4Gm65KEto1hkw
-            9TALI3QIca2vHiiAEsjQVfQrP/wFlIgkmAgMSojZM/mGAbapbPly9SapDZOjPBcL
-            1GgBCQIQn723uPbXAb0QOSj2welUisMum1GBxNaqP0nxe7O3ROA2nO/Z53yDAK8q
-            u/Rbk0OLcl9ZVg5TpSxWJkLD5gKejJMzetnSjHX8kkvV7mSQmWanUFL26muIWagj
-            TOwJ+wRu7k3MCA==
-            =nYCp
+            hQIMAwDgSONkM+d4ARAAgkF6yXlKjDfJrfLSwk/6lc3m87NZjXtbBdtS/GRUMe2N
+            NKESbiEyxBJzzapjdP+SfkBolmfMIpHnZ8SbChEdWMsA2VA22Y9XMvktbfxxCt+d
+            Nuis/xy00C1MA3vmMF73X5H6gUESXZRelhMzWw9rX1ItUqIESI7R0I+H83IURxW1
+            t+Yvffx7LbGgcHSXyerheHWmq8H2ArGQNPOPy78XTZJZaGAwOuKeDdXXSjsIH1qb
+            DV7vDadknn5I6ujMj2WOzfSq1ylk8dPgAJfXiHTEfRK0PnBEnymzfxa4fdY4z4NR
+            zlz2afGa9o6ROpda+ahc+DzfNFMm8nTe61vFFNhdjFglg7yiCCuLoFRRFZhY9XvJ
+            IplvKNe8Plhleiz0JhnUiJ64gwKq3Ff/FZRGd/SmMh5j7teHm5Yz1yaYdfQSOcTg
+            +r7fO8Y+VBvrfvcw/nRSDAbVKQspQo1Fq04t+DDZivkfiOF4ZE9MEtzzFbz9apkF
+            ALisslqtEYB3Xu0Cz+VU+lW47+N+Mg3fhshdWs9WYkrbA3mxjJOU96fhCQrPM7J1
+            zIH+XwKPmO4R5RDPSPWUfFwz7Xhz2XCzJyBV8+OWAOPFRAx6wO70g144+7EAAdCi
+            R9j+S8DjTTsdLPeI90zzGZ7GjCrZTbwoelSOD+wyF97nD/3K5XoF12zlEPEiY5LS
+            XgFAB/5JDgeChC+FSOArnMPK1QP7JWOp1b9et9Zi37THVeIilY5uepun0HuqpZw2
+            mcCIj62Y3mw8edanTR9TUPvTVhnhbm+iG9Ibb3rlmOKwNR085OvdCknl45HnFOI=
+            =a2WJ
            -----END PGP MESSAGE-----
-          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
-        - created_at: "2024-01-22T00:20:10Z"
-          enc: |-
+          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
+        - created_at: "2022-03-23T13:59:53Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAJs/1k2gWY2EhR9fdGIitfObpQ7OXafmrxfxGpbm1Vw0w
-            rA1vEH3sstu1xJo8aXGlh8s2OFavAh2jVFII2FnJEzueIlRqPoZGDXFuyaLB+RbV
-            hF4Dub78fMESoMASAQdAnsegQHgjElMF4rHwdZAvt2lwlCVOtGlKPE/W5xibI04w
-            iPUGf0218W/iTOPryK3gexsudU8zPKnvTHgxPPNJRTfvF/ouwgCMu61lk1GHLOZq
-            hF4DM6AcvgVUx2MSAQdAvgjlfummhGWmii0h/jmhZIDu3p0CvRvA9Iqp5XaCaRkw
-            KQc6I68McNPK+0pbhYOQGgIqpr/q3Maj/CT1qh+U38eIBV4XMx+gjMKeTU5Wq1cm
-            1GgBCQIQf/ZKVR8meAn8WM0Xp2yGEh2EQjftAayPcnYROyzpsFf2otVGsQ2k4nrR
-            oMNClXtjiuuLBe8wBr33Qjba4sFm0MNiuMgCT6eDbJPDRyRWptF3ztyNf3kTODeo
-            tVz1t/ps1mUlZA==
-            =1KRJ
+            hQGMA4JsBMC+MZ+iAQv/QIEisDeHHtSOe8hKubO1bB6qjOh2hz3V+JgGNustBV1H
+            v2EhV+dSPxS342FcGZm8+hOqMqBHiI7nyPMSDAS4QsrbSSmC5ZGXaP5PU+RclE2H
+            v6ZQza5+OGRBHKgWgl715AE+NpJM8A3WgX/YxwfxwkzE9pWtffH63Am3AiLXoguV
+            GhyHoZno2+UkUMMIb50HpHU4O3qfz6jWaOiJTkrALEUkK7+4AgJmMqRdfpki/PyL
+            eCCw3ykSLtIGsIJrhCfpJx8wD2RolBX/Y+IBOTgq9KrM6CzM0UUPkfO8UQajAaGE
+            QT7M3s2IGzktmllMw4sPly8eeiawY9dqtTkX5F4Y9N/CWEDqDgyopbYU3YTGSdQ6
+            J+llVBM+0TvFy4HDkwtWgNMoUPhnivjo25BLBe3wK3uhroHjmRKk+3azir70E1vs
+            14niknpClCY2k7Mq2zSiZ84M7qpv5+XA+11OhBfamOsJ3R0ONnwnPBGxJ7Cmx42J
+            CHaYDhalvJXOdZSzipRF0lABxQwwmYGO4XXA4Op0eU9b5+vAt5LW7u1jLZdGrImq
+            IBR/SNLp5e7oUWgslarkwx2Kah9UgNeXb3HT07ucljTcvap7A9gzcEjapTdMNu5C
+            Rw==
+            =TaF4
            -----END PGP MESSAGE-----
-          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
-        - created_at: "2024-01-22T00:20:10Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DLHeEFiC484ASAQdAGJjHK4r3sbWQr+Db8TSMhh1d/GBrKp5hQNavDfx15CMw
-            JsCpvdk8sp+BiQAKhs4uBFyX8lbN3Fp+4Kc8D1dQMRvVusmDXaF1gSByhx18fpFB
-            hF4Dub78fMESoMASAQdAK6L6bJWCSHowtsLApq2bB+KcdHWu8zEGuIcGvPX6sXkw
-            HXgM1X1dFl891kMYCnyO9lf52Wg8oo8b8TaOMhfb/WstUMxSNr4YmPgiP8yuoFrJ
-            hF4DM6AcvgVUx2MSAQdAtjMlZZRKlMi1dvrN/ac6KPNvjqulWoUirUpUIgq+ik8w
-            puxgTM3lI10YG8wJJx+JoPDaERYIBdJzZA878Qp6eTYzxuUfZmcPxStoJqBqA2eO
-            1GgBCQIQMXFKQqxhSUX56pqb2BaqUtiNQ68no9a43rZV8uL8GneDap4Fd16kq02I
-            Rx4pCdL3bXThaVdjyvWw+MKD6I0t7jgAMcCD8rYhlQ709u/21qcsdrqOJTMV8w6L
-            3CK9GGHRnxRzqw==
-            =vDCy
-            -----END PGP MESSAGE-----
-          fp: 403215E0F99D2582C7055C512C77841620B8F380
-        - created_at: "2024-01-22T00:20:10Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMAyhQdcrIW3A1ARAAzaEuorYL7UVgQi8QhuzqCmjUdGDxty/Wvq27i+0sRw5p
-            ePyCum7G210b52R9T39PuSUgo7/ts339uk0dSHKoj73Mx4Pa+KoKT6QESsUnnlsA
-            kxy87E//c4TO5RLlBSwrpMIom0+DscihDsirC619tRMvE2hzoZeceQZVZQxvz9lJ
-            NE3g7dxsk9wZ0siL8Bjga/VvgN6ZAwxm2rAcSb1rP1zCNdefHC/30nTMv5pgAv0f
-            YoNQHoLVc/aFvFi/1U1Kw2qm2EODtF5TjC9K1NdLDRdMdsq43IAi2XzPgMqiXV5t
-            AWExnAVvGG/+X4kdUIgH1W1i+L5b4GRa6jg5rYNd0G7xuL1e3+shBM+VCFj/EcJ2
-            t434IQla9q65bmfRnMp757HLUQ0lnOSsd9uTufSRaXecJfSyXSoMogKmmkDLN1zV
-            aN1XPx1NB26cjhnZh2oliA24WQeqADncaSdKloUR1Z6+ARbqrQJVrwHzhKdMjT39
-            zCsmcMmxOMpmqG+v6pzcnor+Jgag5moUYUzrWIl+2SeofH+cNYoUWbhtZYgoO/RV
-            DPloyM48U30K75EIFUsMiJ+N2K5bMR508xdYwv4U1RyhR7wdSIfRFkRhK1RqlVQe
-            mX3u6sDS261XLqxAc5JZUUtsDoBxMwxEtzuJ287hvdtY0/goOK1/O/g5z8UnXW3S
-            WAEnQOVNUwQnFyOmVjjbWf4y5SnoL3bM6gnpvcKgC9fvxbZqsrEoNq9QOu1iRmy8
-            e3OHZJr3oJuAoA5u38+SUCrv5s4mkBh9YwT/rpu5AiDE0sfcMsXLe38=
-            =q9lf
-            -----END PGP MESSAGE-----
-          fp: 06a917fc4a2a1b6b0f69a830285075cac85b7035
+          fp: FD4E1FB15DD0F36A77790229826C04C0BE319FA2
    unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.7.3
--- a/machines/renge/services/bang-evaluator.nix
+++ b/machines/renge/services/bang-evaluator.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2022 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 {
  services.bang-evaluator = {
    enable = true;
--- a/machines/renge/services/buchborgen.nix
+++ b/machines/renge/services/buchborgen.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2022 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { pkgs, ... }:
 let
  hiddenService = "kx5thpx2olielkihfyo4jgjqfb7zx7wxr3sd4xzt26ochei4m6f7tayd.onion";
--- a/machines/renge/services/coturn.nix
+++ b/machines/renge/services/coturn.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2022 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, pkgs, ... }:
 let
  cfg = config.services.coturn;
--- a/machines/renge/services/element-web.nix
+++ b/machines/renge/services/element-web.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { lib, pkgs, ... }:
 let
  # This uses
@ -35,22 +31,23 @@ in
          server_name = "matrix.sbruder.de";
        };
      };
-      show_labs_settings = true;
+      showLabsSettings = true;
      branding = {
-        auth_footer_links = [ ];
+        authFooterLinks = [ ];
      };
      piwik = false;
-      default_country_code = "DE";
-      setting_defaults = {
+      defaultCountryCode = "DE";
+      settingDefaults = {
        "UIFeature.feedback" = false;
        "UIFeature.shareSocial" = false;
        "UIFeature.identityServer" = false;
        "UIFeature.thirdPartyId" = false;
      };
      disable_custom_urls = true;
+      jitsi.preferredDomain = "meet.jalr.de";
      disable_guests = true;
      disable_3pid_login = true;
-      desktop_builds.available = false;
+      desktopBuilds.available = false;
    });
  };
 }
--- a/machines/renge/services/forgejo.nix
+++ b/machines/renge/services/forgejo.nix
@ -1,36 +1,29 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, pkgs, ... }:
 let
-  cfg = config.services.forgejo;
+  cfg = config.services.gitea;
 in
 {
-  sops.secrets.forgejo-mail = {
+  sops.secrets.gitea-mail = {
    owner = cfg.user;
    sopsFile = ../secrets.yaml;
  };
-  systemd.services.forgejo.serviceConfig.SupplementaryGroups = lib.singleton "keys";
+  systemd.services.gitea.serviceConfig.SupplementaryGroups = lib.singleton "keys";

-  services.forgejo = {
+  services.gitea = {
    enable = true;

+    appName = "sbrudergit";
    lfs = {
      enable = true;
    };
    database.type = "postgres";
-    mailerPasswordFile = config.sops.secrets.forgejo-mail.path;
+    mailerPasswordFile = config.sops.secrets.gitea-mail.path;
    settings = {
-      DEFAULT = {
-        APP_NAME = "sbrudergit";
-      };
      mailer = {
        ENABLED = true;
-        PROTOCOL = "smtps";
-        SMTP_ADDR = "vueko.sbruder.de";
-        FROM = "forgejo@sbruder.de";
-        USER = "forgejo@sbruder.de";
+        HOST = "vueko.sbruder.de:587";
+        FROM = "gitea@sbruder.de";
+        USER = "gitea@sbruder.de";
      };
      avatar = {
        DISABLE_GRAVATAR = true;
@ -49,14 +42,13 @@ in
        BUILTIN_SSH_SERVER_USER = "git";
        START_SSH_SERVER = true;
        SSH_PORT = 2022;
-        SSH_SERVER_HOST_KEYS = "ssh/forgejo.ed25519,ssh/forgejo.rsa";
+        SSH_SERVER_HOST_KEYS = "ssh/gitea.ed25519,ssh/gitea.rsa";
      };
      service = {
-        DEFAULT_ALLOW_CREATE_ORGANIZATION = false;
        DEFAULT_KEEP_EMAIL_PRIVATE = true;
        ENABLE_NOTIFY_MAIL = true;
        NO_REPLY_ADDRESS = "users.git.sbruder.de";
-        REGISTER_MANUAL_CONFIRM = true;
+        REGISTER_EMAIL_CONFIRM = true;
      };
      session = {
        PROVIDER = "file";
@ -75,7 +67,7 @@ in
    forceSSL = true;

    locations."/" = {
-      proxyPass = "http://unix:/run/forgejo/forgejo.sock";
+      proxyPass = "http://unix:/run/gitea/gitea.sock";
    };

    extraConfig = ''
--- a/machines/renge/services/grafana.nix
+++ b/machines/renge/services/grafana.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, ... }:
 let
  cfg = config.services.grafana;
@ -49,7 +45,7 @@ in
    ensureUsers = [
      {
        name = cfg.settings.database.user;
-        ensureDBOwnership = true;
+        ensurePermissions = { "DATABASE ${cfg.settings.database.name}" = "ALL PRIVILEGES"; };
      }
    ];
  };
--- a/machines/renge/services/hedgedoc.nix
+++ b/machines/renge/services/hedgedoc.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, pkgs, ... }:
 let
  cfg = config.services.hedgedoc;
@ -12,7 +8,9 @@ in
    ensureDatabases = [ "hedgedoc" ];
    ensureUsers = lib.singleton {
      name = "hedgedoc";
-      ensureDBOwnership = true;
+      ensurePermissions = {
+        "DATABASE hedgedoc" = "ALL PRIVILEGES";
+      };
    };
  };

@ -37,8 +35,8 @@ in
  systemd.services.hedgedoc = {
    after = [ "postgresql.service" ];
    preStart = toString (pkgs.writeShellScript "hedgedoc-generate-session-secret" ''
-      if [ ! -f /var/lib/hedgedoc/session_secret_env ]; then
-          echo "CMD_SESSION_SECRET=$(${pkgs.pwgen}/bin/pwgen -s 32 1)" > /var/lib/hedgedoc/session_secret_env
+      if [ ! -f ${cfg.workDir}/session_secret_env ]; then
+          echo "CMD_SESSION_SECRET=$(${pkgs.pwgen}/bin/pwgen -s 32 1)" > ${cfg.workDir}/session_secret_env
      fi
    '');
    serviceConfig = {
@ -46,7 +44,7 @@ in
        "CMD_LOGLEVEL=warn"
      ];
      EnvironmentFile = [
-        "-/var/lib/hedgedoc/session_secret_env" # - ensures that it will not fail on first start
+        "-${cfg.workDir}/session_secret_env" # - ensures that it will not fail on first start
      ];
    };
  };
--- a/machines/renge/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch.license
+++ b/machines/renge/services/invidious/0001-Prefer-opus-audio-streams-in-listen-mode.patch.license
@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2021-2022 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: AGPL-3.0-or-later
--- a/machines/renge/services/invidious/default.nix
+++ b/machines/renge/services/invidious/default.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, pkgs, ... }:

 {
--- a/machines/renge/services/libreddit.nix
+++ b/machines/renge/services/libreddit.nix
@ -0,0 +1,21 @@
+{ config, ... }:
+let
+  cfg = config.services.libreddit;
+in
+{
+  services.libreddit = {
+    enable = true;
+    address = "127.0.0.1";
+  };
+
+  services.nginx.virtualHosts."libreddit.sbruder.xyz" = {
+    extraConfig = ''
+      allow ${config.sbruder.wireguard.home.subnet};
+      deny all;
+    '';
+    locations = {
+      "/robots.txt".return = "200 'User-agent: *\\nDisallow: /'";
+      "/".proxyPass = "http://${cfg.address}:${toString cfg.port}";
+    };
+  };
+}
--- a/machines/renge/services/mastodon.nix
+++ b/machines/renge/services/mastodon.nix
@ -1,32 +0,0 @@
-# SPDX-FileCopyrightText: 2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-{ config, lib, ... }:
-
-{
-  sops.secrets.mastodon-mail = {
-    owner = config.services.mastodon.user;
-    sopsFile = ../secrets.yaml;
-  };
-
-  services.mastodon = {
-    enable = true;
-    configureNginx = true;
-    localDomain = "procrastination.space";
-    smtp = {
-      createLocally = false;
-      host = "vueko.sbruder.de";
-      port = 465;
-      user = "mastodon@sbruder.de";
-      passwordFile = config.sops.secrets.mastodon-mail.path;
-      fromAddress = config.services.mastodon.smtp.user;
-      authenticate = true;
-    };
-    streamingProcesses = 5;
-    extraConfig = {
-      SMTP_TLS = "true";
-      RAILS_LOG_LEVEL = "warn";
-    };
-  };
-}
--- a/machines/renge/services/matrix/default.nix
+++ b/machines/renge/services/matrix/default.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 {
  imports = [
    ./synapse.nix
--- a/machines/renge/services/matrix/go-neb.nix
+++ b/machines/renge/services/matrix/go-neb.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2022 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, pkgs, ... }:
 let
  synapseCfg = config.services.matrix-synapse.settings;
--- a/machines/renge/services/matrix/mautrix-whatsapp.nix
+++ b/machines/renge/services/matrix/mautrix-whatsapp.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 # somewhat adapted from https://github.com/NixOS/nixpkgs/pull/59211
 { config, lib, pkgs, ... }:
 let
--- a/machines/renge/services/matrix/synapse.nix
+++ b/machines/renge/services/matrix/synapse.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, pkgs, ... }:
 let
  cfg = config.services.matrix-synapse.settings;
@ -97,8 +93,12 @@ in
    enable = true;
    # synapse requires custom databse configuration:
    # CREATE DATABASE "matrix-synapse" TEMPLATE template0 LC_COLLATE "C" LC_CTYPE "C";
-    # as the databse is not created with NixOS,
-    # the ownership can’t be ensured here.
+    ensureUsers = lib.singleton {
+      name = "matrix-synapse";
+      ensurePermissions = {
+        "DATABASE \"matrix-synapse\"" = "ALL PRIVILEGES";
+      };
+    };
  };

  services.nginx.virtualHosts = {
--- a/machines/renge/services/murmur.nix
+++ b/machines/renge/services/murmur.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2022 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, ... }:

 {
--- a/machines/renge/services/netbox.nix
+++ b/machines/renge/services/netbox.nix
@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+{
+  sops.secrets.netbox-secret-key = {
+    sopsFile = ../secrets.yaml;
+    owner = "netbox";
+  };
+
+  services.netbox = {
+    enable = true;
+    package = pkgs.netbox;
+    secretKeyFile = config.sops.secrets.netbox-secret-key.path;
+    plugins = ps: with ps; [
+      netbox-inventory
+      netbox-topology-views
+    ];
+    settings = {
+      PLUGINS = [
+        "netbox_inventory"
+        "netbox_topology_views"
+      ];
+    };
+  };
+
+  services.nginx.virtualHosts."netbox.sbruder.de" = {
+    enableACME = true;
+    forceSSL = true;
+    locations = {
+      "/".proxyPass = with config.services.netbox; "http://${listenAddress}:${toString port}";
+      "/static/".alias = "${config.services.netbox.dataDir}/static/";
+    };
+  };
+
+  # allow nginx access to static
+  users.groups."${config.users.users.netbox.name}".members = [ "nginx" ];
+}
--- a/machines/renge/services/nitter.nix
+++ b/machines/renge/services/nitter.nix
@ -0,0 +1,50 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.services.nitter;
+in
+{
+  services.nitter = {
+    enable = true;
+    #package = pkgs.unstable.nitter;
+    server = {
+      port = 8081;
+      hostname = "nitter.sbruder.xyz";
+      address = "127.0.0.1";
+    };
+    preferences = {
+      theme = "Auto";
+      replaceTwitter = "${cfg.server.hostname}";
+      muteVideos = true;
+      hlsPlayback = true;
+      replaceYouTube = "${config.services.invidious.domain}";
+    };
+    config = {
+      base64Media = true;
+    };
+  };
+
+  services.nginx.virtualHosts.${cfg.server.hostname} = {
+    extraConfig = ''
+      allow ${config.sbruder.wireguard.home.subnet};
+      deny all;
+    '';
+    locations = {
+      "/robots.txt".return = "200 'User-agent: *\\nDisallow: /'";
+      "/" = {
+        proxyPass = "http://${cfg.server.address}:${toString cfg.server.port}";
+        extraConfig =
+          let
+            # workaround for nginx dropping parent headers
+            # see https://github.com/yandex/gixy/blob/master/docs/en/plugins/addheaderredefinition.md
+            parentHeaders = lib.concatStringsSep "\n" (lib.filter
+              (lib.hasPrefix "add_header ")
+              (lib.splitString "\n" config.services.nginx.commonHttpConfig));
+          in
+          ''
+            ${parentHeaders}
+            add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' blob:; style-src 'self' 'unsafe-inline'; media-src 'self' blob:";
+          '';
+      };
+    };
+  };
+}
--- a/machines/renge/services/password-hash-self-service.nix
+++ b/machines/renge/services/password-hash-self-service.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2022 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { inputs, pkgs, ... }:

 {
--- a/machines/renge/services/prometheus.nix
+++ b/machines/renge/services/prometheus.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, pkgs, ... }:
 let
  cfg = config.services.prometheus;
@ -73,20 +69,12 @@ in
          "vueko.vpn.sbruder.de:9100"
          "okarin.vpn.sbruder.de:9100"
          "shinobu.vpn.sbruder.de:9100"
-          "nazuna.vpn.sbruder.de:9100"
-          "yuzuru.vpn.sbruder.de:9100"
        ];
-        relabel_configs = lib.singleton {
-          target_label = "instance";
-          source_labels = lib.singleton "__address__";
-          regex = "(.*)\\.vpn\\.sbruder\\.de:9100";
-        };
      }
      {
        job_name = "qbittorrent";
        static_configs = mkStaticTargets [
          "fuuko.vpn.sbruder.de:9561"
-          "nazuna.vpn.sbruder.de:9561"
        ];
        relabel_configs = lib.singleton {
          target_label = "instance";
@ -113,7 +101,7 @@ in
        static_configs = mkStaticTarget "shinobu.vpn.sbruder.de:${toString config.services.prometheus.exporters.dnsmasq.port}";
        relabel_configs = lib.singleton {
          target_label = "instance";
-          replacement = "shinobu";
+          replacement = "shinobu.home.sbruder.de";
        };
      }
      {
@ -133,44 +121,6 @@ in
          replacement = "vueko.sbruder.de";
        };
      }
-      {
-        job_name = "knot";
-        static_configs = mkStaticTargets [
-          "vueko.vpn.sbruder.de:9433"
-          "renge.vpn.sbruder.de:9433"
-          "okarin.vpn.sbruder.de:9433"
-          "yuzuru.vpn.sbruder.de:9433"
-        ];
-        relabel_configs = lib.singleton {
-          target_label = "instance";
-          source_labels = lib.singleton "__address__";
-          regex = "(.*)\\.vpn\\.sbruder\\.de:9433";
-        };
-      }
-      {
-        job_name = "snmp";
-        metrics_path = "/snmp";
-        params = {
-          module = [ "if_mib" ];
-        };
-        static_configs = mkStaticTargets [
-          "karibik.management.shinonome-lab.de"
-        ];
-        relabel_configs = [
-          {
-            source_labels = lib.singleton "__address__";
-            target_label = "__param_target";
-          }
-          {
-            source_labels = lib.singleton "__param_target";
-            target_label = "instance";
-          }
-          {
-            target_label = "__address__";
-            replacement = "shinobu.vpn.sbruder.de:9116";
-          }
-        ];
-      }
    ];

    rules =
@ -188,7 +138,7 @@ in
            rules = map mkAlert [
              {
                name = "InstanceDown";
-                expr = ''up{instance!~"(nunotaba|hitagi|mayushii|fuuko)"} == 0'';
+                expr = ''up{instance!~"(nunotaba|hitagi|mayushii|fuuko).vpn.sbruder.de:.*"} == 0'';
                description = "Instance {{ $labels.instance }} of job {{ $labels.job }} has been down for more than 1 minutes.";
              }
              {
--- a/machines/renge/services/psycho-power-papagei.de/default.nix
+++ b/machines/renge/services/psycho-power-papagei.de/default.nix
@ -0,0 +1,21 @@
+{ pkgs, ... }:
+
+{
+  services.nginx.virtualHosts = {
+    "psycho-power-papagei.de" = {
+      forceSSL = true;
+      enableACME = true;
+
+      root = ./.;
+
+      locations = {
+        "/imprint/".alias = "${pkgs.sbruder.imprint}/";
+      };
+    };
+    "www.psycho-power-papagei.de" = {
+      forceSSL = true;
+      enableACME = true;
+      globalRedirect = "psycho-power-papagei.de";
+    };
+  };
+}
--- a/machines/renge/services/psycho-power-papagei.de/index.html
+++ b/machines/renge/services/psycho-power-papagei.de/index.html
@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Psycho-Power-Papagei</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="style.css" rel="stylesheet">
+  </head>
+  <body>
+    <main>
+      <img id="parrot-landscape" src="parrot-landscape.jpg">
+      <img id="parrot-portrait" src="parrot-portrait.jpg">
+      <div id="quote">
+        <p id="quote-body"><noscript><code>[] + {} === '[object Object]'</code></noscript></p>
+        <span id="quote-attribution"><noscript>Satz des Pythagoras</noscript></span>
+      </div>
+    </main>
+    <footer>
+      <ul>
+        <li><a href="/imprint/">Impressum</a></li>
+        <li>Zitate: © Ullstein Buchverlage</li>
+        <li id="attribution-landscape">Photo by <a href="https://unsplash.com/photos/uH7YCla3oVE">Yorman Tamayo on Unsplash</a></li>
+        <li id="attribution-portrait">Photo by <a href="https://unsplash.com/photos/vzVWYIr6F8U">Dmitry Chernyshov on Unsplash</a></li>
+      </ul>
+    </footer>
+    <script src="script.js"></script>
+  </body>
+</html>
--- a/machines/renge/services/psycho-power-papagei.de/parrot-landscape.jpg
+++ b/machines/renge/services/psycho-power-papagei.de/parrot-landscape.jpg
--- a/machines/renge/services/psycho-power-papagei.de/parrot-portrait.jpg
+++ b/machines/renge/services/psycho-power-papagei.de/parrot-portrait.jpg
--- a/machines/renge/services/psycho-power-papagei.de/script.js
+++ b/machines/renge/services/psycho-power-papagei.de/script.js
@ -0,0 +1,111 @@
+const quotes = [
+  {
+    quote: "Mein großer Lehrmeister sagte letztens auf einer Wanderung im Himalaya zu mir: »Um die Ängste anderer manipulieren zu können, musst du zuerst lernen, deine eigenen zu beherrschen, Bruce!« Darum werde ich jede Nacht zum Psycho-Power-Papagei!",
+    attribution: "Austrian Psycho",
+  },
+  {
+    quote: "Das klingt irgendwie nach Hitler.",
+    attribution: "Das Känguru",
+  },
+  {
+    quote: "Aha. Ich habe das Gefühl, Sie fragen sich, was meine Spezialfähigkeit ist.",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Aha. Ich empfinde von Ihrer Seite eine negative Einstellung. Eine Art »Och nöö …«.",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Aha. Und dieses Känguru … hören Sie nur dessen Stimme oder können Sie es auch sehen?",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Aha. Und dieses Känguru … springt das vielleicht gerade hier im Zimmer herum?",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Es hat gesagt, ’ne Therapie is nur was für Systemopfer, es habe keine Psychomacken, und ich solle ruhig allein zum Kopfdoktor.",
+    attribution: "Kai-Dieter Kling",
+  },
+  {
+    quote: "Ich weiß echt nicht, was ich hier soll! Ich bin ja hier nicht das Systemopfer mit der Psychomacke.",
+    attribution: "Das Känguru",
+  },
+  {
+    quote: "Doch, doch. Ich lebe ja selbst mit einem Gnu zusammen.",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Der hat ja ’nen Kopfdoktor noch nötiger als du.",
+    attribution: "Das Känguru",
+  },
+  {
+    quote: "Etwas tritt dir gleich in den Arsch, wenn du dich weiter aufführst wie ein Irrer.",
+    attribution: "Das Känguru",
+  },
+  {
+    quote: "Ich bin ein Vogel! Ein lieblicher kleiner Vogel! Tschilp, tschilp, tschilp, tschilp.",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Ich bin kein Psychiater. Ich bin Psychoanalytiker",
+    attribution: "Kai-Dieters Psychiater",
+  },
+  {
+    quote: "Ich will nur hören, wie er Titellieder von Kinderserien singt",
+    attribution: "Das Känguru",
+  },
+  {
+    quote: "Sie beeinträchtigen leider stark die Konzentrationsfähigkeit aber unter uns, ich höre sowieso nie richtig zu, sondern sage immer nur »Aha«, denn wie alle interessiert auch mich das, was mein Gegenüber zu sagen hat, viel weniger als das, was ich zu sagen habe.",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Aha. Haben Sie es schon mal mit Alkohol versucht?",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Ich nenne Ihnen jetzt spontan drei Wörter Bitte merken Sie sich diese Wörter. Ich werde sie am Ende der Sitzung nach diesen drei Wörtern fragen. Keine Sorge. Nur ein Standardtest. Also, hier die drei Wörter: Äh … Suppe, … äh … Salat, … äh … äh … Schnitzel.",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Ich darf nicht mit Patienten ausgehen. Aber das Angebot schmeichelt.",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Aha. Der Pinguin … Vielleicht war ich etwas voreilig mit dem Wort »geheilt«. Sagen wir, es geht Ihnen besser …",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Aha. Sagen wir, es geht Ihnen etwas schlechter. Der Messias?",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Nun gut. Sagen wir, Ihr Zustand hat sich massiv verschlechtert.",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Ich muss gestehen, ich war ja kurz nach Ihren letzten Besuchen selber längere Zeit in Behandlung …",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Ich hatte keine Mutter. Ich bin ein Waisenkind.",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Verstehen Sie nicht? In meiner Erinnerung mach ich mir die Welt, widdewiddewie sie mir gefällt. Jeder Mensch macht das, die meisten leider nur unbewusst. Mit professioneller Hilfe aber kann Ihre Kindheit zu einer Astrid-Lindgren-Geschichte werden. Immer wenn bei mir sehr unangenehme Erinnerungen hochkommen, singe ich zum Beispiel ganz laut Titellieder von Kinderserien. Das lenkt mich ab.",
+    attribution: "Psycho-Power-Papagei",
+  },
+  {
+    quote: "Ich denke, wir sollten die Sitzung an dieser Stelle unterbrechen. Nächstes Mal reden wir dann über Ihre Gefühle für mich.",
+    attribution: "Psycho-Power-Papagei",
+  },
+]
+
+document.addEventListener("DOMContentLoaded", () => {
+  const randomIndex = Math.floor(Math.random() * quotes.length)
+  const randomQuote = quotes[randomIndex]
+  let quoteBodyEl = document.getElementById("quote-body")
+  let quoteAttributionEl = document.getElementById("quote-attribution")
+  quoteBodyEl.innerHTML = randomQuote.quote
+  quoteAttributionEl.innerHTML = randomQuote.attribution
+})
--- a/machines/renge/services/psycho-power-papagei.de/style.css
+++ b/machines/renge/services/psycho-power-papagei.de/style.css
@ -0,0 +1,94 @@
+body {
+  font-family: -apple-system, "Segoe UI", system-ui, Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif;
+  margin: 0px;
+
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+
+main {
+  display: flex;
+  flex-direction: column;
+}
+
+#quote {
+  width: 100%;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+#quote-body {
+  margin: 1rem;
+  font-size: 2rem;
+}
+
+@media (max-aspect-ratio: 4/3) {
+  img#attribution-landscape {
+    display: none;
+  }
+
+  img#parrot-landscape {
+    display: none;
+  }
+
+  footer {
+    margin-top: auto;
+    font-size: 0.75rem;
+  }
+
+  #attribution-landscape {
+    display: none;
+  }
+}
+
+@media (min-aspect-ratio: 4/3) {
+  main {
+    flex-direction: row;
+    height: 100vh;
+  }
+
+  img#parrot-portrait {
+    display: none;
+  }
+
+  img#parrot-landscape {
+    height: 100%;
+  }
+
+  #attribution-portrait {
+    display: none;
+  }
+
+  footer {
+    position: absolute;
+    bottom: 0px;
+    left: 0px;
+    right: 0px;
+
+    margin-top: auto;
+    background: rgba(0,0,0,0.5);
+    box-shadow: 0px 0px 10px 10px rgba(0,0,0,0.5);
+
+    color: white;
+  }
+
+  footer a {
+    color: inherit;
+  }
+}
+
+footer ul {
+  list-style: none;
+  text-align: center;
+}
+
+footer ul li {
+  display: inline;
+}
+
+footer ul li:not(:first-child)::before {
+  content: "· "
+}
--- a/machines/renge/services/sbruder.xyz/.gitignore
+++ b/machines/renge/services/sbruder.xyz/.gitignore
@ -1,5 +1 @@
-# SPDX-FileCopyrightText: 2022 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: CC0-1.0
-
 index.html
--- a/machines/renge/services/sbruder.xyz/blocks.nix
+++ b/machines/renge/services/sbruder.xyz/blocks.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 # I don’t do this, because I want to.
 # I think I might have to do this because of § 8.2 of Hetzner’s ToS.
 { config, lib, ... }:
--- a/machines/renge/services/sbruder.xyz/default.nix
+++ b/machines/renge/services/sbruder.xyz/default.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, pkgs, ... }:

 {
@ -46,7 +42,7 @@
    locations = {
      "/imprint/".alias = "${pkgs.sbruder.imprint}/";
      "/transparency/" = {
-        alias = "/var/www/transparency/";
+        alias = "${./transparency}/";
        extraConfig = ''
          autoindex on;
          charset utf-8;
--- a/machines/renge/services/sbruder.xyz/index.md
+++ b/machines/renge/services/sbruder.xyz/index.md
@ -1,12 +1,8 @@
-<!--
-SPDX-FileCopyrightText: 2022-2023 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
 On this domain, the following services are currently available:

 * [Invidious](https://iv.sbruder.xyz)
+ * [Libreddit](https://libreddit.sbruder.xyz)
+ * [Nitter](https://nitter.sbruder.xyz)

 They are all semi-public instances.
 That means, they are not included in lists of public instances,
@ -33,24 +29,6 @@ The configuration is available [here](https://git.sbruder.de/simon/nixos-config/

 If you have any questions, please [contact me](https://sbruder.de).

-## History
-
-Previously, the following services were also available:
-
- * [Libreddit](https://libreddit.sbruder.xyz)
- * [Nitter](https://nitter.sbruder.xyz)
-
-They are no longer offered,
-as both Twitter (which no longer exists in its previous form) and Reddit
-have become extremely hostile to third party applications,
-which made them unreliable and forced the developers (at least for Libreddit)
-to discontinue development.
-
-The recommended migration path is to use alternative hosted instances
-(<https://nitter.net> has been mostly working at the time of writing this)
-or discontinue usage of that platform.
-
-<!-- REUSE-IgnoreStart -->
 ## A Note to Copyright Holders

 The services are only relaying content that is otherwise already available on the Internet.
@ -61,7 +39,6 @@ Otherwise the content will still be available on the Internet.
 If you still want to report illegal content to me instead of the original site,
 you can contact me by the means specified in the imprint.
 Please don’t send letters by snail mail if you want a fast response.
-<!-- REUSE-IgnoreEnd -->

 ## Imprint

@ -69,6 +46,7 @@ See [Imprint](/imprint/).

 ## Privacy

+The Libreddit and Nitter services do not store your personally identifiable information.
 If you log in to an Invidious account,
 the data you provide to the service will be stored.
 You can export or delete that data by using its built-in data control feature.
--- a/machines/renge/services/sbruder.xyz/metadata.yaml
+++ b/machines/renge/services/sbruder.xyz/metadata.yaml
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2022 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: CC-BY-SA-4.0
-
 title: sbruder.xyz

 mainfont: Roboto, Helvetica, Arial, sans-serif
--- a/machines/renge/services/sbruder.xyz/transparency/2023-04-21-Hetzner-C591581F-ROSKOMNADZOR.txt
+++ b/machines/renge/services/sbruder.xyz/transparency/2023-04-21-Hetzner-C591581F-ROSKOMNADZOR.txt
@ -0,0 +1,38 @@
+Направляется уведомление о внесении в «Единый реестр доменных имен, указателей страниц сайтов в сети «Интернет» и сетевых адресов, позволяющих идентифицировать сайты в сети «Интернет», содержащие информацию, распространение которой в Российской Федерации запрещено» следующего(их) указателя (указателей) страницы (страниц) сайта в сети «Интернет»: https://nitter.sbruder.xyz/ks1v/status/1439866313476689924 . 
+
+В случае непринятия провайдером хостинга и (или) владельцем сайта мер по удалению запрещенной информации и (или) ограничению доступа к сайту в сети «Интернет», будет принято решение о включении в единый реестр сетевого адреса, позволяющего идентифицировать сайт в сети «Интернет», содержащий информацию, распространение которой в Российской Федерации запрещено, а доступ к нему будет ограничен.
+
+Сведения о включении доменных имен, указателей страниц сайтов сети «Интернет» и сетевых адресов доступны круглосуточно в сети «Интернет» по адресу http://eais.rkn.gov.ru .
+
+С уважением,
+ФЕДЕРАЛЬНАЯ СЛУЖБА ПО НАДЗОРУ В СФЕРЕ СВЯЗИ, ИНФОРМАЦИОННЫХ ТЕХНОЛОГИЙ И МАССОВЫХ КОММУНИКАЦИЙ.
+
+-----------------------------------------------------------
+Запущено официальное мобильное приложение РОСКОМНАДЗОРА.
+Посредством мобильного приложения возможно:
+1. Подать жалобу в «Единый реестр запрещенной информации» на обнаруженный в сети «Интернет» запрещенный контент;
+2. Проверить ограничение доступа к интернет-ресурсам;
+3. Получить оповещение о внесении в «Единый реестр запрещенной информации» интернет-ресурса в случае, если Вы являетесь его владельцем или провайдером хостинга.
+Мобильное приложение можно скачать по следующим ссылкам:
+https://apps.apple.com/ru/app/ркн/id1511970611 
+https://play.google.com/store/apps/details?id=org.rkn.ermp
+
+
+
+It is notice of making an entry into the "Unified register of domain names, Internet web-site page links and network addresses enabling to identify the Internet web-sites containing the information prohibited for public distribution in the Russian Federation” the Internet web-site page (s) link (s): https://nitter.sbruder.xyz/ks1v/status/1439866313476689924 .
+
+In case the hosting provider and (or) the Internet web-site owner fail to take these measures, the network address enabling to identify Internet web-sites containing the information prohibited for distribution in the Russian Federation will be decided to be entered into the Register and access will be limited.
+
+The information about entering the domain names, Internet web-site page links and network addresses into the Register shall be available on a 24-hour basis at the following Internet address: http://eais.rkn.gov.ru/en/ .
+
+Federal Service for Supervision in the Sphere of Telecom, Information Technologies and Mass Communications (ROSKOMNADZOR).
+
+-----------------------------------------------------------
+The official mobile application of ROSKOMNADZOR has been launched.
+Through the mobile application, it is possible to:
+1. Submit a complaint to the "Unified Register of Prohibited Information" about the prohibited content revealed on the Internet;
+2. Check the restriction of access to Internet resources;
+3. Get a notification on inclusion of an Internet resource into the" Unified Register of Prohibited Information " if you are its owner or hosting provider.
+The mobile app can be downloaded at the following links:
+https://apps.apple.com/ru/app/ркн/id1511970611    
+https://play.google.com/store/apps/details?id=org.rkn.ermp 
--- a/machines/renge/services/sbruder.xyz/transparency/2023-04-28-Hetzner-C633C02D-ROSKOMNADZOR.txt
+++ b/machines/renge/services/sbruder.xyz/transparency/2023-04-28-Hetzner-C633C02D-ROSKOMNADZOR.txt
@ -0,0 +1,38 @@
+Направляется уведомление о внесении в «Единый реестр доменных имен, указателей страниц сайтов в сети «Интернет» и сетевых адресов, позволяющих идентифицировать сайты в сети «Интернет», содержащие информацию, распространение которой в Российской Федерации запрещено» следующего(их) указателя (указателей) страницы (страниц) сайта в сети «Интернет»: https://iv.sbruder.xyz/watch?v=NR57D2UVqm4 . 
+
+В случае непринятия провайдером хостинга и (или) владельцем сайта мер по удалению запрещенной информации и (или) ограничению доступа к сайту в сети «Интернет», будет принято решение о включении в единый реестр сетевого адреса, позволяющего идентифицировать сайт в сети «Интернет», содержащий информацию, распространение которой в Российской Федерации запрещено, а доступ к нему будет ограничен.
+
+Сведения о включении доменных имен, указателей страниц сайтов сети «Интернет» и сетевых адресов доступны круглосуточно в сети «Интернет» по адресу http://eais.rkn.gov.ru .
+
+С уважением,
+ФЕДЕРАЛЬНАЯ СЛУЖБА ПО НАДЗОРУ В СФЕРЕ СВЯЗИ, ИНФОРМАЦИОННЫХ ТЕХНОЛОГИЙ И МАССОВЫХ КОММУНИКАЦИЙ.
+
+-----------------------------------------------------------
+Запущено официальное мобильное приложение РОСКОМНАДЗОРА.
+Посредством мобильного приложения возможно:
+1. Подать жалобу в «Единый реестр запрещенной информации» на обнаруженный в сети «Интернет» запрещенный контент;
+2. Проверить ограничение доступа к интернет-ресурсам;
+3. Получить оповещение о внесении в «Единый реестр запрещенной информации» интернет-ресурса в случае, если Вы являетесь его владельцем или провайдером хостинга.
+Мобильное приложение можно скачать по следующим ссылкам:
+https://apps.apple.com/ru/app/ркн/id1511970611 
+https://play.google.com/store/apps/details?id=org.rkn.ermp
+
+
+
+It is notice of making an entry into the "Unified register of domain names, Internet web-site page links and network addresses enabling to identify the Internet web-sites containing the information prohibited for public distribution in the Russian Federation” the Internet web-site page (s) link (s): https://iv.sbruder.xyz/watch?v=NR57D2UVqm4 .
+
+In case the hosting provider and (or) the Internet web-site owner fail to take these measures, the network address enabling to identify Internet web-sites containing the information prohibited for distribution in the Russian Federation will be decided to be entered into the Register and access will be limited.
+
+The information about entering the domain names, Internet web-site page links and network addresses into the Register shall be available on a 24-hour basis at the following Internet address: http://eais.rkn.gov.ru/en/ .
+
+Federal Service for Supervision in the Sphere of Telecom, Information Technologies and Mass Communications (ROSKOMNADZOR).
+
+-----------------------------------------------------------
+The official mobile application of ROSKOMNADZOR has been launched.
+Through the mobile application, it is possible to:
+1. Submit a complaint to the "Unified Register of Prohibited Information" about the prohibited content revealed on the Internet;
+2. Check the restriction of access to Internet resources;
+3. Get a notification on inclusion of an Internet resource into the" Unified Register of Prohibited Information " if you are its owner or hosting provider.
+The mobile app can be downloaded at the following links:
+https://apps.apple.com/ru/app/ркн/id1511970611    
+https://play.google.com/store/apps/details?id=org.rkn.ermp 
--- a/machines/renge/services/schabernack.nix
+++ b/machines/renge/services/schabernack.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2022 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, pkgs, ... }:
 let
  domain = "schulischer-schabernack.de";
--- a/machines/shinobu/services/wordclock-dimmer.nix
+++ b/machines/shinobu/services/wordclock-dimmer.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2021-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, ... }:
 let
  password = "ymfQkXcEqGuk62S";
@ -26,7 +22,7 @@ in
    ];
  };

-  networking.firewall.interfaces.br-iot.allowedTCPPorts = [ 1883 ];
+  networking.firewall.allowedTCPPorts = [ 1883 ];

  services.wordclock-dimmer = {
    enable = true;
--- a/machines/shinobu/README.md
+++ b/machines/shinobu/README.md
@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2023 Simon Bruder <simon@sbruder.de>
-
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
 # shinobu

 ## Hardware
--- a/machines/shinobu/configuration.nix
+++ b/machines/shinobu/configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2023-2024 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, pkgs, ... }:
 {
  imports = [
@ -9,10 +5,7 @@
    ../../modules

    ./services/co2_exporter.nix
-    ./services/ntp.nix
    ./services/router
-    ./services/snmp-exporter.nix
-    ./services/wordclock-dimmer.nix
  ];

  sbruder = {
--- a/machines/shinobu/hardware-configuration.nix
+++ b/machines/shinobu/hardware-configuration.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, lib, modulesPath, pkgs, ... }:

 {
--- a/machines/shinobu/secrets.yaml
+++ b/machines/shinobu/secrets.yaml
@ -10,72 +10,44 @@ sops:
    lastmodified: "2023-08-08T09:43:37Z"
    mac: ENC[AES256_GCM,data:lxoKzGyPwdfeI5Dlmgx9K9SBhfRIaokvum+dJWABUoGtIMtrhp4K4ZRF1Rjja8oTi4w3b+s9aUBpxt8TLu9vJZFsUkhY2gqW5bX3Ub/3xMAR9YSG3LtijRSMuKkdVlAkdjB6Guz9aHNVBG3fTZ+SfTlyOQdImW6bK4tydbGHKgY=,iv:6kVR4zZfHnqhcOT3N2tClGST8h7FLjIseXDu2xS2DEY=,tag:rd/f7cHSoxLT3O7HluVWLA==,type:str]
    pgp:
-        - created_at: "2024-01-22T00:20:19Z"
+        - created_at: "2023-06-29T16:44:16Z"
          enc: |-
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAwnYNvcwcwAzUF+sA9cAdeXNAJqJg2rw2+hQYAWT9DzUw
-            veXMAz2Unn/metQhNDevmupBmyqJfECjWcIHbEnnbz5vt11ya0lWST6ImgrheWfF
-            hF4Dub78fMESoMASAQdAVcxlH04/SewgN/q3xBq4M4K0DLpaFklaFJ63D9TXX3ow
-            G63PtTjZk9yjT5Xsy5yVYDuUXjeJbZ/LHtImfJWLhFTg4eqOS5kAGriInrrTnZ8x
-            hF4DM6AcvgVUx2MSAQdATz09Pvpg5HFGAyBSsRd7WPo7o7kl9cUit2+obbVmfHAw
-            zVg1kKxTXRt7q50Ry3ry/471WUGCNYrqH5sZ0/5zm0KA4v7kZ2ctQTHxfHIQOQh6
-            1GgBCQIQR2aBg1MgV5rDwFKc+4ivwa+5CS4tiCbwGZ1oAuSGZyoCaToO3gSrJL5V
-            aGiGR64uxMX0jf0ADI89FpodefUQ9Y34AVgG2Inyc3/HIIZd2+RGiTfY+7pRcDGB
-            nPdQPO5T3yfKkg==
-            =sxgv
+            wcFMAwDgSONkM+d4AQ//XL7P5/P31g5aA3wEuLI2Fv6NuNnf3/M2R3jpy/dMVvM4
+            rH+c3aDH6QnXvA2JzPAz235m60LKlKQPCQbakiBucuPm0al/lFf3YblEaW4l68ZG
+            75sKk5YZqVpBqoirQTT/o4/lD1pLset5UM4OJ1Tq8t6FlNVasFah1YBKbe7I9l53
+            4Y85y1/dCcuAfRTM21l54+iL5Lhz/CPd0B1glfgszI0Lh0bPoB+HHGi3HNb/S3PP
+            L91892RCF2EYVb0aK54mpeq6ZVrpdnH37mFuNOHTha6qvpklreIcUSP9TNT4UEQW
+            Pz+YytPH0vGeIq26Eb/1pfLiZvqn3eHs7p2hrV3sDXFdrAnG6MO/vy5rRd4vyTUM
+            GmUBGUHS6acaOLdnDFHMQ/+tewreq9NnJFppBQz8t/hk9mjz1XWnflMHipKe+t6V
+            kflhjDi7kwndG9sxHn7Mqj059ZKcKs8o8BTqPMgBAp/Z1IvSVyj+Q/nM/RpNZim3
+            bs5z9PY8KUzD+4Biabitj21c4ah9pFXw/6W2sesAlFQGP+DkgIKuIEhyuV6HSshn
+            m/M2Q9Ma0rgKCgtgse41TbMMQASiJPA1mdtO7RE92t5gMKVVAiVHD6kTfOJZSAkx
+            TbxGjlXDLuqugKnZI41NwnHUdCUfxTGoeFqtaqYiWQ0hdgsziHHEkMxlPEGDFjfS
+            UQGlBUSl6nB1+RI2x9lLSoQbz3x5ZdXnapi+KGLfQZb11nCegTLVyO5NO+sI54+Z
+            umyIAqj6/MqgQQGt9oWJnybbFnhcjwdfEIwW4sSWJA5geQ==
+            =y5Sy
            -----END PGP MESSAGE-----
-          fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763
-        - created_at: "2024-01-22T00:20:19Z"
-          enc: |-
+          fp: 47E7559E037A35652DBBF8AA8D3C82F9F309F8EC
+        - created_at: "2023-06-29T16:44:16Z"
+          enc: |
            -----BEGIN PGP MESSAGE-----

-            hF4DLHeEFiC484ASAQdAuMzLWQQq1HkTOg9t6rw41OPw6eW26wUgprjUFIblhE4w
-            nrgBq3dEB/GW77i5S9OeTaeKKFK1+LcvFvT/fFL64bfSKmQf/PqVRBt/oCqSONM/
-            hF4Dub78fMESoMASAQdADPeTGef10BE/bUXuWvyyjP9QA0hYqU61CuKfUJ+19z8w
-            8xJTbHbNgAbSDFDBcCIFQ2X6i4MrxJ7dp7uctyVYvAA5LEmNDokJkfus/+BpbQqS
-            hF4DM6AcvgVUx2MSAQdAtkjVB9YB3HfqX+EFzpdOasUbjMvV+P4G90kET7Z+hz0w
-            maR8JfV+2U7SGAqwsgPQ+awINHLGI4RzwD0Iue/obf8eaofuuVShvUUj+OrYGiYK
-            1GgBCQIQOERoj2IRFYE9hXu1PlPUsSbYHGZhQdn+n/dWccS/REIU2rJRjdqTLtgL
-            u37UqixhLFX7POPIZ0Oacolpt7Aoz6ChJAIk01VDnSpIITiSPG1xG7ltdiLyEHCq
-            qTfKSvWYQCtA2w==
-            =/MG1
-            -----END PGP MESSAGE-----
-          fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0
-        - created_at: "2024-01-22T00:20:19Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DLHeEFiC484ASAQdAMYq9TEcYhclj1gFUwI480DdBY5sJ9mb/eyF8LyyffEAw
-            u8PJ14JvBad2CuspDbXZPMJrf6ekENc+7wtHxbiwTUjNRtynErnkdDL35ISPSWh2
-            hF4Dub78fMESoMASAQdAW8CpyTaMnkEGNkyUE7ofugB6KSDycX0j3DgblMT7Lxcw
-            P3sxirh9Oy2urfYKTxSOX+nwS7POrlDxRpnFyrIa7+Iqh7bMIv1Efa2+8keaWkuK
-            hF4DM6AcvgVUx2MSAQdAvVb6NDLQttcAkgXlv1QtMNYip9uBYN6CW2Ai2PuA6XMw
-            sXimf/7/UBs71GBL4qhEzZ0TYMtm/5b8TmjWACSX1RpLITioNkOxYgIsMXNZj0sy
-            1GgBCQIQBWPjuJ09lcdKj1Dqg3WcCFz9su1lFi+DQ6/xjEeBPgbM+RJT4Tm/UmRi
-            ZuSX6KAMqedYD7WQNQuSBnYd6jCbzEoJIEpJqGi73mPDhl2K9yaq/ytOAgR8DD3G
-            ELrn0ACG4qHkBQ==
-            =NMMN
-            -----END PGP MESSAGE-----
-          fp: 403215E0F99D2582C7055C512C77841620B8F380
-        - created_at: "2024-01-22T00:20:19Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA69EXrs5yIK3AQ//dZ8vN+kzW6oNuz4impfPbta/YjTUG3djbeHbSGwLjBQz
-            mJKV11juXHLDbW08zaBYaYkR2rZn5OT+oAH5qtCyUO4Bmv1IN7aCTk845LR5QQsu
-            ZlmJ7sDxcNtPlhJ4GjynNpq++vY4b+2LgtlrOVU0YkKhDl+x+usoWhf0dGopdeli
-            Nijn75J873bUQVVfBmCDYEhmNf9KOD23A/IdsEp2aLaYbrEbETC8yJK8qESKU/PR
-            lAjlZyswQNHjnhpyhiNwhO8ePojBVbN7e8DkAsijXqc4gQ2+d4l4CLDWHD+/Lp+v
-            rOvlQOz2lu17vEFWhdLUrXrL2WPU+OkeP3OyuYPQw9hZNEtxr0fGzhFaZxnhc6WV
-            /WQNg/1iaHb50U7kQ2RTwnmRlyz3RJjCa/WOYa9u6Uu2ASpc1TNU14vyK+z/Ykxl
-            UZRkBp+iT66hzJafMswVRioCHskSQy3IyDfiaPOQGxgoCB/cwXIz3VrEx+5t0VCy
-            WQ37zcTAIJohv+xIbS8DICMt7NsDc6Qc9m9STQhwgYG7wHt4tv0aL/444zuCGf85
-            6j+7oT3qZyO9vkQvzVKQnPuD/d7elAe7lo9FhGpSAjOEyS8OILwGNrLftien8udu
-            Cd3OehBGGupf6SNJRBqQ+a6xhtvI/Z9kA7Tn1L9W8XHnK27IpdNU2un9Ydrgh4/S
-            WAFKxZMI1FT4MR1GmYSMEzDbGvnbNW+wZVMiHKBhebW7v2t7UgcUrRZzzWMVJ9kX
-            grRJcWX0CZNhzEQ8y6FAWygU0vAaC+4NNPJ3R3aOkjrhaIVMT9sjuwo=
-            =0apY
+            hQIMA69EXrs5yIK3ARAAvjxMdia3YDWmBDM27K/om1wUtZk+isrQ5r8U1Di6uF0Q
+            qImLsCXRPumL3ZtzZ9qls2OJlUvZQkfE9Ek2/hHINGfUIdNGkXCgJs42Edcfd6tK
+            bd8hZf/kCJSX3V3c13sUdVQWy8RavUAb0Ezc0H1rZq8K1Gp8iMO9NAm/m8UJe2tM
+            +cBVvzhBoI+onkrWBCsiquPuts+hgiWMwr+hOPsQhT5VP1HM/si7k9JgEEMlqnMo
+            NOJUaqbYSR8Q/cy3jjfkAbrpYJ/ZuvZefvU2j+nlfnyzmiWV/Xh6QVseaq1IvFqg
+            ZmdFLyursv19xTYE0HOBX3c1QlEK5vMFdzADOdu3KDO0JpGwLMcR2dzX8CRYNzyR
+            B3cbfwp679B3RvKhMHKuVTy9bdb5df6CGBjVeQCNFmBSbimVTjTpFxMk5rusp/j9
+            Ql8h4ULajrfSmN4T5xoIShsmAAFeeSdHCLrACXHjHU0v2xh+MG5dTZTLa9V+4s7e
+            wIeq4v9ED5PFFRr+mQUdlmQP+fdH4Cwor8OZxA4g09RFoo3MUgLHWaa5emL1z1YN
+            fWgZs6EsFFTNYtUoey91eFzhKYYKa1P1gXztgEbc0L95Qqa15QPeWGYgf1WIRASZ
+            POTGCjleDuqnEoFFdt+qaVYtpCoJnAKjhSFf10DvN6AQ0zraXldHdx4B1wYBLQTS
+            WAG5qS56CCwMxqjic2OfdSul2zHsCSsoXrWmqG1vtv2WGE7iIsseUor7eeLxbHIW
+            /8Y9+kx+ZcTSXcs9t1xBHCEv3LAgwneVorOhiHVS4gu6R7crYLKpygE=
+            =7Sdh
            -----END PGP MESSAGE-----
          fp: 28677f2e3584b39f528a779caf445ebb39c882b7
    unencrypted_suffix: _unencrypted
--- a/machines/shinobu/services/co2_exporter.nix
+++ b/machines/shinobu/services/co2_exporter.nix
@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2022-2023 Simon Bruder <simon@sbruder.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 { config, ... }:

 {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Bruder	79fd82d0cd	fixup! wip	2023-10-04 15:42:25 +02:00
Simon Bruder	0048c6d523	fixup! wip	2023-10-04 15:41:13 +02:00
Simon Bruder	79e4438d5a	fixup! wip	2023-10-04 15:18:51 +02:00
Simon Bruder	0ea90e3ee5	wip	2023-10-04 15:15:54 +02:00
Simon Bruder	b709aa6179	vueko/mail: Add alias	2023-10-04 14:26:06 +02:00
Simon Bruder	89612d38d3	mpd: Add listenbrainz-content-resolver	2023-10-04 14:19:03 +02:00
Simon Bruder	1e5642ce81	vueko/mail: Add alias	2023-10-02 15:59:38 +02:00
Simon Bruder	ca1fb06560	flake.lock: Update Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/f9e7cf818399d17d347f847525c5a5a8032e4e44' (2023-08-23) → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12) • Updated input 'home-manager': 'github:nix-community/home-manager/9787dffff5d315c9593d3f9fb0f9bf2097e1b57b' (2023-09-11) → 'github:nix-community/home-manager/07682fff75d41f18327a871088d20af2710d4744' (2023-09-19) • Updated input 'home-manager-unstable': 'github:nix-community/home-manager/5171f5ef654425e09d9c2100f856d887da595437' (2023-09-11) → 'github:nix-community/home-manager/4f02e35f9d150573e1a710afa338846c2f6d850c' (2023-09-29) • Updated input 'nix-pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/4f883a76282bc28eb952570afc3d8a1bf6f481d7' (2023-09-10) → 'github:cachix/pre-commit-hooks.nix/cb770e93516a1609652fa8e945a0f310e98f10c0' (2023-09-24) • Updated input 'nixos-hardware': 'github:nixos/nixos-hardware/ca41b8a227dd235b1b308217f116c7e6e84ad779' (2023-09-11) → 'github:nixos/nixos-hardware/adcfd6aa860d1d129055039696bc457af7d50d0e' (2023-09-28) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/9a74ffb2ca1fc91c6ccc48bd3f8cbc1501bf7b8a' (2023-09-11) → 'github:nixos/nixpkgs/5cfafa12d57374f48bcc36fda3274ada276cf69e' (2023-09-27) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/3a2786eea085f040a66ecde1bc3ddc7099f6dbeb' (2023-09-11) → 'github:nixos/nixpkgs/8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2' (2023-09-27) • Updated input 'sops-nix': 'github:Mic92/sops-nix/ea208e55f8742fdcc0986b256bdfa8986f5e4415' (2023-09-12) → 'github:Mic92/sops-nix/2f375ed8702b0d8ee2430885059d5e7975e38f78' (2023-09-21) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/5601118d39ca9105f8e7b39d4c221d3388c0419d' (2023-09-02) → 'github:NixOS/nixpkgs/596611941a74be176b98aeba9328aa9d01b8b322' (2023-09-16)	2023-09-29 14:41:37 +02:00
Simon Bruder	362243f7f6	shinobu/router: Disable wg-upstream This only complicates many things and creates too much overhead on such a slow connection.	2023-09-26 15:38:02 +02:00
Simon Bruder	3658865ad2	shinobu/router: Route select protocols directly	2023-09-25 13:51:25 +02:00
Simon Bruder	ab035b2c44	shinobu/router: Change nft variable source	2023-09-25 12:48:30 +02:00
Simon Bruder	2a425638e6	fixup! shinobu/router: Split configuration	2023-09-24 14:47:21 +02:00
Simon Bruder	560fc237b7	fixup! shinobu/router: Split configuration	2023-09-24 14:47:04 +02:00
Simon Bruder	d733c5a802	qutebrowser: Do not use fake user agent C(R)APTCHA services do not like this.	2023-09-24 14:42:31 +02:00
Simon Bruder	133bb85357	shinobu/router: Split configuration	2023-09-24 14:42:31 +02:00