From e9806b093be67fe3a43c3edd2cf59eccc1670b64 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Wed, 13 May 2026 13:52:18 -0400
Subject: [PATCH] Reset to defaults: bundle builtin defaults as a guaranteed
 fallback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reset previously could zero the bar out when defaultConfig was empty —
either because bar-defaults.json hadn't finished loading or because the
resolved path was wrong. The shell now carries an inline builtinBarConfig
that mirrors bar-defaults.json, and Reset uses it whenever the on-disk
defaults aren't yet populated.

Also: log the resolved omarchyPath / defaultsPath / userConfigPath at
startup, and route FileView load failures through console.warn so the
next time a user hits this they can see why.
---
 default/quickshell/bar-settings/shell.qml | 35 ++++++++++++++++-------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/default/quickshell/bar-settings/shell.qml b/default/quickshell/bar-settings/shell.qml
index c6ae1ebc..9b51ad60 100644
--- a/default/quickshell/bar-settings/shell.qml
+++ b/default/quickshell/bar-settings/shell.qml
@@ -109,17 +109,22 @@ ShellRoot {
   }
 
   function resetToDefaults() {
-    // Write the merged defaults explicitly so the GUI and bar.json agree on
-    // the full widget list. Adding/removing afterwards operates on that
-    // explicit list rather than on an implicit fallback that the diff would
-    // unintentionally collapse on the next save.
-    var fallback = { position: "top", centerAnchor: "", fontFamily: "JetBrainsMono Nerd Font", layout: { left: [], center: [], right: [] } }
-    var defaults = mergeConfig(fallback, defaultConfig)
+    // Always fall back to the bundled builtin if defaultConfig wound up empty
+    // (path resolution failed or defaultsFile hasn't finished loading), so
+    // Reset never zeroes the bar out.
+    var source = defaultConfig
+    if (!isPlainObject(source) || !isPlainObject(source.layout)) {
+      source = builtinBarConfig
+    } else {
+      var l = source.layout
+      var anyEntries = (l.left && l.left.length) || (l.center && l.center.length) || (l.right && l.right.length)
+      if (!anyEntries) source = builtinBarConfig
+    }
     var payload = {
-      position: String(defaults.position || "top"),
-      centerAnchor: String(defaults.centerAnchor || ""),
-      fontFamily: String(defaults.fontFamily || "JetBrainsMono Nerd Font"),
-      layout: normalizeLayout(defaults.layout || {})
+      position: String(source.position || "top"),
+      centerAnchor: String(source.centerAnchor || ""),
+      fontFamily: String(source.fontFamily || "JetBrainsMono Nerd Font"),
+      layout: normalizeLayout(source.layout || {})
     }
     userFile.setText(JSON.stringify(payload, null, 2) + "\n")
   }
@@ -260,12 +265,20 @@ ShellRoot {
     return result
   }
 
+  Component.onCompleted: {
+    console.log("bar-settings paths",
+      "omarchyPath=" + root.omarchyPath,
+      "defaultsPath=" + root.defaultsPath,
+      "userConfigPath=" + root.userConfigPath)
+  }
+
   FileView {
     id: defaultsFile
     path: root.defaultsPath
     watchChanges: true
-    printErrors: false
+    printErrors: true
     onLoaded: root.loadConfig()
+    onLoadFailed: function(error) { console.warn("defaults load failed:", error, "path=" + root.defaultsPath) }
     onFileChanged: reload()
   }