--- a/inventory.py	Sun Jun 26 01:43:13 2022 -0700
+++ b/inventory.py	Sun Jul 10 19:05:58 2022 -0700
@@ -6,17 +6,14 @@
         'wireguard_address': '10.5.0.1',
     }),  #
     ('dash', {
-        "mac": "b8:97:5a:17:d7:1fzzz",
-        'ssh_hostname': '10.2.0.212',
+        'ssh_hostname': '10.2.0.210',
         'wireguard_address': '10.5.0.5',
     }),
     ('slash', {
-        'mac': 'c8:60:00:98:ec:74',
         'ssh_hostname': 'slash',
         'wireguard_address': '10.5.0.6',
     }),
     ('dot', {
-        'mac': '1c:c1:de:56:e6:70zzz',
         'ssh_hostname': 'dot',
         'wireguard_address': '10.5.0.30',
     })
@@ -24,7 +21,6 @@
 
 small = [
     ('pipe', {
-        'mac': '00:05:1b:33:3e:81',
         'ssh_hostname': '10.2.0.3',
         'wireguard_address': '10.5.0.3',
     }),
@@ -49,8 +45,8 @@
         'ssh_hostname': '162.243.138.136',
         'wireguard_address': '10.5.0.2',
     }),
-    # ('plus', {
-    #     'ssh_hostname': '10.2.0.136',
-    #     'wireguard_address': '10.5.0.110',
-    # }),
+    ('plus', {
+        'ssh_hostname': 'plus',
+        'wireguard_address': '10.5.0.110',
+    }),
 ]

--- a/packages.py	Sun Jun 26 01:43:13 2022 -0700
+++ b/packages.py	Sun Jul 10 19:05:58 2022 -0700
@@ -54,13 +54,17 @@
     'ncdu',
     "udns-utils",
     "atool",
+    "wireguard-tools",
     'iproute2', # needed for wireguard
+    'kitty-terminfo',
+    'zsh',
+    'xosview',
 ])
 
 if not is_pi:
     apt.packages(packages=[
         'keychain',
-        'python3-docker',
+        'podman-docker',
         'python3-invoke',
         'python3-pip',
         'python3-virtualenv',
@@ -77,7 +81,7 @@
         'oping',
         'mtr-tiny',
         'tcpdump',
-        'reptyr',
+        'htop',
     ])
     if host.name != 'pipe':
         apt.packages(packages=[
@@ -109,6 +113,7 @@
 
 if host.name == "bang":
     apt.packages(packages=[
+        'dnsmasq',
         'iptables',
         'openntpd',
         'ntpdate',

--- a/system.py	Sun Jun 26 01:43:13 2022 -0700
+++ b/system.py	Sun Jul 10 19:05:58 2022 -0700
@@ -48,7 +48,7 @@
 #
 
 # don't try to get aufs-dkms on rpi-- https://github.com/docker/for-linux/issues/709
-if not is_pi:
+if False and not is_pi: # maybe add podman? but do it in packages.py
     apt.packages(packages=['docker.io'], no_recommends=True)
     files.put(src='files/docker_daemon.json', dest='/etc/docker/daemon.json')
     systemd.service(service='docker', running=True, enabled=True, restarted=True)

--- a/templates/net/house_net.service.j2	Sun Jun 26 01:43:13 2022 -0700
+++ b/templates/net/house_net.service.j2	Sun Jul 10 19:05:58 2022 -0700
@@ -1,8 +1,10 @@
 [Unit]
 After=systemd-networkd.service
-After=docker.service
+#After=docker.service
 
 [Service]
 Type=oneshot
 ExecStart=/usr/sbin/iptables -A POSTROUTING --table nat --out-interface {{out_interface}} --jump MASQUERADE
 
+[Install]
+WantedBy=multi-user.target