Merge branch 'desktop_config_dedup' into 'master'

Make desktop a superset of desktop-minimal

See merge request redox-os/redox!1971

config/desktop-minimal.toml

@@ -18,6 +18,7 @@ orbutils = {}
 path = "/usr/lib/init.d/20_orbital"
 data = """
 requires_weak 10_net
+notify audiod
 nowait VT=3 orbital orblogin launcher
 """
 

config/desktop.toml

@@ -1,6 +1,6 @@
 # Default build system configuration
 
-include = ["server.toml"]
+include = ["desktop-minimal.toml", "server.toml"]
 
 # General settings
 [general]
@@ -18,27 +18,7 @@ freefont = {}
 hicolor-icon-theme = {}
 installer-gui = {}
 netsurf = {}
-orbdata = {}
-orbital = {}
-orbutils = {}
 patchelf = {}
 pop-icon-theme = {}
 rustpython = {}
 shared-mime-info = {}
-
-[[files]]
-path = "/usr/lib/init.d/20_orbital"
-data = """
-requires_weak 10_net
-notify audiod
-nowait BROWSER=/bin/netsurf-fb VT=3 orbital orblogin launcher
-"""
-
-# Override console config to not switch to VT 2
-[[files]]
-path = "/usr/lib/init.d/30_console"
-data = """
-requires_weak 20_orbital
-nowait getty 2
-nowait getty /scheme/debug/no-preserve -J
-"""