fix peers picking defaults from networks

the-computer-club · Aug 1, 2024 · 84b49fd · 84b49fd
1 parent 6f0ae57
commit 84b49fd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 21 deletions.
diff --git a/dev/flake.lock b/dev/flake.lock
diff --git a/flake-modules/flake-guard/default.nix b/flake-modules/flake-guard/default.nix
@@ -49,11 +49,11 @@ in
     let cfg = config.flake-guard.networks;
     in
   {
-    # imports = [
-    #   (mkRenamedOptionModule
-    #     [ "networking" "wireguard" "networks" ]
-    #     [ "flake-guard" "networks" ])
-    # ];
+    imports = [
+      (mkRenamedOptionModule
+        [ "networking" "wireguard" "networks" ]
+        [ "flake-guard" "networks" ])
+    ];
 
     options.flake-guard = {
       enable = mkEnableOption "enable flake-guard nixos module";
@@ -108,17 +108,6 @@ in
 
             self = mkOption {
               type = types.attrsOf types.unspecified;
-
-              # types.submodule {
-              #   options = node-options.options // {
-              #     found = mkEnableOption "self was found.";
-
-              #     peers = mkOption {
-              #       type = types.attrsOf types.unspecified;
-              #       default = {};
-              #     };
-              #   };
-              # };
               default = {};
             };
           };

diff --git a/flake-modules/flake-guard/options.nix b/flake-modules/flake-guard/options.nix
@@ -85,7 +85,7 @@ in
             ((peer // {
               inherit groups;
               keyLookup = peer-name;
-              hostWriter = mkGuardOpt "hostsWriter";
+              hostsWriter = mkGuardOpt "hostsWriter";
               interfaceWriter = mkGuardOpt "interfaceWriter";
               secretslookup = mkGuardOpt "secretsLookup";
               listenPort = mkGuardOpt "listenPort";
@@ -117,7 +117,7 @@ in
           # a = 1;
           interfaceName = net-name;
           # peers.by-group = by-group;
-          # peers.by-name = by-name;
+          peers.by-name = by-name;
         }))
      # ) config.wireguard.networks;
     ) config.wireguard.networks);