config/desktop.toml

@@ -7,38 +7,165 @@ prompt = false
 
 # Package settings
 [packages]
+#acid = {}
 audiod = {}
+#autoconf = {}
+#automake = {}
+#bash = {}
+#binutils = {}
 ca-certificates = {}
+#cairo = {}
+#cairodemo = {}
+#cargo = {}
+#cleye = {}
+#cmatrix = {}
 contain = {}
 coreutils = {}
+#cpal = {}
+#curl = {}
 dash = {}
-diffutils = {}
+#diffutils = {}
+#dosbox = {}
 drivers = {}
+#drivers-041 = {}
+#duktape = {}
+#eduke32 = {}
+#exampled = {}
+#expat = {}
 extrautils = {}
+#fd = {}
+#ffmpeg = {}
 findutils = {}
+#freeciv = {}
+#freedoom = {}
+#freeglut = {}
+#freetype = {}
+#friar = {} # mio patch
+#game-2048 = {}
+#games = {}
+#gawk = {}
+#gcc = {}
 gdbserver = {}
-gnu-make = {}
+#gears = {}
+#generaluser-gs = {}
+#gettext = {}
+#gigalomania = {}
+#git = {}
+#glib = {}
+#glium = {}
+#glutin = {}
+#gnu-binutils = {}
+#gnu-grep = {}
+#gnu-make = {}
+#gstreamer = {}
+#harfbuzz = {}
+#hematite = {}
+#init = {}
 installer = {}
 ion = {}
 ipcd = {}
+#jansson = {}
+#keyboard-sfx = {}
+#lci = {}
+#libc-bench = {}
+#libffi = {}
+#libiconv = {}
+#libjpeg = {}
+#liborbital = {}
+#libpng = {}
+#libsodium = {}
+#llvm = {}
 logd = {}
+#lua = {}
+#mdp = {}
+#mesa = {}
+#mesa_glu = {}
+#miniserve = {}
+#nasm = {}
+#ncdu = {}
+#ncurses = {}
+#ncursesw = {}
 netdb = {}
 netstack = {}
 netsurf = {}
 netutils = {}
+#neverball = {}
+#newlib = {}
+#newlibtest = {}
+#nulld = {}
+#openjazz = {}
+#openssl = {}
+#openttd = {}
+#openttd-opengfx = {}
+#openttd-openmsx = {}
+#openttd-opensfx = {}
+#orbclient = {}
 orbdata = {}
 orbital = {}
 orbterm = {}
 orbutils = {}
+#osdemo = {}
+#pastel = {}
+#patch = {}
+#pciids = {}
+#pcre = {}
+#periodictable = {}
+#perl = {}
+#pixelcannon = {}
+#pixman = {}
 pkgutils = {}
+#powerline = {}
+#prboom = {}
 ptyd = {}
+#python = {}
+#qemu = {}
+#randd = {}
+#readline = {} # ncurses
 redoxfs = {}
-resist = {}
+#redox-fatfs = {}
+#redox-ssh = {}
+#relibc = {}
+#relibc-tests = {}
+#ripgrep = {}
+#rodioplay = {}
+#rs-nes = {}
+#rust = {}
+#rust64 = {}
+#rust-cairo = {}
+#rust-cairo-demo = {}
+#rustual-boy = {}
+#schismtracker = {}
+#scummvm = {}
+#sdl = {}
+#sdl2 = {}
+#sdl2_gears = {}
+#sdl_gfx = {}
+#sdl_image = {}
+#sdl_mixer = {}
+#sdl_ttf = {}
+#sdl-player = {}
+#sed = {}
+#servo = {}
+#shellstorm = {}
 smith = {}
+#sodium = {}
+#sopwith = {}
+#ssh = {}
 strace = {}
+#syobonaction = {}
+#terminfo = {}
+#termplay = {}
+#timidity = {}
+#ttf-hack = {}
 userutils = {}
 uutils = {}
-vim = {}
+#vim = {}
+#vttest = {}
+#webrender = {}
+#winit = {}
+#xz = {}
+#zerod = {}
+#zlib = {}
 
 # User settings
 [users.root]

