From a2ad0aaf66a292cff126b5f8c5d0b79534ac8423 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 11 Apr 2026 15:27:16 +0200
Subject: [PATCH 1/2] Move audiod init config to base repo

---
 config/desktop-minimal.toml        | 3 +--
 config/wayland.toml                | 3 +--
 config/x11.toml                    | 3 +--
 config/x86_64/desktop-contain.toml | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/config/desktop-minimal.toml b/config/desktop-minimal.toml
index a1cf799c7..8ac8f36a4 100644
--- a/config/desktop-minimal.toml
+++ b/config/desktop-minimal.toml
@@ -17,8 +17,7 @@ orbutils = {}
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
 data = """
-requires_weak 10_net.target
-notify audiod
+requires_weak 10_net.target 20_audiod.service
 nowait VT=3 orbital orblogin launcher
 """
 
diff --git a/config/wayland.toml b/config/wayland.toml
index 60ed9b932..fc7fd62d8 100644
--- a/config/wayland.toml
+++ b/config/wayland.toml
@@ -32,8 +32,7 @@ xkeyboard-config = {}
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
 data = """
-requires_weak 10_net.target
-notify audiod
+requires_weak 10_net.target 20_audiod.service
 nowait BROWSER=/bin/netsurf-fb VT=3 orbital orbital-wayland
 """
 
diff --git a/config/x11.toml b/config/x11.toml
index 7100191db..7ea5146a1 100644
--- a/config/x11.toml
+++ b/config/x11.toml
@@ -55,8 +55,7 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
 data = """
-requires_weak 10_dbus 10_xenv
-notify audiod
+requires_weak 10_dbus 10_xenv 20_audiod.service
 nowait BROWSER=/bin/netsurf-fb VT=3 orbital orbital-x11
 """
 
diff --git a/config/x86_64/desktop-contain.toml b/config/x86_64/desktop-contain.toml
index 4469792d4..d37ececb9 100644
--- a/config/x86_64/desktop-contain.toml
+++ b/config/x86_64/desktop-contain.toml
@@ -17,8 +17,7 @@ include = ["../desktop.toml"]
 [[files]]
 path = "/usr/lib/init.d/20_orbital"
 data = """
-requires_weak 10_net.target
-notify audiod
+requires_weak 10_net.target 20_audiod.service
 nowait VT=3 orbital contain_orblogin launcher
 """
 

From d8b507e8d00a60df390908377e9b21f106001cbf Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 11 Apr 2026 15:41:00 +0200
Subject: [PATCH 2/2] Use /usr/lib/environment.d for x11 config DISPLAY=:0

---
 config/x11.toml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/config/x11.toml b/config/x11.toml
index 7ea5146a1..06de655f7 100644
--- a/config/x11.toml
+++ b/config/x11.toml
@@ -124,13 +124,10 @@ mate-session&
 """
 
 
-# Override console config to set DISPLAY=:0
 [[files]]
-path = "/usr/lib/init.d/30_console"
+path = "/usr/lib/environment.d/10_x11"
 data = """
-requires_weak 20_orbital
-nowait DISPLAY=:0 getty 2
-nowait DISPLAY=:0 getty /scheme/debug/no-preserve -J
+DISPLAY=:0
 """