From fb9ce235fae7262f3cfd5557d1bc9eb1f9f57c9d Mon Sep 17 00:00:00 2001
From: brent s <bts@square-r00t.net>
Date: Mon, 9 Dec 2019 07:16:33 -0500
Subject: [PATCH] i think this is a better path forward

---
 schema/lib/types/aif.xsd         | 251 +++++++++++++++++++++++++
 schema/{ => lib/types}/bsd.xsd   |  23 ++-
 schema/{ => lib/types}/linux.xsd |  23 ++-
 schema/{ => lib/types}/net.xsd   |  11 +-
 schema/{ => lib/types}/std.xsd   |   6 +-
 schema/{ => lib/types}/sys.xsd   |   4 +-
 schema/{ => lib/types}/unix.xsd  |  11 +-
 schema/{ => projects}/aif.xsd    | 309 ++++---------------------------
 schema/{ => projects}/bdisk.xsd  |   4 +-
 9 files changed, 335 insertions(+), 307 deletions(-)
 create mode 100644 schema/lib/types/aif.xsd
 rename schema/{ => lib/types}/bsd.xsd (53%)
 rename schema/{ => lib/types}/linux.xsd (96%)
 rename schema/{ => lib/types}/net.xsd (94%)
 rename schema/{ => lib/types}/std.xsd (96%)
 rename schema/{ => lib/types}/sys.xsd (79%)
 rename schema/{ => lib/types}/unix.xsd (92%)
 rename schema/{ => projects}/aif.xsd (51%)
 rename schema/{ => projects}/bdisk.xsd (77%)

