merged with upstreamHEADmaster

1 files changed, 106 insertions, 50 deletions

diff --git a/schema.json b/schema.json
index 9269e8e8..97cb42e1 100644
--- a/schema.json
+++ b/schema.json
@@ -12,14 +12,19 @@
                 "testing"
             ]
         },
-        "audio": {
+        "audio_config": {
             "description": "Audio server to be installed",
-            "type": "string",
-            "enum": [
-                "pipewire",
-                "pulseaudio",
-                "none"
-            ]
+            "type": "object",
+            "properties": {
+                "audio": {
+                    "description": "Audio server to be installed",
+                    "type": "string",
+                    "enum": [
+                        "pipewire",
+                        "pulseaudio"
+                    ]
+                }
+            },
         },
         "bootloader": {
             "description": "Bootloader  to be installed",
@@ -30,6 +35,10 @@
                 "efistub"
             ]
         },
+        "uki": {
+            "description": "Set to true to use unified kernel images",
+            "type": "boolean"
+        },
         "custom-commands": {
             "description": "Custom commands to be run post install",
             "type": "array",
@@ -37,17 +46,6 @@
                 "type": "string"
             }
         },
-        "gfx_driver": {
-            "description": "Graphics Drivers to install if a desktop profile is used, ignored otherwise.",
-            "type": "string",
-            "enum": [
-                "VMware / VirtualBox (open-source)",
-                "Nvidia",
-                "Intel (open-source)",
-                "AMD / ATI (open-source)",
-                "All open-source (default)"
-            ]
-        },
         "harddrives": {
             "description": "Path of device to be used",
             "type": "array",
@@ -80,21 +78,26 @@
             "description": "By default, it will autodetect the best region. Enter a region or a dictionary of regions and mirrors to use specific ones",
             "type": "object"
         },
-        "nic": {
+        "network_config": {
             "description": "Choose between NetworkManager, manual configuration, use systemd-networkd from the ISO or no configuration",
             "type": "object",
             "properties": {
                 "type": "string",
-                "iface": "string",
-                "dhcp": "boolean",
-                "ip": "string",
-                "gateway": "string",
-                "dns": {
-                    "description": "List of DNS servers",
+                "nics": [
                     "type": "array",
                     "items": {
-                        "type": "string"
-                    }
+                        "iface": "string",
+                        "dhcp": "boolean",
+                        "ip": "string",
+                        "gateway": "string",
+                        "dns": {
+                            "description": "List of DNS servers",
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    ]
                 }
             }
         },
@@ -110,29 +113,82 @@
             }
         },
         "profile": {
-            "description": "Profiles are present in profiles/, use the name of a profile to install it",
-            "type": "string",
-            "enum": [
-                "awesome",
-                "bspwm",
-                "budgie",
-                "cinnamon",
-                "cutefish",
-                "deepin",
-                "desktop",
-                "enlightenment",
-                "gnome",
-                "i3",
-                "kde",
-                "lxqt",
-                "mate",
-                "minimal",
-                "server",
-                "sway",
-                "xfce4",
-                "xorg",
-                "qtile"
-            ]
+            "path": {
+                "description": "Local path or Url that points to a python file containing profile definitions",
+                "type": "string"
+            },
+            "main":  {
+                "description": "Main top level profile selection",
+                "type": "string",
+                "enum": [
+                    "desktop",
+                    "minimal",
+                    "server",
+                    "xorg",
+                    "custom"
+                ]
+            },
+            "details": {
+                "description": "Specific profile to be installed based on the 'main' selection; these profiles are present in default_profiles/, use the file name of a profile without the extension to install it (case insensitive)",
+                "type": "string",
+                "enum": [
+                    "awesome",
+                    "bspwm",
+                    "budgie",
+                    "cinnamon",
+                    "cutefish",
+                    "deepin",
+                    "desktop",
+                    "enlightenment",
+                    "gnome",
+                    "i3-wm",
+                    "plasma",
+                    "lxqt",
+                    "mate",
+                    "sway",
+                    "xfce4",
+                    "qtile",
+                    "cockpit",
+                    "docker",
+                    "httpd",
+                    "lighttpd",
+                    "mariadb",
+                    "nginx",
+                    "postgresql",
+                    "sshd",
+                    "tomcat"
+                ]
+            },
+            "custom": {
+                "description": "Specific profile definitions for custom setup profiles)",
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "properties": {
+                        "packages": "string",
+                        "services": "string",
+                        "enabled": "boolean"
+                    }
+                }
+            },
+            "gfx_driver": {
+                "description": "Graphics Drivers to install if a desktop profile is used, ignored otherwise.",
+                "type": "string",
+                "enum": [
+                    "VMware / VirtualBox (open-source)",
+                    "Intel (open-source)",
+                    "AMD / ATI (open-source)",
+                    "All open-source (default)",
+                    "Nvidia (open kernel module for newer GPUs, Turing+)",
+                    "Nvidia (open-source nouveau driver)",
+                    "Nvidia (proprietary)"
+                ]
+            },
+            "greeter_type": {
+                "description": "Greeter type to install if a desktop profile is used, ignored otherwise.",
+                "type": "string",
+                "enum": ["lightdm", "sddm", "gdm"]
+            }
         },
         "services": {
             "description": "Services to enable post-installation",