Make template desktop and server configs

config/desktop.toml

+# Default desktop configuration
+
+include = ["server.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 512
+
+# Package settings
+[packages]
+audiod = {}
+installer-gui = {}
+netsurf = {}
+orbdata = {}
+orbital = {}
+orbterm = {}
+orbutils = {}
+
+[[files]]
+path = "/etc/init.d/20_orbital"
+data = """
+audiod
+orbital orblogin launcher
+"""
+
+# Override console config to not switch to VT 2
+[[files]]
+path = "/etc/init.d/30_console"
+data = """
+getty 2
+getty debug: -J
+"""

config/i686/desktop.toml

 # Default desktop configuration
 
-include = ["../net.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 512
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-audiod = {}
-bash = {}
-bootloader = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-diffutils = {}
-extrautils = {}
-findutils = {}
-installer = {}
-installer-gui = {}
-ion = {}
-netdb = {}
-netsurf = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-pkgutils = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-git = {}
-curl = {}
-vim = {}
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty 2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
+include = ["../desktop.toml"]

config/i686/server.toml

 # Default server configuration
 
-include = ["../net.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 512
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-bash = {}
-bootloader = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-diffutils = {}
-extrautils = {}
-findutils = {}
-installer = {}
-ion = {}
-netdb = {}
-pkgutils = {}
-redoxfs = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-git = {}
-curl = {}
-vim = {}
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-inputd -A 2
-getty 2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
+include = ["../server.toml"]

config/server.toml

+# Default server configuration
+
+include = ["net.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 512
+
+# Package settings
+[packages]
+bash = {}
+bootloader = {}
+ca-certificates = {}
+contain = {}
+coreutils = {}
+curl = {}
+diffutils = {}
+extrautils = {}
+findutils = {}
+git = {}
+installer = {}
+ion = {}
+netdb = {}
+pkgutils = {}
+redoxfs = {}
+relibc = {}
+resist = {}
+smith = {}
+userutils = {}
+uutils = {}
+vim = {}
+
+[[files]]
+path = "/etc/init.d/30_console"
+data = """
+inputd -A 2
+getty 2
+getty debug: -J
+"""
+
+[[files]]
+path = "/etc/pkg.d/50_redox"
+data = "https://static.redox-os.org/pkg"

config/x86_64/desktop.toml

 # Default desktop configuration
 
-include = ["../net.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 512
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-audiod = {}
-bash = {}
-bootloader = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-diffutils = {}
-extrautils = {}
-findutils = {}
-installer = {}
-installer-gui = {}
-ion = {}
-netdb = {}
-netsurf = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-pkgutils = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-git = {}
-curl = {}
-vim = {}
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty 2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
+include = ["../desktop.toml"]

config/x86_64/server.toml

 # Default server configuration
 
-include = ["../net.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 512
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-bash = {}
-bootloader = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-diffutils = {}
-extrautils = {}
-findutils = {}
-installer = {}
-ion = {}
-netdb = {}
-pkgutils = {}
-redoxfs = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-git = {}
-curl = {}
-vim = {}
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-inputd -A 2
-getty 2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
+include = ["../server.toml"]