diff --git a/schema/lib/types/aif.xsd b/schema/lib/types/aif.xsd
new file mode 100644
index 0000000..35af114
--- /dev/null
+++ b/schema/lib/types/aif.xsd
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/aif.xsd"
+           xmlns="https://schema.xml.r00t2.io/lib/types/aif.xsd"
+           xmlns:t_aif="https://schema.xml.r00t2.io/lib/types/aif.xsd"
+           xmlns:linux="https://schema.xml.r00t2.io/lib/types/linux.xsd"
+           xmlns:net="https://schema.xml.r00t2.io/lib/types/net.xsd"
+           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
+           xmlns:unix="https://schema.xml.r00t2.io/lib/types/unix.xsd"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="unqualified"
+           attributeFormDefault="unqualified">
+
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/linux.xsd"
+               schemaLocation="./linux.xsd"/>
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/net.xsd"
+               schemaLocation="./net.xsd"/>
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
+               schemaLocation="./std.xsd"/>
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/unix.xsd"
+               schemaLocation="./unix.xsd"/>
+
+        <xs:simpleType name="t_auto_ip6">
+        <xs:union memberTypes="net:t_auto_ip6">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="false"/>
+                    <xs:enumeration value="none"/>
+                    <xs:enumeration value="0"/>
+                    <xs:whiteSpace value="collapse"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:union>
+    </xs:simpleType>
+
+    <xs:simpleType name="t_bootloaders">
+        <!-- TODO: expand?
+             https://wiki.archlinux.org/index.php/Category:Boot_loaders
+             https://wiki.archlinux.org/index.php/Arch_boot_process#Boot_loader -->
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="grub"/>
+            <xs:enumeration value="systemd"/>
+            <xs:enumeration value="syslinux"/>
+            <xs:enumeration value="lilo"/>
+            <xs:whiteSpace value="collapse"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="t_dhcp_clients">
+        <!-- Only valid for netctl. AIF-NG uses the internal daemons for systemd-networkd and NM. -->
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="dhcpcd"/>
+            <xs:enumeration value="dhclient"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:complexType name="t_iface">
+        <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element name="addresses" minOccurs="0" maxOccurs="1">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element name="ipv4">
+                                    <xs:complexType>
+                                        <xs:sequence>
+                                            <xs:element name="address" minOccurs="0" maxOccurs="unbounded">
+                                                <xs:complexType>
+                                                    <xs:simpleContent>
+                                                        <xs:extension base="net:t_qualified_addr_ip4">
+                                                            <xs:attribute name="gateway"
+                                                                          type="net:t_addr_ip4"
+                                                                          use="optional"/>
+                                                        </xs:extension>
+                                                    </xs:simpleContent>
+                                                </xs:complexType>
+                                            </xs:element>
+                                        </xs:sequence>
+                                        <xs:attribute name="auto" type="xs:boolean" use="optional" default="true"/>
+                                    </xs:complexType>
+                                    <xs:unique name="uniq_ipv4_addr">
+                                        <xs:selector xpath="t_aif:address"/>
+                                        <xs:field xpath="."/>
+                                    </xs:unique>
+                                </xs:element>
+                                <xs:element name="ipv6">
+                                    <xs:complexType>
+                                        <xs:sequence>
+                                            <xs:element name="address" minOccurs="0" maxOccurs="unbounded">
+                                                <xs:complexType>
+                                                    <xs:simpleContent>
+                                                        <xs:extension base="net:t_qualified_addr_ip6">
+                                                            <xs:attribute name="gateway"
+                                                                          type="net:t_addr_ip6"
+                                                                          use="optional"/>
+                                                        </xs:extension>
+                                                    </xs:simpleContent>
+                                                </xs:complexType>
+                                            </xs:element>
+                                        </xs:sequence>
+                                        <xs:attribute name="auto" type="net:t_auto_ip6"
+                                                      use="optional" default="slaac"/>
+                                    </xs:complexType>
+                                    <xs:unique name="uniq_ipv6_addr">
+                                        <xs:selector xpath="t_aif:address"/>
+                                        <xs:field xpath="."/>
+                                    </xs:unique>
+                                </xs:element>
+                            </xs:choice>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="resolvers" minOccurs="0" maxOccurs="1">
+                    <xs:complexType>
+                        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                            <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element name="resolver" minOccurs="1" maxOccurs="unbounded" type="net:t_both_addr"/>
+                                <xs:element name="ipv4" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                        <xs:attribute name="auto" type="xs:boolean"
+                                                      use="required"/>
+                                    </xs:complexType>
+                                </xs:element>
+                                <xs:element name="ipv6" minOccurs="0" maxOccurs="1">
+                                    <xs:complexType>
+                                        <xs:attribute name="auto" type="xs:boolean"
+                                                      use="required"/>
+                                    </xs:complexType>
+                                </xs:element>
+                            </xs:choice>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="routes" minOccurs="0" maxOccurs="1">
+                    <xs:complexType>
+                        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                            <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element name="ipv4">
+                                    <xs:complexType>
+                                        <xs:sequence>
+                                            <xs:element name="route" minOccurs="0" maxOccurs="unbounded">
+                                                <xs:complexType>
+                                                    <xs:simpleContent>
+                                                        <xs:extension base="net:t_qualified_addr_ip4">
+                                                            <xs:attribute name="gateway"
+                                                                          type="net:t_addr_ip4"
+                                                                          use="required"/>
+                                                        </xs:extension>
+                                                    </xs:simpleContent>
+                                                </xs:complexType>
+                                            </xs:element>
+                                        </xs:sequence>
+                                        <xs:attribute name="auto" type="xs:boolean" use="optional" default="true"/>
+                                    </xs:complexType>
+                                    <xs:unique name="uniq_ipv4_route">
+                                        <xs:selector xpath="t_aif:route"/>
+                                        <xs:field xpath="."/>
+                                    </xs:unique>
+                                </xs:element>
+                                <xs:element name="ipv6">
+                                    <xs:complexType>
+                                        <xs:sequence>
+                                            <xs:element name="address" minOccurs="0" maxOccurs="unbounded">
+                                                <xs:complexType>
+                                                    <xs:simpleContent>
+                                                        <xs:extension base="net:t_qualified_addr_ip6">
+                                                            <xs:attribute name="gateway"
+                                                                          type="net:t_addr_ip6"
+                                                                          use="required"/>
+                                                        </xs:extension>
+                                                    </xs:simpleContent>
+                                                </xs:complexType>
+                                            </xs:element>
+                                        </xs:sequence>
+                                        <!-- DHCPv6 does not have an option to send routes,
+                                             so you need to use RAs. -->
+                                        <!-- See https://www.isc.org/blogs/routing-configuration-over-dhcpv6-2/
+                                             for more information. -->
+                                        <!-- https://datatracker.ietf.org/doc/draft-ietf-mif-dhcpv6-route-option/
+                                             expired. Shame, that. -->
+                                        <xs:attribute name="auto" type="xs:boolean" use="optional" default="true"/>
+                                    </xs:complexType>
+                                    <xs:unique name="uniq_ipv6_route">
+                                        <xs:selector xpath="t_aif:route"/>
+                                        <xs:field xpath="."/>
+                                    </xs:unique>
+                                </xs:element>
+                            </xs:choice>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:choice>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:ID" use="required"/>
+        <xs:attribute name="device" type="linux:t_iface_name" use="required"/>
+        <xs:attribute name="defroute" type="xs:boolean" use="optional" default="false"/>
+        <xs:attribute name="searchDomain" type="std:t_nonempty" use="optional"/>
+    </xs:complexType>
+
+    <xs:simpleType name="t_iface_name">
+        <xs:union memberTypes="linux:t_iface_name">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="auto"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:union>
+    </xs:simpleType>
+
+    <xs:complexType name="t_iface_wifi">
+        <xs:complexContent>
+            <xs:extension base="t_iface">
+                <xs:sequence>
+                    <xs:element name="encryption" type="net:t_wifi_crypto" minOccurs="0" maxOccurs="1"/>
+                </xs:sequence>
+                <!-- TODO: SSID needs to support unicode chars in both XML(/XSD type=?) and program -->
+                <xs:attribute name="essid" type="xs:string" use="required"/>
+                <xs:attribute name="bssid" type="net:t_mac_addr" use="optional"/>
+                <xs:attribute name="hidden" type="xs:boolean" use="optional" default="false"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:simpleType name="t_netproto">
+        <xs:union memberTypes="net:t_netproto">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="both"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:union>
+    </xs:simpleType>
+
+    <xs:simpleType name="t_netprov">
+        <xs:restriction base="xs:token">
+            <xs:enumeration value="netctl"/>
+            <xs:enumeration value="nm"/>
+            <xs:enumeration value="networkd"/>
+            <xs:whiteSpace value="collapse"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="t_pacuri">
+        <!-- xs:anyURI is too permissive. -->
+        <!-- <xs:restriction base="xs:anyURI"> -->
+        <xs:restriction base="xs:token">
+            <xs:pattern value="(file|https?)://.+"/>
+            <xs:whiteSpace value="collapse"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+</xs:schema>
diff --git a/schema/bsd.xsd b/schema/lib/types/bsd.xsd
similarity index 53%
rename from schema/bsd.xsd
rename to schema/lib/types/bsd.xsd
index 3706f40..95c005d 100644
--- a/schema/bsd.xsd
+++ b/schema/lib/types/bsd.xsd
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="http://schema.xml.r00t2.io/linux.xsd"
-           xmlns="http://schema.xml.r00t2.io/bsd.xsd"
-           xmlns:bsd="http://schema.xml.r00t2.io/bsd.xsd"
-           xmlns:linux="http://schema.xml.r00t2.io/linux.xsd"
-           xmlns:std="http://schema.xml.r00t2.io/std.xsd"
-           xmlns:unix="http://schema.xml.r00t2.io/unix.xsd"
+<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/bsd.xsd"
+           xmlns="https://schema.xml.r00t2.io/lib/types/bsd.xsd"
+           xmlns:bsd="https://schema.xml.r00t2.io/lib/types/bsd.xsd"
+           xmlns:linux="https://schema.xml.r00t2.io/lib/types/linux.xsd"
+           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
+           xmlns:unix="https://schema.xml.r00t2.io/lib/types/bsd.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           elementFormDefault="qualified"
-           attributeFormDefault="qualified">
+           elementFormDefault="unqualified"
+           attributeFormDefault="unqualified">
+
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/linux.xsd"
+               schemaLocation="./linux.xsd"/>
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
+               schemaLocation="./std.xsd"/>
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/unix.xsd"
+               schemaLocation="./unix.xsd"/>
 
     <xs:simpleType name="t_passwd_hashtypes">
         <xs:union memberTypes="linux:t_passwd_hashtypes">
