Set some vpn-related options

bin/wg-add-external-qrcode

@@ -32,7 +32,7 @@ fi
 
 hostname=$1
 
-readonly config_file_path="$MACHINES_PATH/external/$hostname/wg_gateway.json"
+readonly config_file_path="$MACHINES_PATH/external/$hostname/qnet.json"
 
 if [[ ! -f $config_file_path ]]
 then

configuration.nix

@@ -2,6 +2,7 @@
 { name, path, channel, isIso, extraLayersDir, flakeInputs, flakeOutputs, system, extraOverlays }:
 { lib, config, pkgs, ... }:
 
+with lib;
 
 let
   installResult = builtins.fromJSON (builtins.readFile (path + "/install-result.json"));
@@ -83,4 +84,17 @@ in
 
   # Default hostname ist machine directory name
   networking.hostName = lib.mkDefault name;
+
+  queezle.qnet =
+    let
+      qnetFile = path + "/qnet.json";
+      exists = builtins.pathExists qnetFile;
+      qnet = if exists then builtins.fromJSON (builtins.readFile qnetFile) else null;
+    in if exists then {
+      enable = mkDefault true;
+      address = mkDefault qnet.address;
+      allowedIPs = mkDefault qnet.allowedIPs;
+      peerEndpoint = mkDefault qnet.peerEndpoint;
+      publicKey = mkDefault qnet.publicKey;
+    } else {};
 }

machine-manager.nix

 # applied by this repositories flake
 { flakeInputs, flakeOutputs }:
 # applied by outer flake
-{ extraFlakeInputs, extraFlakeOutputs, machinesDir, extraLayersDir, extraOverlays ? [] }:
+{ extraFlakeInputs, extraFlakeOutputs, machinesDir, extraModules, extraLayersDir, extraOverlays ? [] }:
 
 with builtins;
 with flakeInputs.nixpkgs.lib;
@@ -35,6 +35,7 @@ let
             flakeOutputs = finalFlakeOutputs;
             channel = machineChannels.${name};
           })
+          extraModules
         ] ++ optional isMobileNixos (import "${flakeInputs.mobile-nixos}/lib/configuration.nix" { device = mobileNixosDevice; });
         _module.args.flakeInputs = finalFlakeInputs;
         _module.args.flakeOutputs = finalFlakeOutputs;