From a794c99e3bb7b1d7f6d451c75544c8f852ef9477 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 6 Jul 2024 21:09:35 +0200
Subject: [PATCH] Include the drivers recipe in the base system

All configs except the minimal config already include it. Several of the
drivers in the drivers recipe are essential for getting a system usable
outside of VMs or very old hardware. For example the usbhidd driver.
---
 config/aarch64/desktop.toml | 7 -------
 config/base.toml            | 7 +++++++
 config/desktop-minimal.toml | 7 -------
 config/net.toml             | 8 --------
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/config/aarch64/desktop.toml b/config/aarch64/desktop.toml
index a2804d5..9b3807d 100644
--- a/config/aarch64/desktop.toml
+++ b/config/aarch64/desktop.toml
@@ -14,19 +14,12 @@ cosmic-edit = {}
 cosmic-icons = {}
 cosmic-files = {}
 cosmic-term = {}
-drivers = {}
 orbdata = {}
 orbital = {}
 orbutils = {}
 pop-icon-theme = {}
 shared-mime-info = {}
 
-[[files]]
-path = "/usr/lib/init.d/00_drivers"
-data = """
-pcid /etc/pcid.d/
-"""
-
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
 data = """
diff --git a/config/base.toml b/config/base.toml
index af6d7b3..ff4a1b6 100644
--- a/config/base.toml
+++ b/config/base.toml
@@ -11,6 +11,7 @@ prompt = false
 [packages]
 bootloader = {}
 bootstrap = {}
+drivers = {}
 escalated = {}
 initfs = {}
 ipcd = {}
@@ -31,6 +32,12 @@ ptyd
 escalated
 """
 
+[[files]]
+path = "/usr/lib/init.d/00_drivers"
+data = """
+pcid /etc/pcid.d/
+"""
+
 [[files]]
 path = "/etc/hostname"
 data = """
diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml
index 785799a..84ea9eb 100644
--- a/config/desktop-minimal.toml
+++ b/config/desktop-minimal.toml
@@ -9,7 +9,6 @@ filesystem_size = 128
 
 # Package settings
 [packages]
-drivers = {}
 orbdata = {}
 orbital = {}
 orbterm = {}
@@ -17,12 +16,6 @@ orbutils-background = {}
 orbutils-launcher = {}
 orbutils-orblogin = {}
 
-[[files]]
-path = "/usr/lib/init.d/00_drivers"
-data = """
-pcid /etc/pcid.d/
-"""
-
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
 data = """
diff --git a/config/net.toml b/config/net.toml
index 33dccd9..5899b6e 100644
--- a/config/net.toml
+++ b/config/net.toml
@@ -5,17 +5,9 @@ include = ["base.toml"]
 
 # Package settings
 [packages]
-drivers = {}
 netstack = {}
 netutils = {}
 
-## Driver init
-[[files]]
-path = "/usr/lib/init.d/00_drivers"
-data = """
-pcid /etc/pcid.d/
-"""
-
 ## Network init
 [[files]]
 path = "/usr/lib/init.d/10_net"