diff --git a/schema/linux.xsd b/schema/lib/types/linux.xsd
similarity index 96%
rename from schema/linux.xsd
rename to schema/lib/types/linux.xsd
index 400e15e..8ee05e2 100644
--- a/schema/linux.xsd
+++ b/schema/lib/types/linux.xsd
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="http://schema.xml.r00t2.io/linux.xsd"
-           xmlns="http://schema.xml.r00t2.io/linux.xsd"
-           xmlns:linux="http://schema.xml.r00t2.io/linux.xsd"
-           xmlns:std="http://schema.xml.r00t2.io/std.xsd"
-           xmlns:sys="http://schema.xml.r00t2.io/sys.xsd"
-           xmlns:unix="http://schema.xml.r00t2.io/unix.xsd"
+<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/linux.xsd"
+           xmlns="https://schema.xml.r00t2.io/lib/types/linux.xsd"
+           xmlns:linux="https://schema.xml.r00t2.io/lib/types/linux.xsd"
+           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
+           xmlns:sys="https://schema.xml.r00t2.io/lib/types/sys.xsd"
+           xmlns:unix="https://schema.xml.r00t2.io/lib/types/unix.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           elementFormDefault="qualified"
+           elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
 
-    <xs:import namespace="http://schema.xml.r00t2.io/std.xsd" schemaLocation="http://schema.xml.r00t2.io/std.xsd"/>
-    <xs:import namespace="http://schema.xml.r00t2.io/sys.xsd" schemaLocation="http://schema.xml.r00t2.io/sys.xsd"/>
-    <xs:import namespace="http://schema.xml.r00t2.io/unix.xsd" schemaLocation="http://schema.xml.r00t2.io/unix.xsd"/>
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
+               schemaLocation="./std.xsd"/>
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/sys.xsd"
+               schemaLocation="./sys.xsd"/>
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/unix.xsd"
+               schemaLocation="./unix.xsd"/>
 
     <xs:simpleType name="t_console_pageformats">
         <xs:restriction base="xs:positiveInteger">
diff --git a/schema/net.xsd b/schema/lib/types/net.xsd
similarity index 94%
rename from schema/net.xsd
rename to schema/lib/types/net.xsd
index f08587e..d9e7d6f 100644
--- a/schema/net.xsd
+++ b/schema/lib/types/net.xsd
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="http://schema.xml.r00t2.io/net.xsd"
-           xmlns="http://schema.xml.r00t2.io/net.xsd"
-           xmlns:net="http://schema.xml.r00t2.io/net.xsd"
-           xmlns:std="http://schema.xml.r00t2.io/std.xsd"
+<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/net.xsd"
+           xmlns="https://schema.xml.r00t2.io/lib/types/net.xsd"
+           xmlns:net="https://schema.xml.r00t2.io/lib/types/net.xsd"
+           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
 
-    <xs:import namespace="http://schema.xml.r00t2.io/std.xsd" schemaLocation="http://schema.xml.r00t2.io/std.xsd"/>
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
+               schemaLocation="./std.xsd"/>
 
     <xs:simpleType name="t_addr_ip4">
         <xs:restriction base="xs:string">
