ZacharyZhang-NY/omarchycn
3
4
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Make defaults live where defaults always live

Browse Source
This commit is contained in:
David Heinemeier Hansson
2026-05-23 11:28:36 +02:00
parent 4cd6593ba3
commit 5fc4921cfc
10 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/plugins/settings/SettingsPanel.qml
+2 -2
View File
@@ -35,7 +35,7 @@ Item {
property string omarchyPath: Quickshell.env("OMARCHY_PATH")
readonly property string home: Quickshell.env("HOME")
readonly property string userConfigPath: home + "/.config/omarchy/shell.json"
readonly property string defaultsPath: omarchyPath + "/shell/shell-defaults.json"
readonly property string defaultsPath: omarchyPath + "/config/omarchy/shell.json"
// ---------------- theme --------------------------------------------------
// Bar settings deliberately isn't a themable surface in shell.toml — it
@@ -201,7 +201,7 @@ Item {
var parsed = JSON.parse(diskText)
if (Util.isPlainObject(parsed) && parsed.version === 1) defaults = parsed
} catch (e) {
console.warn("Bad shell-defaults JSON, falling back to builtin:", e)
console.warn("Bad default shell JSON, falling back to builtin:", e)
defaults = builtinShellConfig
}
}