config/jeremy.toml

@@ -1,284 +0,0 @@
-# This is Jeremy's configuration file
-
-# General settings
-[general]
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-acid = {}
-atk = {}
-audiod = {}
-autoconf = {}
-automake = {}
-ca-certificates = {}
-cairo = {}
-cairodemo = {}
-cleye = {}
-cmatrix = {}
-contain = {}
-coreutils = {}
-cpal = {}
-curl = {}
-dash = {}
-diffutils = {}
-dosbox = {}
-drivers = {}
-eduke32 = {}
-expat = {}
-extrautils = {}
-ffmpeg = {}
-findutils = {}
-fontconfig = {}
-freedoom = {}
-freetype = {}
-fribidi = {}
-games = {}
-gcc = {}
-gdbserver = {}
-gears = {}
-generaluser-gs = {}
-gettext = {}
-gigalomania = {}
-git = {}
-glib = {}
-glium = {}
-glutin = {}
-gnu-binutils = {}
-gnu-grep = {}
-gnu-make = {}
-harfbuzz = {}
-installer = {}
-ion = {}
-ipcd = {}
-jansson = {}
-jeremy = {}
-keyboard-sfx = {}
-lci = {}
-libc-bench = {}
-libffi = {}
-libiconv = {}
-libjpeg = {}
-libogg = {}
-liborbital = {}
-libpng = {}
-libsodium = {}
-libvorbis = {}
-libxml2 = {}
-llvm = {}
-logd = {}
-mesa = {}
-mesa_glu = {}
-nasm = {}
-ncurses = {}
-netdb = {}
-netstack = {}
-netsurf = {}
-netutils = {}
-neverball = {}
-nghttp2 = {}
-openjazz = {}
-openssl = {}
-openttd = {}
-openttd-opengfx = {}
-openttd-openmsx = {}
-openttd-opensfx = {}
-orbclient = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-osdemo = {}
-pango = {}
-patch = {}
-pcre = {}
-periodictable = {}
-pixelcannon = {}
-pixman = {}
-pkg-config = {}
-pkgutils = {}
-prboom = {}
-ptyd = {}
-readline = {}
-redoxfs = {}
-resist = {}
-ripgrep = {}
-rodioplay = {}
-rs-nes = {}
-rust64 = {}
-rust-cairo = {}
-rust-cairo-demo = {}
-rustual-boy = {}
-schismtracker = {}
-scummvm = {}
-sdl = {}
-sdl2 = {}
-sdl2_gears = {}
-sdl2_image = {}
-sdl2_mixer = {}
-sdl2_ttf = {}
-sdl_gfx = {}
-sdl_image = {}
-sdl_mixer = {}
-sed = {}
-smith = {}
-sodium = {}
-sopwith = {}
-strace = {}
-syobonaction = {}
-terminfo = {}
-timidity = {}
-ttf-hack = {}
-userutils = {}
-uutils = {}
-vice = {}
-vim = {}
-vttest = {}
-vvvvvv = {}
-winit = {}
-xz = {}
-zlib = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-logd
-ptyd
-pcid /etc/pcid.d/
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital display:3/activate orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "/bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "/games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "/include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "/lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "/share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true

config/server.toml

@@ -7,29 +7,158 @@ prompt = false
 
 # Package settings
 [packages]
+#acid = {}
+#audiod = {}
+#autoconf = {}
+#automake = {}
+#bash = {}
+#binutils = {}
 ca-certificates = {}
+#cairo = {}
+#cairodemo = {}
+#cargo = {}
+#cleye = {}
+#cmatrix = {}
 contain = {}
 coreutils = {}
+#cpal = {}
+#curl = {}
 dash = {}
-diffutils = {}
+#diffutils = {}
+#dosbox = {}
 drivers = {}
+#drivers-041 = {}
+#duktape = {}
+#eduke32 = {}
+#exampled = {}
+#expat = {}
 extrautils = {}