diff --git a/schema/std.xsd b/schema/lib/types/std.xsd
similarity index 96%
rename from schema/std.xsd
rename to schema/lib/types/std.xsd
index da646c4..517aa2d 100644
--- a/schema/std.xsd
+++ b/schema/lib/types/std.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="http://schema.xml.r00t2.io/std.xsd"
-           xmlns="http://schema.xml.r00t2.io/std.xsd"
-           xmlns:std="http://schema.xml.r00t2.io/std.xsd"
+<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
+           xmlns="https://schema.xml.r00t2.io/lib/types/std.xsd"
+           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
diff --git a/schema/sys.xsd b/schema/lib/types/sys.xsd
similarity index 79%
rename from schema/sys.xsd
rename to schema/lib/types/sys.xsd
index 3e7fcfb..37ee35f 100644
--- a/schema/sys.xsd
+++ b/schema/lib/types/sys.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="http://schema.xml.r00t2.io/sys.xsd"
-           xmlns="http://schema.xml.r00t2.io/sys.xsd"
+<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/sys.xsd"
+           xmlns="https://schema.xml.r00t2.io/lib/types/sys.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
diff --git a/schema/unix.xsd b/schema/lib/types/unix.xsd
similarity index 92%
rename from schema/unix.xsd
rename to schema/lib/types/unix.xsd
index 2c0bb19..83c319e 100644
--- a/schema/unix.xsd
+++ b/schema/lib/types/unix.xsd
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema targetNamespace="http://schema.xml.r00t2.io/unix.xsd"
-           xmlns="http://schema.xml.r00t2.io/unix.xsd"
-           xmlns:std="http://schema.xml.r00t2.io/std.xsd"
-           xmlns:unix="http://schema.xml.r00t2.io/unix.xsd"
+<xs:schema targetNamespace="https://schema.xml.r00t2.io/lib/types/unix.xsd"
+           xmlns="https://schema.xml.r00t2.io/lib/types/unix.xsd"
+           xmlns:std="https://schema.xml.r00t2.io/lib/types/std.xsd"
+           xmlns:unix="https://schema.xml.r00t2.io/lib/types/unix.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
 
-    <xs:import namespace="http://schema.xml.r00t2.io/std.xsd" schemaLocation="http://schema.xml.r00t2.io/std.xsd"/>
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/std.xsd"
+               schemaLocation="./std.xsd"/>
 
     <xs:simpleType name="t_filepath">
         <xs:restriction base="xs:string">
diff --git a/schema/aif.xsd b/schema/projects/aif.xsd
similarity index 51%
rename from schema/aif.xsd
rename to schema/projects/aif.xsd
index a0d86be..2b0e697 100644
--- a/schema/aif.xsd
+++ b/schema/projects/aif.xsd
@@ -2,247 +2,12 @@
 <xs:schema targetNamespace="https://aif-ng.io/"
            xmlns="https://aif-ng.io/"
            xmlns:aif="https://aif-ng.io/"
-           xmlns:linux="http://schema.xml.r00t2.io/linux.xsd"
-           xmlns:net="http://schema.xml.r00t2.io/net.xsd"
-           xmlns:std="http://schema.xml.r00t2.io/std.xsd"
-           xmlns:unix="http://schema.xml.r00t2.io/unix.xsd"
+           xmlns:t_aif="https://schema.xml.r00t2.io/lib/types/aif.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            elementFormDefault="qualified"
            attributeFormDefault="unqualified">
 
