diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml index 9528a02..f57dbb2 100644 --- a/config/x86_64/desktop-contain.toml +++ b/config/x86_64/desktop-contain.toml @@ -1,46 +1,8 @@ -# Default desktop configuration +# Default desktop configuration using contain -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 = {} +include = ["../desktop.toml"] +# Override orbital init to use contain_orblogin [[files]] path = "/etc/init.d/20_orbital" data = """ @@ -48,17 +10,14 @@ audiod orbital contain_orblogin launcher """ +# Override console init to use contain [[files]] path = "/etc/init.d/30_console" data = """ -getty 2 +getty --contain 2 getty --contain debug: -J """ -[[files]] -path = "/etc/pkg.d/50_redox" -data = "https://static.redox-os.org/pkg" - [[files]] path = "/etc/contain.toml" data = """