--- a/net.py	Sat Oct 29 21:34:50 2022 -0700
+++ b/net.py	Sun Oct 30 14:19:46 2022 -0700
@@ -7,7 +7,6 @@
 
 def cleanup():
     # past attempts
-    files.file(path='/etc/netplan/99-pyinfra-written.yaml', present=False)
     files.file(path='/etc/network/interfaces', present=False)
 
     for search_dir in [
@@ -23,9 +22,7 @@
             delete=True,
         )
 
-    apt.packages(packages=['network-manager', 'connman'], present=False)
-
-    # On bang:
+    # On bang (now pipe):
     #   Now using a HW router for this firewall. No incoming connections.
     #   test connections from the outside:
     #   http://www.t1shopper.com/tools/port-scanner/
@@ -43,52 +40,55 @@
 ])
 # needs reboot if this changed
 
-server.sysctl(key='net.ipv6.conf.all.disable_ipv6', value=1, persist=True)
+if host.name in ['slash', 'dash']:
+    pass # don't break k3s networking!
+else:
+    server.sysctl(key='net.ipv6.conf.all.disable_ipv6', value=1, persist=True)
 
-if is_wifi_pi:
-    files.put(dest="/etc/network/interfaces.d/wlan0", src="files/pi_wlan0_powersave")
-    ssh.command(host.name, "iw wlan0 set power_save off")
-    
-files.directory('/etc/systemd/network')
-if host.name == 'prime':
-    cleanup()
+    if is_wifi_pi:
+        files.put(dest="/etc/network/interfaces.d/wlan0", src="files/pi_wlan0_powersave")
+        ssh.command(host.name, "iw wlan0 set power_save off")
+        
+    files.directory('/etc/systemd/network')
+    if host.name == 'prime':
+        cleanup()
 
-    files.template(
-        src="templates/net/prime.network.j2",
-        dest="/etc/systemd/network/99-prime.network",
-        mac=host.host_data['mac'],
-    )
+        files.template(
+            src="templates/net/prime.network.j2",
+            dest="/etc/systemd/network/99-prime.network",
+            mac=host.host_data['mac'],
+        )
 
-elif host.name == 'bang':
-    cleanup()
+    elif host.name == 'bang':
+        cleanup()
 
-    files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
-    files.file(path="/etc/systemd/network/99-isp.network", present=False)
-    files.file(path="/etc/systemd/system/house_net.service", present=False)
-    systemd.service(service='house_net.service', enabled=False, running=False)
+        files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/20-10.2.network")
+        apt.packages(packages=['network-manager'], present=False)
+
 
-elif host.name == 'plus':
-    pass
+    elif host.name == 'plus':
+        apt.packages(packages=['network-manager'], present=True)
 
-elif host.name == 'pipe':
-    cleanup()
+    elif host.name == 'pipe':
+        cleanup()
 
-    files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
-    files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
-    server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
-    files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='eth0')
-    systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
+        files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
+        files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
+        server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
+        files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='eth0')
+        systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
 
-else:
-    cleanup()
+    else:
+        cleanup()
 
-    if is_wifi:
-        files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf")
+        if is_wifi:
+            files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf")
 
-    files.template(
-        src="templates/net/singlenic.network.j2",
-        dest="/etc/systemd/network/99-bigasterisk.network",
-        create_remote_dir=True,
-    )
-
-systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
+        files.template(
+            src="templates/net/singlenic.network.j2",
+            dest="/etc/systemd/network/20-bigasterisk.network",
+            create_remote_dir=True,
+        )
+        apt.packages(packages=['network-manager'], present=False)
+        
+    systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)