Merge branch 'main' into dev

CHANGELOG.md

@@ -13,3 +13,8 @@ Fixed:
 Updated:
 - Docs (stateDirs and mediaDir cannot be home!)
 - vpn submodule (adds firewall and DNS-leak killswitch)
+
+## 2024-03-14
+
+Added:
+- Reexported VPN-submodule, allowing users to run services, not supported by this module, through the VPN

docs/wiki/vpn/index.md

@@ -6,7 +6,7 @@ Nixarr reexports its VPN-submodule, meaning you can run your own services
 using it. As an example, let's say you want to run a Monero node
 through a VPN, then you could use the following configuration:
 
-```nix
+```nix {.numberLines}
   # Open vpnports, must also be opened by VPN-provider
   vpnnamespaces.wg = {
     openVPNPorts = [ 
@@ -49,5 +49,6 @@ through a VPN, then you could use the following configuration:
 **Note:** that the submodule supports more namespaces than just one, but Nixarr
 uses the name `wg`, so you should use that too.
 
-For more options and information on the VPN-submodule, check out [the
-repo](https://github.com/Maroka-chan/VPN-Confinement)
+Services running over the VPN will have address `192.168.15.1` instead of
+`127.0.0.1`. For more options and information on the VPN-submodule, check out
+[the repo](https://github.com/Maroka-chan/VPN-Confinement)

mkDocs.nix

@@ -54,7 +54,9 @@ in
       }
 
       # Make home page
+      sed '1d' README.md > "$tmpdir/readme.md"
       pandoc \
+        --metadata title="Nixarr - Media Server Nixos Module" \
         --metadata date="$(date -u '+%Y-%m-%d - %H:%M:%S %Z')" \
         --standalone \
         --highlight-style docs/pandoc/gruvbox.theme \
@@ -64,7 +66,7 @@ in
         -V --mathjax \
         -f markdown+smart \
         -o $out/index.html \
-        README.md
+        "$tmpdir/readme.md"
 
       # Make wiki pages
       find docs/wiki -type f -name "*.md" | while IFS= read -r file; do