Commit dbb9b2d66d01

@@ -1,7 +1,5 @@
 {
-  config,
   lib,
-  pkgs,
   ...
 }:
 {

@@ -27,20 +27,20 @@
     virtualHosts."nagoya.sbr.pm" = {
       locations = lib.attrsets.mapAttrs' (
         name: value:
-        lib.attrsets.nameValuePair ("/syncthing/${name}/") ({
+        lib.attrsets.nameValuePair "/syncthing/${name}/" {
           proxyPass = "http://${builtins.head value.net.vpn.ips}:8384/";
           recommendedProxySettings = true;
-        })
-      ) (lib.attrsets.filterAttrs (name: value: (globals.fn.hasVPNips value)) globals.machines);
+        }
+      ) (lib.attrsets.filterAttrs (_name: value: (globals.fn.hasVPNips value)) globals.machines);
     };
     virtualHosts."nagoya.vpn" = {
       locations = lib.attrsets.mapAttrs' (
         name: value:
-        lib.attrsets.nameValuePair ("/syncthing/${name}/") ({
+        lib.attrsets.nameValuePair "/syncthing/${name}/" {
           proxyPass = "http://${builtins.head value.net.vpn.ips}:8384/";
           recommendedProxySettings = true;
-        })
-      ) (lib.attrsets.filterAttrs (name: value: (globals.fn.hasVPNips value)) globals.machines);
+        }
+      ) (lib.attrsets.filterAttrs (_name: value: (globals.fn.hasVPNips value)) globals.machines);
     };
   };
 

@@ -132,6 +132,9 @@ in
   };
   net = {
     dns = {
+      # TODO: https://discourse.nixos.org/t/dynamic-dns-on-bind/21361
+      # TODO: https://github.com/nix-community/dns.nix
+      # Maybe switch to nsd
       cacheNetworks = [
         "192.168.1.0/24"
         "10.100.0.0/24"
@@ -660,7 +663,7 @@ in
       );
 
     hostConfigs =
-      machines: lib.attrsets.mergeAttrsList (lib.attrsets.mapAttrsToList (_name: hostConfig) (machines));
+      machines: lib.attrsets.mergeAttrsList (lib.attrsets.mapAttrsToList (_name: hostConfig) machines);
 
     sshConfigs =
       machines: