From 793a16b2fc9dd11ed7189c5bea7ccd0f5572be7c Mon Sep 17 00:00:00 2001
From: Alex Blank <alexblank@fastmail.com>
Date: Tue, 21 Jul 2026 20:52:52 +0200
Subject: [PATCH] modularization of noctalia config

---
 .config/noctalia/10-base.toml                 | 38 ++++++++++++++
 .../90-machine.toml##class.arch_desktop       | 52 +++----------------
 .../90-machine.toml##class.arch_laptop        | 36 -------------
 3 files changed, 45 insertions(+), 81 deletions(-)

diff --git a/.config/noctalia/10-base.toml b/.config/noctalia/10-base.toml
index 1a5084a..2daed59 100644
--- a/.config/noctalia/10-base.toml
+++ b/.config/noctalia/10-base.toml
@@ -10,3 +10,41 @@ mode = "dark"
 source = "custom"
 custom_palette = "Ember OLED"
 pure_black_dark = true
+
+# Noctalia merges files alphabetically. Keep reusable modules here; machine-specific
+# layout and hardware settings live in 90-machine.toml, while 99-extend.toml is local.
+[plugins]
+enabled = ["alex/system-status"]
+
+[widget.cpu]
+type = "alex/system-status:cpu"
+
+[widget.ram]
+type = "alex/system-status:memory"
+
+[widget.temp]
+type = "sysmon"
+stat = "cpu_temp"
+display = "text"
+
+[widget.disk]
+type = "sysmon"
+stat = "disk_pct"
+display = "text"
+path = "/"
+
+[desktop_widgets]
+enabled = false
+
+[wallpaper]
+enabled = true
+fill_color = "#000000"
+
+[wallpaper.default]
+path = "color:#000000"
+
+[nightlight]
+enabled = true
+force = false
+temperature_day = 6500
+temperature_night = 2500
diff --git a/.config/noctalia/90-machine.toml##class.arch_desktop b/.config/noctalia/90-machine.toml##class.arch_desktop
index 1b0b618..bb054bd 100644
--- a/.config/noctalia/90-machine.toml##class.arch_desktop
+++ b/.config/noctalia/90-machine.toml##class.arch_desktop
@@ -1,19 +1,20 @@
 # Desktop-specific shell layout and hardware telemetry.
 [bar.main]
 position = "bottom"
-layer = "overlay"
+layer = "top"
 capsule_radius = 5
 center = ["group:g3", "notifications"]
-end = ["bluetooth", "volume", "control-center", "group:g1", "session"]
+end = ["bluetooth", "input_volume", "volume", "control-center", "group:g1", "session"]
 font_weight = 400
 margin_ends = 0
 padding = 0
 panel_overlap = 3
 radius = 0
 shadow = false
-smart_auto_hide = true
-# The bar may overlay the thin perimeter while visible; hidden bars release the space.
-reserve_space = false
+# Keep the desktop status bar visible and reserve its screen edge.
+auto_hide = false
+smart_auto_hide = false
+reserve_space = true
 start = ["tray", "group:g4", "group:g2", "privacy"]
 thickness = 39
 widget_spacing = 10
@@ -47,21 +48,10 @@ radius = 5.0
 enabled = true
 fill = "surface_variant"
 id = "g4"
-members = ["cpu", "temp", "ram", "gpu", "gpu_temp", "disk", "battery"]
+members = ["cpu", "temp", "ram", "gpu", "gpu_temp", "disk"]
 opacity = 1.0
 padding = 6.0
 
-[widget.cpu]
-type = "alex/system-status:cpu"
-
-[widget.ram]
-type = "alex/system-status:memory"
-
-[widget.temp]
-type = "sysmon"
-stat = "cpu_temp"
-display = "text"
-
 [widget.gpu]
 type = "sysmon"
 stat = "gpu_usage"
@@ -72,39 +62,11 @@ type = "sysmon"
 stat = "gpu_temp"
 display = "text"
 
-[widget.disk]
-type = "sysmon"
-stat = "disk_pct"
-display = "text"
-path = "/"
-
-[battery.device."/org/freedesktop/UPower/devices/battery_hidpp_battery_0"]
-warning_threshold = 20
-
 [control_center]
 sidebar = "full"
 sidebar_section = "full"
 width = 880
 
-[desktop_widgets]
-enabled = false
-
-[wallpaper]
-enabled = true
-fill_color = "#000000"
-
-[wallpaper.default]
-path = "color:#000000"
-
 [system.monitor]
 # GPU polling is disabled by Noctalia by default; enable it for the RTX 3090 widgets.
 gpu_poll_seconds = 2.0
-
-[plugins]
-enabled = ["alex/system-status"]
-
-[nightlight]
-enabled = true
-force = false
-temperature_day = 6500
-temperature_night = 2500
diff --git a/.config/noctalia/90-machine.toml##class.arch_laptop b/.config/noctalia/90-machine.toml##class.arch_laptop
index c6dd3f5..41e0c61 100644
--- a/.config/noctalia/90-machine.toml##class.arch_laptop
+++ b/.config/noctalia/90-machine.toml##class.arch_laptop
@@ -70,23 +70,6 @@ opacity = 1.0
 padding = 6.0
 radius = 5.0
 
-[widget.cpu]
-type = "alex/system-status:cpu"
-
-[widget.ram]
-type = "alex/system-status:memory"
-
-[widget.temp]
-type = "sysmon"
-stat = "cpu_temp"
-display = "text"
-
-[widget.disk]
-type = "sysmon"
-stat = "disk_pct"
-display = "text"
-path = "/"
-
 [widget.battery-rate]
 type = "alex/system-status:battery-rate"
 
@@ -97,22 +80,3 @@ type = "alex/system-status:gpu-mode"
 sidebar = "full"
 sidebar_section = "full"
 width = 720
-
-[desktop_widgets]
-enabled = false
-
-[wallpaper]
-enabled = true
-fill_color = "#000000"
-
-[wallpaper.default]
-path = "color:#000000"
-
-[plugins]
-enabled = ["alex/system-status"]
-
-[nightlight]
-enabled = true
-force = false
-temperature_day = 6500
-temperature_night = 2500