settings: migrate vpnLastConnected to session

fixes #1488
2026-01-27 23:12:49 -05:00 · 2026-01-24 16:08:15 -05:00
parent 03cfa55e0b
commit 4e3b24ffbb
7 changed files with 102 additions and 73 deletions
--- a/quickshell/Common/settings/SettingsSpec.js
+++ b/quickshell/Common/settings/SettingsSpec.js
@@ -79,16 +79,18 @@ var SPEC = {
    privacyShowCameraIcon: { def: false },
    privacyShowScreenShareIcon: { def: false },

-    controlCenterWidgets: { def: [
-        { id: "volumeSlider", enabled: true, width: 50 },
-        { id: "brightnessSlider", enabled: true, width: 50 },
-        { id: "wifi", enabled: true, width: 50 },
-        { id: "bluetooth", enabled: true, width: 50 },
-        { id: "audioOutput", enabled: true, width: 50 },
-        { id: "audioInput", enabled: true, width: 50 },
-        { id: "nightMode", enabled: true, width: 50 },
-        { id: "darkMode", enabled: true, width: 50 }
-    ]},
+    controlCenterWidgets: {
+        def: [
+            { id: "volumeSlider", enabled: true, width: 50 },
+            { id: "brightnessSlider", enabled: true, width: 50 },
+            { id: "wifi", enabled: true, width: 50 },
+            { id: "bluetooth", enabled: true, width: 50 },
+            { id: "audioOutput", enabled: true, width: 50 },
+            { id: "audioInput", enabled: true, width: 50 },
+            { id: "nightMode", enabled: true, width: 50 },
+            { id: "darkMode", enabled: true, width: 50 }
+        ]
+    },

    showWorkspaceIndex: { def: false },
    showWorkspaceName: { def: false },
@@ -119,13 +121,15 @@ var SPEC = {
    keyboardLayoutNameCompactMode: { def: false },
    runningAppsCurrentWorkspace: { def: false },
    runningAppsGroupByApp: { def: false },
-    appIdSubstitutions: { def: [
-        { pattern: "Spotify", replacement: "spotify", type: "exact" },
-        { pattern: "beepertexts", replacement: "beeper", type: "exact" },
-        { pattern: "home assistant desktop", replacement: "homeassistant-desktop", type: "exact" },
-        { pattern: "com.transmissionbt.transmission", replacement: "transmission-gtk", type: "contains" },
-        { pattern: "^steam_app_(\\d+)$", replacement: "steam_icon_$1", type: "regex" }
-    ]},
+    appIdSubstitutions: {
+        def: [
+            { pattern: "Spotify", replacement: "spotify", type: "exact" },
+            { pattern: "beepertexts", replacement: "beeper", type: "exact" },
+            { pattern: "home assistant desktop", replacement: "homeassistant-desktop", type: "exact" },
+            { pattern: "com.transmissionbt.transmission", replacement: "transmission-gtk", type: "contains" },
+            { pattern: "^steam_app_(\\d+)$", replacement: "steam_icon_$1", type: "regex" }
+        ]
+    },
    centeringMode: { def: "index" },
    clockDateFormat: { def: "" },
    lockDateFormat: { def: "" },
@@ -153,7 +157,6 @@ var SPEC = {
    weatherEnabled: { def: true },

    networkPreference: { def: "auto" },
-    vpnLastConnected: { def: "" },

    iconTheme: { def: "System Default", onChange: "applyStoredIconTheme" },
    availableIconThemes: { def: ["System Default"], persist: false },
@@ -306,7 +309,7 @@ var SPEC = {
    osdAlwaysShowValue: { def: false },
    osdPosition: { def: 5 },
    osdVolumeEnabled: { def: true },
-    osdMediaVolumeEnabled : { def: true },
+    osdMediaVolumeEnabled: { def: true },
    osdBrightnessEnabled: { def: true },
    osdIdleInhibitorEnabled: { def: true },
    osdMicMuteEnabled: { def: true },
@@ -337,52 +340,54 @@ var SPEC = {
    niriOutputSettings: { def: {} },
    hyprlandOutputSettings: { def: {} },

-    barConfigs: { def: [{
-        id: "default",
-        name: "Main Bar",
-        enabled: true,
-        position: 0,
-        screenPreferences: ["all"],
-        showOnLastDisplay: true,
-        leftWidgets: ["launcherButton", "workspaceSwitcher", "focusedWindow"],
-        centerWidgets: ["music", "clock", "weather"],
-        rightWidgets: ["systemTray", "clipboard", "cpuUsage", "memUsage", "notificationButton", "battery", "controlCenterButton"],
-        spacing: 4,
-        innerPadding: 4,
-        bottomGap: 0,
-        transparency: 1.0,
-        widgetTransparency: 1.0,
-        squareCorners: false,
-        noBackground: false,
-        gothCornersEnabled: false,
-        gothCornerRadiusOverride: false,
-        gothCornerRadiusValue: 12,
-        borderEnabled: false,
-        borderColor: "surfaceText",
-        borderOpacity: 1.0,
-        borderThickness: 1,
-        widgetOutlineEnabled: false,
-        widgetOutlineColor: "primary",
-        widgetOutlineOpacity: 1.0,
-        widgetOutlineThickness: 1,
-        fontScale: 1.0,
-        autoHide: false,
-        autoHideDelay: 250,
-        showOnWindowsOpen: false,
-        openOnOverview: false,
-        visible: true,
-        popupGapsAuto: true,
-        popupGapsManual: 4,
-        maximizeDetection: true,
-        scrollEnabled: true,
-        scrollXBehavior: "column",
-        scrollYBehavior: "workspace",
-        shadowIntensity: 0,
-        shadowOpacity: 60,
-        shadowColorMode: "text",
-        shadowCustomColor: "#000000",
-        clickThrough: false
-    }], onChange: "updateBarConfigs" },
+    barConfigs: {
+        def: [{
+            id: "default",
+            name: "Main Bar",
+            enabled: true,
+            position: 0,
+            screenPreferences: ["all"],
+            showOnLastDisplay: true,
+            leftWidgets: ["launcherButton", "workspaceSwitcher", "focusedWindow"],
+            centerWidgets: ["music", "clock", "weather"],
+            rightWidgets: ["systemTray", "clipboard", "cpuUsage", "memUsage", "notificationButton", "battery", "controlCenterButton"],
+            spacing: 4,
+            innerPadding: 4,
+            bottomGap: 0,
+            transparency: 1.0,
+            widgetTransparency: 1.0,
+            squareCorners: false,
+            noBackground: false,
+            gothCornersEnabled: false,
+            gothCornerRadiusOverride: false,
+            gothCornerRadiusValue: 12,
+            borderEnabled: false,
+            borderColor: "surfaceText",
+            borderOpacity: 1.0,
+            borderThickness: 1,
+            widgetOutlineEnabled: false,
+            widgetOutlineColor: "primary",
+            widgetOutlineOpacity: 1.0,
+            widgetOutlineThickness: 1,
+            fontScale: 1.0,
+            autoHide: false,
+            autoHideDelay: 250,
+            showOnWindowsOpen: false,
+            openOnOverview: false,
+            visible: true,
+            popupGapsAuto: true,
+            popupGapsManual: 4,
+            maximizeDetection: true,
+            scrollEnabled: true,
+            scrollXBehavior: "column",
+            scrollYBehavior: "workspace",
+            shadowIntensity: 0,
+            shadowOpacity: 60,
+            shadowColorMode: "text",
+            shadowCustomColor: "#000000",
+            clickThrough: false
+        }], onChange: "updateBarConfigs"
+    },

    desktopClockEnabled: { def: false },
    desktopClockStyle: { def: "analog" },
@@ -437,7 +442,7 @@ var SPEC = {
 };

 function getValidKeys() {
-    return Object.keys(SPEC).filter(function(k) { return SPEC[k].persist !== false; }).concat(["configVersion"]);
+    return Object.keys(SPEC).filter(function (k) { return SPEC[k].persist !== false; }).concat(["configVersion"]);
 }

 function set(root, key, value, saveFn, hooks) {