Flatten host configs

hosts/ayypad.toml

@@ -1,9 +1,6 @@
-[i3status]
 wireless = ["wlp4s0"]
 ethernet = ["enp2s0"]
 disks = ["/", "/home", "/media/hdd"]
-
-[xinit]
 outputs = [
     { name = "eDP", config = ["--auto", "--primary"] },
     { name = "HDMI-A-0" },

hosts/seraph.toml

@@ -1,8 +1,5 @@
-[i3status]
 ethernet = ["enp5s0"]
 disks = ["/", "/home"]
-
-[xinit]
 outputs = [
     { name = "HDMI-A-0", config = ["--auto", "--primary"] },
     { name = "DVI-D-0", config = ["--auto", "--left-of", "HDMI-A-0"] },

hosts/smolboi.toml

@@ -1,9 +1,6 @@
-[i3status]
 wireless = ["wlp36s0"]
 ethernet = ["enp37s0"]
 disks = ["/", "/home"]
-
-[xinit]
 outputs = [
     { name = "HDMI-A-1", config = ["--auto", "--primary"] },
     { name = "DVI-D-0", config = ["--auto", "--left-of", "HDMI-A-0"] },

templates/.config/i3status/config

@@ -1,10 +1,9 @@
-<% i3status = host.get('i3status', {}) %>\
 general {
     colors = true
     interval = 5
 }
 
-% for iface in i3status.get('wireless', []):
+% for iface in host.get('wireless', []):
 wireless ${iface} {
     format_up = "${iface} %ip %essid %quality"
     format_down = "${iface} down"
@@ -12,7 +11,7 @@ wireless ${iface} {
 order += "wireless ${iface}"
 
 % endfor
-% for iface in i3status.get('ethernet', []):
+% for iface in host.get('ethernet', []):
 ethernet ${iface} {
     format_up = "${iface} %ip"
     format_down = "${iface} down"
@@ -20,7 +19,7 @@ ethernet ${iface} {
 order += "ethernet ${iface}"
 
 % endfor
-% for disk in i3status.get('disks', ['/']):
+% for disk in host.get('disks', ['/']):
 disk "${disk}" {
     format = "${disk} %avail"
 }

templates/.xinitrc

@@ -1,7 +1,6 @@
-<% xinit = host.get('xinit', {}) %>\
 #!/bin/sh
 
-% for output in xinit.get('outputs', []):
+% for output in host.get('outputs', []):
 xrandr --output '${output['name']}' --set TearFree on \
 % if output.get('config'):
 ${' '.join(output['config'])}\