-    <xs:import namespace="http://schema.xml.r00t2.io/linux.xsd" schemaLocation="http://schema.xml.r00t2.io/linux.xsd"/>
-    <xs:import namespace="http://schema.xml.r00t2.io/net.xsd" schemaLocation="http://schema.xml.r00t2.io/net.xsd"/>
-    <xs:import namespace="http://schema.xml.r00t2.io/std.xsd" schemaLocation="http://schema.xml.r00t2.io/std.xsd"/>
-    <xs:import namespace="http://schema.xml.r00t2.io/unix.xsd" schemaLocation="http://schema.xml.r00t2.io/unix.xsd"/>
-
-    <xs:simpleType name="t_auto_ip6">
-        <xs:union memberTypes="net:t_auto_ip6">
-            <xs:simpleType>
-                <xs:restriction base="xs:string">
-                    <xs:enumeration value="false"/>
-                    <xs:enumeration value="none"/>
-                    <xs:enumeration value="0"/>
-                    <xs:whiteSpace value="collapse"/>
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:union>
-    </xs:simpleType>
-
-    <xs:simpleType name="t_bootloaders">
-        <!-- TODO: expand?
-             https://wiki.archlinux.org/index.php/Category:Boot_loaders
-             https://wiki.archlinux.org/index.php/Arch_boot_process#Boot_loader -->
-        <xs:restriction base="xs:token">
-            <xs:enumeration value="grub"/>
-            <xs:enumeration value="systemd"/>
-            <xs:enumeration value="syslinux"/>
-            <xs:enumeration value="lilo"/>
-            <xs:whiteSpace value="collapse"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="t_dhcp_clients">
-        <!-- Only valid for netctl. AIF-NG uses the internal daemons for systemd-networkd and NM. -->
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="dhcpcd"/>
-            <xs:enumeration value="dhclient"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:complexType name="t_iface">
-        <xs:sequence>
-            <xs:choice maxOccurs="unbounded">
-                <xs:element name="addresses" minOccurs="0" maxOccurs="1">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:element name="ipv4">
-                                    <xs:complexType>
-                                        <xs:sequence>
-                                            <xs:element name="address" minOccurs="0" maxOccurs="unbounded">
-                                                <xs:complexType>
-                                                    <xs:simpleContent>
-                                                        <xs:extension base="net:t_qualified_addr_ip4">
-                                                            <xs:attribute name="gateway"
-                                                                          type="net:t_addr_ip4"
-                                                                          use="optional"/>
-                                                        </xs:extension>
-                                                    </xs:simpleContent>
-                                                </xs:complexType>
-                                            </xs:element>
-                                        </xs:sequence>
-                                        <xs:attribute name="auto" type="xs:boolean" use="optional" default="true"/>
-                                    </xs:complexType>
-                                    <xs:unique name="uniq_ipv4_addr">
-                                        <xs:selector xpath="aif:address"/>
-                                        <xs:field xpath="."/>
-                                    </xs:unique>
-                                </xs:element>
-                                <xs:element name="ipv6">
-                                    <xs:complexType>
-                                        <xs:sequence>
-                                            <xs:element name="address" minOccurs="0" maxOccurs="unbounded">
-                                                <xs:complexType>
-                                                    <xs:simpleContent>
-                                                        <xs:extension base="net:t_qualified_addr_ip6">
-                                                            <xs:attribute name="gateway"
-                                                                          type="net:t_addr_ip6"
-                                                                          use="optional"/>
-                                                        </xs:extension>
-                                                    </xs:simpleContent>
-                                                </xs:complexType>
-                                            </xs:element>
-                                        </xs:sequence>
-                                        <xs:attribute name="auto" type="net:t_auto_ip6"
-                                                      use="optional" default="slaac"/>
-                                    </xs:complexType>
-                                    <xs:unique name="uniq_ipv6_addr">
-                                        <xs:selector xpath="aif:address"/>
-                                        <xs:field xpath="."/>
-                                    </xs:unique>
-                                </xs:element>
-                            </xs:choice>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-                <xs:element name="resolvers" minOccurs="0" maxOccurs="1">
-                    <xs:complexType>
-                        <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                            <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:element name="resolver" minOccurs="1" maxOccurs="unbounded" type="net:t_both_addr"/>
-                                <xs:element name="ipv4" minOccurs="0" maxOccurs="1">
-                                    <xs:complexType>
-                                        <xs:attribute name="auto" type="xs:boolean"
-                                                      use="required"/>
-                                    </xs:complexType>
-                                </xs:element>
-                                <xs:element name="ipv6" minOccurs="0" maxOccurs="1">
-                                    <xs:complexType>
-                                        <xs:attribute name="auto" type="xs:boolean"
-                                                      use="required"/>
-                                    </xs:complexType>
-                                </xs:element>
-                            </xs:choice>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-                <xs:element name="routes" minOccurs="0" maxOccurs="1">
-                    <xs:complexType>
-                        <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                            <xs:choice minOccurs="1" maxOccurs="unbounded">
-                                <xs:element name="ipv4">
-                                    <xs:complexType>
-                                        <xs:sequence>
-                                            <xs:element name="route" minOccurs="0" maxOccurs="unbounded">
-                                                <xs:complexType>
-                                                    <xs:simpleContent>
-                                                        <xs:extension base="net:t_qualified_addr_ip4">
-                                                            <xs:attribute name="gateway"
-                                                                          type="net:t_addr_ip4"
-                                                                          use="required"/>
-                                                        </xs:extension>
-                                                    </xs:simpleContent>
-                                                </xs:complexType>
-                                            </xs:element>
-                                        </xs:sequence>
-                                        <xs:attribute name="auto" type="xs:boolean" use="optional" default="true"/>
-                                    </xs:complexType>
-                                    <xs:unique name="uniq_ipv4_route">
-                                        <xs:selector xpath="aif:route"/>
-                                        <xs:field xpath="."/>
-                                    </xs:unique>
-                                </xs:element>
-                                <xs:element name="ipv6">
-                                    <xs:complexType>
-                                        <xs:sequence>
-                                            <xs:element name="address" minOccurs="0" maxOccurs="unbounded">
-                                                <xs:complexType>
-                                                    <xs:simpleContent>
-                                                        <xs:extension base="net:t_qualified_addr_ip6">
-                                                            <xs:attribute name="gateway"
-                                                                          type="net:t_addr_ip6"
-                                                                          use="required"/>
-                                                        </xs:extension>
-                                                    </xs:simpleContent>
-                                                </xs:complexType>
-                                            </xs:element>
-                                        </xs:sequence>
-                                        <!-- DHCPv6 does not have an option to send routes,
-                                             so you need to use RAs. -->
-                                        <!-- See https://www.isc.org/blogs/routing-configuration-over-dhcpv6-2/
-                                             for more information. -->
-                                        <!-- https://datatracker.ietf.org/doc/draft-ietf-mif-dhcpv6-route-option/
-                                             expired. Shame, that. -->
-                                        <xs:attribute name="auto" type="xs:boolean" use="optional" default="true"/>
-                                    </xs:complexType>
-                                    <xs:unique name="uniq_ipv6_route">
-                                        <xs:selector xpath="aif:route"/>
-                                        <xs:field xpath="."/>
-                                    </xs:unique>
-                                </xs:element>
-                            </xs:choice>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:choice>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID" use="required"/>
-        <xs:attribute name="device" type="linux:t_iface_name" use="required"/>
-        <xs:attribute name="defroute" type="xs:boolean" use="optional" default="false"/>
-        <xs:attribute name="searchDomain" type="std:t_nonempty" use="optional"/>
-    </xs:complexType>
-
-    <xs:simpleType name="t_iface_name">
-        <xs:union memberTypes="linux:t_iface_name">
-            <xs:simpleType>
-                <xs:restriction base="xs:string">
-                    <xs:enumeration value="auto"/>
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:union>
-    </xs:simpleType>
-
-    <xs:complexType name="t_iface_wifi">
-        <xs:complexContent>
-            <xs:extension base="aif:t_iface">
-                <xs:sequence>
-                    <xs:element name="encryption" type="net:t_wifi_crypto" minOccurs="0" maxOccurs="1"/>
-                </xs:sequence>
-                <!-- TODO: SSID needs to support unicode chars in both XML(/XSD type=?) and program -->
-                <xs:attribute name="essid" type="xs:string" use="required"/>
-                <xs:attribute name="bssid" type="net:t_mac_addr" use="optional"/>
-                <xs:attribute name="hidden" type="xs:boolean" use="optional" default="false"/>
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-
-    <xs:simpleType name="t_netproto">
-        <xs:union memberTypes="net:t_netproto">
-            <xs:simpleType>
-                <xs:restriction base="xs:string">
-                    <xs:enumeration value="both"/>
-                </xs:restriction>
-            </xs:simpleType>
-        </xs:union>
-    </xs:simpleType>
-
-    <xs:simpleType name="t_netprov">
-        <xs:restriction base="xs:token">
-            <xs:enumeration value="netctl"/>
-            <xs:enumeration value="nm"/>
-            <xs:enumeration value="networkd"/>
-            <xs:whiteSpace value="collapse"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="t_pacuri">
-        <!-- xs:anyURI is too permissive. -->
-        <!-- <xs:restriction base="xs:anyURI"> -->
-        <xs:restriction base="xs:token">
-            <xs:pattern value="(file|https?)://.+"/>
-            <xs:whiteSpace value="collapse"/>
-        </xs:restriction>
-    </xs:simpleType>
+    <xs:import namespace="https://schema.xml.r00t2.io/lib/types/aif.xsd" schemaLocation="../lib/types/aif.xsd"/>
 
     <!-- ROOT -->
     <xs:element name="aif">
