flake.nix

@@ -49,7 +49,7 @@
   };
 
   outputs =
-    inputs@{
+    {
       self,
       nixpkgs,
       home-manager,
@@ -58,7 +58,6 @@
       nixpkgs-unstable,
       servicepoint-cli,
       servicepoint-simulator,
-      naersk,
       nix-vscode-extensions,
       ...
     }:
@@ -95,7 +94,7 @@
         device: system:
         let
           specialArgs = {
-            inherit inputs device;
+            inherit device;
           };
         in
         nixpkgs.lib.nixosSystem {
@@ -112,6 +111,7 @@
             {
               nixpkgs.overlays = [
                 overlays.unstable-packages
+                overlays.zerforschen
               ];
             }
           ]
@@ -129,6 +129,10 @@
             config = prev.config;
           };
         };
+
+        zerforschen = final: prev: {
+          zerforschen-plus-content = zerforschen-plus.packages."${prev.system}".zerforschen-plus-content;
+        };
       };
 
       nixosModules = {

hosts/hetzner-vpn2/nginx.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 let
   blog-domain-socket = "/run/nginx/blog.sock";
   anubis-domain-socket = "/run/anubis/anubis-blog.sock";
@@ -77,7 +77,7 @@ in
           };
 
           "blog-in-anubis" = {
-            root = inputs.zerforschen-plus.packages."${pkgs.system}".zerforschen-plus-content;
+            root = pkgs.zerforschen-plus-content;
             listen = [
               {
                 addr = ("unix:" + blog-domain-socket);
@@ -87,8 +87,7 @@ in
         };
     };
 
-    anubis = {
-      instances.main = {
+    anubis.instances.main = {
       enable = true;
       settings = {
         BIND = anubis-domain-socket;
@@ -96,7 +95,6 @@ in
       };
     };
   };
-  };
 
   networking.firewall.allowedTCPPorts = [
     80

hosts/vinzenz-lpt2/nginx.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 let
   blog-domain-socket = "/run/nginx/blog.sock";
   anubis-domain-socket = "/run/anubis/anubis-blog.sock";
@@ -34,7 +34,7 @@ in
         };
 
         "vinzenz-lpt2-in-anubis" = {
-          root = inputs.zerforschen-plus.packages."${pkgs.system}".zerforschen-plus-content;
+          root = pkgs.zerforschen-plus-content;
           listen = [
             {
               addr = ("unix:" + blog-domain-socket);

hosts/vinzenz-lpt2/zerforschen-plus.nix

@@ -1,7 +1,5 @@
 {
   pkgs,
-  system,
-  inputs,
   ...
 }:
 {
@@ -28,7 +26,7 @@
       "zerforschen.plus" = {
         #addSSL = true;
         #enableACME = true;
-        root = inputs.zerforschen-plus.packages."${pkgs.system}".zerforschen-plus-content;
+        root = pkgs.zerforschen-plus-content;
       };
     };
   };