hosts/chocolatebar/chocolatebar.nix

@@ -29,7 +29,6 @@ in
       wayvnc
       drone-docker-runner
       stdenv.cc.cc.lib
-      pkgs.hplip
     ];
 
     age.secrets."vnc-key.pem" = {

hosts/chocolatebar/factorio/default.nix

@@ -22,7 +22,6 @@ in
       enable = true;
       port = 34197; # The default, but make it explicit
       lan = true;
-      game-password = "pls-dont-grief";
       admins = [
         "doubtwriter"
         "kattykat"
@@ -31,13 +30,9 @@ in
       autosave-interval = 3;
       game-name = "Babes plays v2";
       requireUserVerification = false;
-      bind = "::";
       mods = [
         far-reach
       ];
     };
-
-    networking.firewall.allowedUDPPorts = [ 34197 ];
-    networking.firewall.allowedTCPPorts = [ 34197 ];
   };
 }

modules/core/networking.nix

@@ -43,18 +43,12 @@ in
     nix.binaryCachePublicKeys = cfg.publicKeys;
 
     # These entries get added to /etc/hosts
-    networking.hosts =
+    networking.hosts = {
-      let
+      "127.0.0.1" = [ ]
-        hostnames = [ ]
+        ++ lib.optionals cfg.enableCaddy [ "caddy.local" ]
-          ++ lib.optionals cfg.enableCaddy [ "caddy.local" ]
+        ++ lib.optionals config.pub-solar.printing.enable [ "cups.local" ]
-          ++ lib.optionals config.pub-solar.printing.enable [ "cups.local" ]
+        ++ lib.optionals cfg.enableHelp [ "help.local" ];
-          ++ lib.optionals config.pub-solar.paperless.enable [ "paperless.local" ]
+    };
-          ++ lib.optionals cfg.enableHelp [ "help.local" ];
-      in
-      {
-        "127.0.0.1" = hostnames;
-        "::1" = hostnames;
-      };
 
     # Caddy reverse proxy for local services like cups
     services.caddy = {
@@ -73,15 +67,6 @@ in
             }
           '')
 
-        (lib.optionalString
-          config.pub-solar.paperless.enable
-          ''
-            paperless.local:80 {
-              request_header Host localhost:28981
-              reverse_proxy localhost:28981
-            }
-          '')
-
         (lib.optionalString
           cfg.enableHelp
           ''

modules/paperless/default.nix

@@ -23,15 +23,15 @@ in
   };
 
   config = mkIf cfg.enable {
-    services.paperless = {
+    services.paperless-ng = {
       enable = true;
-      user = psCfg.user.name;
       consumptionDir = cfg.consumptionDir;
       extraConfig = {
         PAPERLESS_OCR_LANGUAGE = cfg.ocrLanguage;
-        PAPERLESS_ADMIN_USER = psCfg.user.name;
-        PAPERLESS_AUTO_LOGIN_USERNAME = psCfg.user.name;
       };
     };
+    environment.systemPackages = [
+      pkgs.hplip
+    ];
   };
 }

users/ben/default.nix

@@ -30,10 +30,7 @@ in
         ];
       };
 
-      paperless = {
+      paperless.enable = true;
-        enable = false;
-        ocrLanguage = "nld+deu";
-      };
       arduino.enable = true;
       email.enable = true;
       uhk.enable = true;