@@ -252,8 +17,8 @@
                 <xs:element name="bootstrap" minOccurs="1" maxOccurs="1">
                     <xs:complexType>
                         <xs:all>
-                            <xs:element name="tarball" minOccurs="1" maxOccurs="1" type="std:t_uri"/>
-                            <xs:element name="verify" minOccurs="0" maxOccurs="1" type="std:t_verifyfile"/>
+                            <xs:element name="tarball" minOccurs="1" maxOccurs="1" type="t_aif:t_uri"/>
+                            <xs:element name="verify" minOccurs="0" maxOccurs="1" type="t_aif:t_verifyfile"/>
                         </xs:all>
                     </xs:complexType>
                 </xs:element>
@@ -266,7 +31,7 @@
                             <xs:element name="blockDevices" minOccurs="0" maxOccurs="1">
                                 <xs:complexType>
                                     <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                                        <xs:element name="disk" minOccurs="1" maxOccurs="unbounded" type="linux:t_disk">
+                                        <xs:element name="disk" minOccurs="1" maxOccurs="unbounded" type="t_aif:t_disk">
                                             <xs:unique name="uniq_diskdev">
                                                 <xs:selector xpath="aif:disk"/>
                                                 <xs:field xpath="@device"/>
@@ -284,13 +49,13 @@
                                             <xs:complexType>
                                                 <xs:sequence>
                                                     <xs:element name="opt" minOccurs="0" maxOccurs="unbounded"
-                                                                type="std:t_cmdopts"/>
+                                                                type="t_aif:t_cmdopts"/>
                                                 </xs:sequence>
                                                 <xs:attribute name="id" type="xs:ID" use="required"/>
                                                 <xs:attribute name="source" type="xs:IDREF" use="required"/>
                                                 <!-- We validate this in-code because there's way too many and
                                                      it's way too variable per-host. -->
-                                                <xs:attribute name="type" type="std:t_nonempty" use="required"/>
+                                                <xs:attribute name="type" type="t_aif:t_nonempty" use="required"/>
                                             </xs:complexType>
                                         </xs:element>
                                     </xs:sequence>
@@ -298,7 +63,7 @@
                             </xs:element>
                             <!-- END FILESYSTEMS -->
                             <!-- BEGIN LUKS -->
-                            <xs:element name="luks" minOccurs="0" maxOccurs="1" type="linux:t_luks">
+                            <xs:element name="luks" minOccurs="0" maxOccurs="1" type="t_aif:t_luks">
                                 <xs:unique name="uniq_luks_name">
                                     <xs:selector xpath="aif:luksDev"/>
                                     <xs:field xpath="@name"/>
@@ -306,7 +71,7 @@
                             </xs:element>
                             <!-- END LUKS -->
                             <!-- BEGIN LVM -->
-                            <xs:element name="lvm" minOccurs="0" maxOccurs="1" type="linux:t_lvm">
+                            <xs:element name="lvm" minOccurs="0" maxOccurs="1" type="t_aif:t_lvm">
                                 <xs:unique name="uniq_vg_names">
                                     <xs:selector xpath="aif:volumeGroup"/>
                                     <xs:field xpath="@name"/>
@@ -322,7 +87,7 @@
                             </xs:element>
                             <!-- END LVM -->
                             <!-- BEGIN MDADM -->
-                            <xs:element name="mdadm" minOccurs="0" maxOccurs="1" type="linux:t_mdadm">
+                            <xs:element name="mdadm" minOccurs="0" maxOccurs="1" type="t_aif:t_mdadm">
                                 <xs:unique name="uniq_array_name">
                                     <xs:selector xpath="aif:array"/>
                                     <xs:field xpath="@name"/>
