Merge master into staging-next

2021-05-09 18:23:01 +00:00
parent bc1f4b790e 0c2ad9135f
commit 450e66080b
27 changed files with 178 additions and 136 deletions
@@ -6,7 +6,6 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
      networking.firewall.enable = false;
      virtualisation.vlans = [ 1 ];
      environment.systemPackages = with pkgs; [ wireguard-tools ];
-      boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
      systemd.network = {
        enable = true;
        netdevs = {