+#fd = {}
+#ffmpeg = {}
 findutils = {}
-gnu-make = {}
+#freeciv = {}
+#freedoom = {}
+#freeglut = {}
+#freetype = {}
+#friar = {} # mio patch
+#game-2048 = {}
+#games = {}
+#gawk = {}
+#gcc = {}
+#gears = {}
+#generaluser-gs = {}
+#gettext = {}
+#gigalomania = {}
+#git = {}
+#glib = {}
+#glium = {}
+#glutin = {}
+#gnu-binutils = {}
+#gnu-grep = {}
+#gnu-make = {}
+#gstreamer = {}
+#harfbuzz = {}
+#hematite = {}
+#init = {}
 installer = {}
 ion = {}
 ipcd = {}
+#jansson = {}
+#keyboard-sfx = {}
+#lci = {}
+#libc-bench = {}
+#libffi = {}
+#libiconv = {}
+#libjpeg = {}
+#liborbital = {}
+#libpng = {}
+#libsodium = {}
+#llvm = {}
 logd = {}
+#lua = {}
+#mdp = {}
+#mesa = {}
+#mesa_glu = {}
+#miniserve = {}
+#nasm = {}
+#ncdu = {}
+#ncurses = {}
+#ncursesw = {}
 netdb = {}
 netstack = {}
+#netsurf = {}
 netutils = {}
+#newlib = {}
+#newlibtest = {}
+#nulld = {}
+#openjazz = {}
+#openssl = {}
+#openttd = {}
+#openttd-opengfx = {}
+#openttd-openmsx = {}
+#openttd-opensfx = {}
+#orbdata = {}
+#orbital = {}
+#orbterm = {}
+#orbutils = {}
+#osdemo = {}
+#pastel = {}
+#patch = {}
+#pciids = {}
+#pcre = {}
+#periodictable = {}
+#perl = {}
+#pixelcannon = {}
+#pixman = {}
 pkgutils = {}
+#powerline = {}
+#prboom = {}
 ptyd = {}
+#python = {}
+#qemu = {}
+#randd = {}
+#readline = {} # ncurses
 redoxfs = {}
-resist = {}
+#redox-ssh = {}
+#relibc = {}
+#ripgrep = {}
+#rodioplay = {}
+#rs-nes = {}
+#rust = {}
+#rust64 = {}
+#rust-cairo = {}
+#rust-cairo-demo = {}
+#rustual-boy = {}
+#schismtracker = {}
+#scummvm = {}
+#sdl = {}
+#sdl2 = {}
+#sdl_gfx = {}
+#sdl_image = {}
+#sdl_mixer = {}
+#sdl_ttf = {}
+#sdl-player = {}
+#sed = {}
+#servo = {}
+#shellstorm = {}
 smith = {}
+#sodium = {}
+#sopwith = {}
+#ssh = {}
+#syobonaction = {}
+#terminfo = {}
+#termplay = {}
+#timidity = {}
+#ttf-hack = {}
 userutils = {}
 uutils = {}
+#vim = {}
+#vttest = {}
+#webrender = {}
+#winit = {}
+#xz = {}
+#zerod = {}
+#zlib = {}
 
 # User settings
 [users.root]

cookbook

@@ -1 +1 @@
-Subproject commit 15cbcef62c274ae8cd2dd8622a34cd126e50f158
+Subproject commit e587d4e3e1c127496692d6619c5eb6676ab243f8

installer

@@ -1 +1 @@
-Subproject commit 84856f459dccbc86a6490904e571389de72bf4c4
+Subproject commit 70a2dc7532111a9df436cf17d3e7a6fdbdacee72

kernel

@@ -1 +1 @@
-Subproject commit 0c3542ff51e253c5bc316ecc2c254f01506fcc5d
+Subproject commit 9c3cf84453f95d597823f3b0d1512b48160c2ea8

relibc

@@ -1 +1 @@
-Subproject commit dbaeb8f0677f1ce59806f1937d5731bb6ed32ae9
+Subproject commit c99658a8da55692c0e032516ff49d7e2d002d94d