@@ -330,7 +95,7 @@
                             </xs:element>
                             <!-- END MDADM -->
                             <!-- BEGIN MOUNTPOINTS -->
-                            <xs:element name="mountPoints" minOccurs="1" maxOccurs="1" type="linux:t_mounts">
+                            <xs:element name="mountPoints" minOccurs="1" maxOccurs="1" type="t_aif:t_mounts">
                                 <xs:unique name="uniq_mnts_src">
                                     <xs:selector xpath="aif:mount"/>
                                     <xs:field xpath="@source"/>
@@ -349,13 +114,13 @@
                 <xs:element name="network" minOccurs="1" maxOccurs="1">
                     <xs:complexType>
                         <xs:choice minOccurs="1" maxOccurs="unbounded">
-                            <xs:element name="ethernet" type="aif:t_iface" minOccurs="0" maxOccurs="unbounded"/>
-                            <xs:element name="wireless" type="aif:t_iface_wifi" minOccurs="0" maxOccurs="unbounded"/>
+                            <xs:element name="ethernet" type="t_aif:t_iface" minOccurs="0" maxOccurs="unbounded"/>
+                            <xs:element name="wireless" type="t_aif:t_iface_wifi" minOccurs="0" maxOccurs="unbounded"/>
                         </xs:choice>
                         <!-- It's nearly impossible to validate FQDNs/hostnames in XSD, so we do it in-code. -->
-                        <xs:attribute name="hostname" type="std:t_nonempty" use="required"/>
-                        <xs:attribute name="provider" type="aif:t_netprov" use="optional" default="networkd"/>
-                        <xs:attribute name="dhcpClient" type="aif:t_dhcp_clients" use="optional" default="dhcpcd"/>
+                        <xs:attribute name="hostname" type="t_aif:t_nonempty" use="required"/>
+                        <xs:attribute name="provider" type="t_aif:t_netprov" use="optional" default="networkd"/>
+                        <xs:attribute name="dhcpClient" type="t_aif:t_dhcp_clients" use="optional" default="dhcpcd"/>
                     </xs:complexType>
                     <xs:unique name="uniq_iface_eth">
                         <xs:selector xpath="aif:ethernet|aif:wireless"/>
@@ -367,7 +132,7 @@
                 <xs:element name="system" maxOccurs="1" minOccurs="1">
                     <xs:complexType>
                         <xs:all>
-                            <xs:element name="rootPassword" minOccurs="0" maxOccurs="1" type="linux:t_nixpass"/>
+                            <xs:element name="rootPassword" minOccurs="0" maxOccurs="1" type="t_aif:t_nixpass"/>
                             <xs:element name="locales" minOccurs="1" maxOccurs="1">
                                 <xs:complexType>
                                     <xs:sequence minOccurs="1" maxOccurs="unbounded">
@@ -375,7 +140,7 @@
                                             <xs:complexType>
                                                 <xs:simpleContent>
                                                     <xs:extension base="xs:token">
-                                                        <xs:attribute name="name" type="std:t_nonempty" use="required"/>
+                                                        <xs:attribute name="name" type="t_aif:t_nonempty" use="required"/>
                                                     </xs:extension>
                                                 </xs:simpleContent>
                                             </xs:complexType>
@@ -393,9 +158,9 @@
                                             <xs:complexType>
                                                 <xs:choice>
                                                     <xs:element name="map" minOccurs="0" maxOccurs="1"
-                                                                type="std:t_nonempty" default="us"/>
+                                                                type="t_aif:t_nonempty" default="us"/>
                                                     <xs:element name="toggle" minOccurs="0" maxOccurs="1"
-                                                                type="std:t_nonempty"/>
+                                                                type="t_aif:t_nonempty"/>
                                                 </xs:choice>
                                             </xs:complexType>
                                         </xs:element>
@@ -403,11 +168,11 @@
                                             <xs:complexType>
                                                 <xs:choice minOccurs="1" maxOccurs="3">
                                                     <xs:element name="font" minOccurs="0" maxOccurs="1"
-                                                                type="std:t_nonempty"/>
+                                                                type="t_aif:t_nonempty"/>
                                                     <xs:element name="map" minOccurs="0" maxOccurs="1"
-                                                                type="std:t_nonempty"/>
+                                                                type="t_aif:t_nonempty"/>
                                                     <xs:element name="unicodeMap" minOccurs="0" maxOccurs="1"
-                                                                type="std:t_nonempty"/>
+                                                                type="t_aif:t_nonempty"/>
                                                 </xs:choice>
                                             </xs:complexType>
                                         </xs:element>
@@ -418,7 +183,7 @@
                                 <xs:complexType>
                                     <xs:sequence>
                                         <xs:element name="user" minOccurs="1" maxOccurs="unbounded"
-                                                    type="linux:t_user"/>
+                                                    type="t_aif:t_user"/>
                                     </xs:sequence>
                                 </xs:complexType>
                                 <xs:unique name="uniq_usr">
@@ -430,7 +195,7 @@
                                 <xs:complexType>
                                     <xs:sequence>
                                         <xs:element name="service" minOccurs="1" maxOccurs="unbounded"
-                                                    type="linux:t_service"/>
+                                                    type="t_aif:t_service"/>
                                     </xs:sequence>
                                 </xs:complexType>
                                 <xs:unique name="uniq_svc">
