From 9a4cff4e49d0309754831c7eecc54b1d83c90742 Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Wed, 17 Jun 2026 21:30:52 -0400
Subject: [PATCH] settings: fix index conflict on battery tab

---
 .../Modals/Settings/SettingsContent.qml       |  2 +-
 .../Modals/Settings/SettingsSidebar.qml       |  2 +-
 .../translations/settings_search_index.json   | 79 ++++++++++++++-----
 3 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/quickshell/Modals/Settings/SettingsContent.qml b/quickshell/Modals/Settings/SettingsContent.qml
index d8737ab4..c425a0e9 100644
--- a/quickshell/Modals/Settings/SettingsContent.qml
+++ b/quickshell/Modals/Settings/SettingsContent.qml
@@ -690,7 +690,7 @@ FocusScope {
         Loader {
             id: batteryLoader
             anchors.fill: parent
-            active: root.currentIndex === 37
+            active: root.currentIndex === 42
             visible: active
             focus: active
 
diff --git a/quickshell/Modals/Settings/SettingsSidebar.qml b/quickshell/Modals/Settings/SettingsSidebar.qml
index e3c6e9c8..20ccca99 100644
--- a/quickshell/Modals/Settings/SettingsSidebar.qml
+++ b/quickshell/Modals/Settings/SettingsSidebar.qml
@@ -382,7 +382,7 @@ Rectangle {
                     "id": "battery",
                     "text": I18n.tr("Battery"),
                     "icon": "battery_charging_full",
-                    "tabIndex": 37
+                    "tabIndex": 42
                 }
             ]
         },
diff --git a/quickshell/translations/settings_search_index.json b/quickshell/translations/settings_search_index.json
index 00e8e6da..c4f7e4c2 100644
--- a/quickshell/translations/settings_search_index.json
+++ b/quickshell/translations/settings_search_index.json
@@ -4585,27 +4585,6 @@
     ],
     "description": "Automatically lock the screen when DMS starts"
   },
-  {
-    "section": "lockBeforeSuspend",
-    "label": "Lock before suspend",
-    "tabIndex": 11,
-    "category": "Lock Screen",
-    "keywords": [
-      "automatic",
-      "automatically",
-      "before",
-      "lock",
-      "login",
-      "password",
-      "prepares",
-      "screen",
-      "security",
-      "sleep",
-      "suspend",
-      "system"
-    ],
-    "description": "Automatically lock the screen when the system prepares to suspend"
-  },
   {
     "section": "lockScreenNotificationMode",
     "label": "Notification Display",
@@ -6794,6 +6773,27 @@
     "icon": "schedule",
     "description": "Gradually fade the screen before locking with a configurable grace period"
   },
+  {
+    "section": "lockBeforeSuspend",
+    "label": "Lock before suspend",
+    "tabIndex": 21,
+    "category": "Power & Sleep",
+    "keywords": [
+      "automatically",
+      "before",
+      "energy",
+      "lock",
+      "power",
+      "prepares",
+      "screen",
+      "security",
+      "shutdown",
+      "sleep",
+      "suspend",
+      "system"
+    ],
+    "description": "Automatically lock the screen when the system prepares to suspend"
+  },
   {
     "section": "fadeToLockGracePeriod",
     "label": "Lock fade grace period",
@@ -7195,6 +7195,29 @@
     ],
     "description": "Maximum number of entries that can be saved"
   },
+  {
+    "section": "clipboardRememberTypeFilter",
+    "label": "Remember Type Filter",
+    "tabIndex": 23,
+    "category": "System",
+    "keywords": [
+      "behavior",
+      "clipboard",
+      "cliphist",
+      "copy",
+      "filter",
+      "history",
+      "keep",
+      "linux",
+      "os",
+      "paste",
+      "remember",
+      "reopening",
+      "system",
+      "type"
+    ],
+    "description": "Keep the clipboard type filter when reopening history"
+  },
   {
     "section": "clipboardVisibleEntryActions",
     "label": "Visible Entry Actions",
@@ -8972,5 +8995,19 @@
       "wireguard"
     ],
     "icon": "vpn_key"
+  },
+  {
+    "section": "_tab_42",
+    "label": "Battery",
+    "tabIndex": 42,
+    "category": "Settings",
+    "keywords": [
+      "battery",
+      "charge",
+      "charging",
+      "power",
+      "settings"
+    ],
+    "icon": "battery_charging_full"
   }
 ]