From 28b9bb246beb34c149715171cd937f99526e37b0 Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Mon, 26 Oct 2026 22:56:41 -0400
Subject: [PATCH] settings: keep the file snapshot independent of live values
 so in-place edits persist

fixes #3955
port 2.0

(cherry picked from commit 693d0c8bb71116c9c40da76b2d236abe9d5e8db6)
---
 quickshell/Common/SettingsData.qml           |  4 +--
 quickshell/Modules/Settings/ThemeAppsTab.qml | 30 +++++++-------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/quickshell/Common/SettingsData.qml b/quickshell/Common/SettingsData.qml
index 89dd9d566..28701202f 100644
--- a/quickshell/Common/SettingsData.qml
+++ b/quickshell/Common/SettingsData.qml
@@ -3705,14 +3705,14 @@ Singleton {
                 return;
             }
 
-            settings = newSettings;
+            settings = JSON.parse(newSettingsJson);
             fileUnsavedUserChanges = fileUnsavedUserChanges || userChanges;
 
             selfWrite = true;
             settingsFileView.setText(newSettingsJson);
         }
         function getSettings() {
-            return Object.assign({}, settings);
+            return JSON.parse(JSON.stringify(settings));
         }
 
         property Timer timer: Timer {
diff --git a/quickshell/Modules/Settings/ThemeAppsTab.qml b/quickshell/Modules/Settings/ThemeAppsTab.qml
index 234563550..84d517ed0 100644
--- a/quickshell/Modules/Settings/ThemeAppsTab.qml
+++ b/quickshell/Modules/Settings/ThemeAppsTab.qml
@@ -12,6 +12,12 @@ Item {
     readonly property var neovimDarkBaseThemes: ["aquarium", "ashes", "aylin", "ayu_dark", "bearded-arc", "carbonfox", "catppuccin", "chadracula", "chadracula-evondev", "chadtain", "chocolate", "darcula-dark", "dark_horizon", "decay", "default-dark", "doomchad", "eldritch", "embark", "everblush", "everforest", "falcon", "flexoki", "flouromachine", "gatekeeper", "github_dark", "gruvbox", "gruvchad", "hiberbee", "horizon", "jabuti", "jellybeans", "kanagawa", "kanagawa-dragon", "material-darker", "material-deep-ocean", "melange", "midnight_breeze", "mito-laser", "monekai", "monochrome", "mountain", "neofusion", "nightfox", "nightlamp", "nightowl", "nord", "obsidian-ember", "oceanic-next", "onedark", "onenord", "oxocarbon", "palenight", "pastelDark", "pastelbeans", "penumbra_dark", "poimandres", "radium", "rosepine", "rxyhn", "scaryforest", "seoul256_dark", "solarized_dark", "solarized_osaka", "starlight", "sweetpastel", "tokyodark", "tokyonight", "tomorrow_night", "tundra", "vesper", "vscode_dark", "wombat", "yoru", "zenburn"]
     readonly property var neovimLightBaseThemes: ["ayu_light", "blossom_light", "catppuccin-latte", "default-light", "everforest_light", "flex-light", "flexoki-light", "github_light", "gruvbox_light", "material-lighter", "nano-light", "oceanic-light", "one_light", "onenord_light", "penumbra_light", "rosepine-dawn", "seoul256_light", "solarized_light", "sunrise_breeze", "vscode_light"]
 
+    function setNeovimSetting(mode, key, value) {
+        const settings = JSON.parse(JSON.stringify(SettingsData.matugenTemplateNeovimSettings));
+        settings[mode][key] = value;
+        SettingsData.set("matugenTemplateNeovimSettings", settings);
+    }
+
     function isTemplateDetected(templateId) {
         if (!templateDetection || templateDetection.length === 0)
             return true;
@@ -429,11 +435,7 @@ Item {
                 currentValue: SettingsData.matugenTemplateNeovimSettings?.dark?.baseTheme ?? "github_dark"
                 options: root.neovimDarkBaseThemes.concat(root.neovimLightBaseThemes)
                 enableFuzzySearch: true
-                onValueChanged: value => {
-                    const settings = SettingsData.matugenTemplateNeovimSettings;
-                    settings.dark.baseTheme = value;
-                    SettingsData.set("matugenTemplateNeovimSettings", settings);
-                }
+                onValueChanged: value => root.setNeovimSetting("dark", "baseTheme", value)
             }
 
             SettingsDropdownRow {
@@ -446,11 +448,7 @@ Item {
                 currentValue: SettingsData.matugenTemplateNeovimSettings?.light?.baseTheme ?? "github_light"
                 options: root.neovimLightBaseThemes.concat(root.neovimDarkBaseThemes)
                 enableFuzzySearch: true
-                onValueChanged: value => {
-                    const settings = SettingsData.matugenTemplateNeovimSettings;
-                    settings.light.baseTheme = value;
-                    SettingsData.set("matugenTemplateNeovimSettings", settings);
-                }
+                onValueChanged: value => root.setNeovimSetting("light", "baseTheme", value)
             }
 
             SettingsSliderRow {
@@ -462,11 +460,7 @@ Item {
                 minimum: 0
                 maximum: 100
                 value: (SettingsData.matugenTemplateNeovimSettings?.dark?.harmony ?? 0.5) * 100
-                onSliderValueChanged: value => {
-                    const settings = SettingsData.matugenTemplateNeovimSettings;
-                    settings.dark.harmony = value / 100;
-                    SettingsData.set("matugenTemplateNeovimSettings", settings);
-                }
+                onSliderValueChanged: value => root.setNeovimSetting("dark", "harmony", value / 100)
             }
 
             SettingsSliderRow {
@@ -478,11 +472,7 @@ Item {
                 minimum: 0
                 maximum: 100
                 value: (SettingsData.matugenTemplateNeovimSettings?.light?.harmony ?? 0.5) * 100
-                onSliderValueChanged: value => {
-                    const settings = SettingsData.matugenTemplateNeovimSettings;
-                    settings.light.harmony = value / 100;
-                    SettingsData.set("matugenTemplateNeovimSettings", settings);
-                }
+                onSliderValueChanged: value => root.setNeovimSetting("light", "harmony", value / 100)
             }
 
             SettingsToggleRow {