@@ -440,7 +205,7 @@
                                 </xs:unique>
                             </xs:element>
                         </xs:all>
-                        <xs:attribute name="timezone" type="std:t_nonempty" use="optional" default="UTC"/>
+                        <xs:attribute name="timezone" type="t_aif:t_nonempty" use="optional" default="UTC"/>
                     </xs:complexType>
                 </xs:element>
                 <!-- END SYSTEM -->
@@ -453,10 +218,10 @@
                                     <xs:sequence>
                                         <xs:element name="repo" maxOccurs="unbounded" minOccurs="1">
                                             <xs:complexType>
-                                                <xs:attribute name="name" type="std:t_nonempty" use="required"/>
+                                                <xs:attribute name="name" type="t_aif:t_nonempty" use="required"/>
                                                 <xs:attribute name="enabled" type="xs:boolean" use="required"/>
-                                                <xs:attribute name="sigLevel" type="std:t_nonempty" use="required"/>
-                                                <xs:attribute name="mirror" type="aif:t_pacuri" use="required"/>
+                                                <xs:attribute name="sigLevel" type="t_aif:t_nonempty" use="required"/>
+                                                <xs:attribute name="mirror" type="t_aif:t_pacuri" use="required"/>
                                             </xs:complexType>
                                         </xs:element>
                                     </xs:sequence>
@@ -469,7 +234,7 @@
                             <xs:element name="mirrorList" maxOccurs="1" minOccurs="0">
                                 <xs:complexType>
                                     <xs:sequence>
-                                        <xs:element name="mirror" type="aif:t_pacuri" maxOccurs="unbounded"
+                                        <xs:element name="mirror" type="t_aif:t_pacuri" maxOccurs="unbounded"
                                                     minOccurs="1"/>
                                     </xs:sequence>
                                 </xs:complexType>
@@ -478,7 +243,7 @@
                                 <xs:complexType>
                                     <xs:sequence>
                                         <xs:element name="package" maxOccurs="unbounded" minOccurs="1"
-                                                    type="linux:t_package"/>
+                                                    type="t_aif:t_package"/>
                                     </xs:sequence>
                                 </xs:complexType>
                                 <xs:unique name="uniq_mirror">
@@ -491,7 +256,7 @@
                                 </xs:unique>
                             </xs:element>
                         </xs:sequence>
-                        <xs:attribute name="command" type="std:t_nonempty" use="optional" default="pacman -S"/>
+                        <xs:attribute name="command" type="t_aif:t_nonempty" use="optional" default="pacman -S"/>
                     </xs:complexType>
                 </xs:element>
                 <!-- END PACMAN -->
@@ -499,7 +264,7 @@
                 <xs:element name="bootloader" maxOccurs="1" minOccurs="1">
                     <xs:complexType>
                         <xs:attribute name="type" type="aif:t_bootloaders" use="required"/>
-                        <xs:attribute name="target" type="std:t_nonempty" use="required"/>
+                        <xs:attribute name="target" type="t_aif:t_nonempty" use="required"/>
                         <xs:attribute name="efi" type="xs:boolean" use="optional" default="1"/>
                     </xs:complexType>
                 </xs:element>
@@ -512,7 +277,7 @@
                                 <xs:complexType>
                                     <xs:sequence>
                                         <xs:element name="script" minOccurs="1" maxOccurs="unbounded"
-                                                    type="net:t_http_resource"/>
+                                                    type="t_aif:t_http_resource"/>
                                     </xs:sequence>
                                 </xs:complexType>
                             </xs:element>
@@ -520,7 +285,7 @@
                                 <xs:complexType>
                                     <xs:sequence>
                                         <xs:element name="script" minOccurs="1" maxOccurs="unbounded"
-                                                    type="net:t_http_resource"/>
+                                                    type="t_aif:t_http_resource"/>
                                     </xs:sequence>
                                 </xs:complexType>
                             </xs:element>
@@ -528,7 +293,7 @@
                                 <xs:complexType>
                                     <xs:sequence>
                                         <xs:element name="script" minOccurs="1" maxOccurs="unbounded"
-                                                    type="net:t_http_resource"/>
+                                                    type="t_aif:t_http_resource"/>
                                     </xs:sequence>
                                 </xs:complexType>
                             </xs:element>
@@ -537,7 +302,7 @@
                 </xs:element>
                 <!-- END SCRIPTS -->
             </xs:all>
-            <xs:attribute name="chrootPath" type="unix:t_filepath" use="required"/>
+            <xs:attribute name="chrootPath" type="t_aif:t_filepath" use="required"/>
             <xs:attribute name="reboot" type="xs:boolean" use="optional" default="false"/>
         </xs:complexType>
     </xs:element>
diff --git a/schema/bdisk.xsd b/schema/projects/bdisk.xsd
similarity index 77%
rename from schema/bdisk.xsd
rename to schema/projects/bdisk.xsd
index ca62eae..5da27b5 100644
--- a/schema/bdisk.xsd
+++ b/schema/projects/bdisk.xsd
@@ -3,8 +3,8 @@
            xmlns="http://schema.xml.r00t2.io/bdisk.xsd"
            xmlns:bdisk="http://schema.xml.r00t2.io/bdisk.xsd"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           elementFormDefault="qualified"
-           attributeFormDefault="qualified">
+           elementFormDefault="unqualified"
+           attributeFormDefault="unqualified">
 
 <!-- TODO -->