From ba25c68c0d9b237202f19d3aa8352dab96ec8110 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 20:43:04 +0200
Subject: [PATCH] Restore default desktop shortcuts and Linux pack scripts

---
 surfsense_desktop/package.json                     |  3 ++-
 surfsense_desktop/src/modules/shortcuts.ts         | 14 ++++++++++++--
 .../components/desktop/shortcut-recorder.tsx       |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/surfsense_desktop/package.json b/surfsense_desktop/package.json
index 7f787c373..e2712d8ea 100644
--- a/surfsense_desktop/package.json
+++ b/surfsense_desktop/package.json
@@ -7,10 +7,11 @@
     "dev": "pnpm build && concurrently -k \"pnpm --dir ../surfsense_web dev\" \"wait-on http://localhost:3000 && node scripts/electron-dev.mjs\"",
     "build": "node scripts/build-electron.mjs",
     "pack:dir": "pnpm build && electron-builder --dir --config electron-builder.yml",
+    "pack:dir:linux": "pnpm build && electron-builder --dir --linux --config electron-builder.yml -c.npmRebuild=false",
     "dist": "pnpm build && electron-builder --config electron-builder.yml",
     "dist:mac": "pnpm build && electron-builder --mac --config electron-builder.yml",
     "dist:win": "pnpm build && electron-builder --win --config electron-builder.yml",
-    "dist:linux": "pnpm build && electron-builder --linux --config electron-builder.yml",
+    "dist:linux": "pnpm build && electron-builder --linux --config electron-builder.yml -c.npmRebuild=false",
     "typecheck": "tsc --noEmit",
     "postinstall": "node scripts/postinstall-rebuild.mjs"
   },
diff --git a/surfsense_desktop/src/modules/shortcuts.ts b/surfsense_desktop/src/modules/shortcuts.ts
index 0b122a2a2..3eb3ca5c9 100644
--- a/surfsense_desktop/src/modules/shortcuts.ts
+++ b/surfsense_desktop/src/modules/shortcuts.ts
@@ -4,8 +4,8 @@ export interface ShortcutConfig {
 }
 
 const DEFAULTS: ShortcutConfig = {
-  generalAssist: 'Alt+Shift+G',
-  quickAsk: 'Alt+Shift+Q',
+  generalAssist: 'CommandOrControl+Shift+S',
+  quickAsk: 'CommandOrControl+Alt+S',
 };
 
 const STORE_KEY = 'shortcuts';
@@ -23,10 +23,20 @@ async function getStore() {
   return store;
 }
 
+/** One-time fix if both shortcuts match the mistaken Alt+Shift pair. */
+function wasRegressionAltPair(rest: Record<string, string>): boolean {
+  return rest.generalAssist === 'Alt+Shift+G' && rest.quickAsk === 'Alt+Shift+Q';
+}
+
 export async function getShortcuts(): Promise<ShortcutConfig> {
   const s = await getStore();
   const raw = (s.get(STORE_KEY) as Record<string, string> | undefined) ?? {};
   const { autocomplete: _drop, ...rest } = raw;
+  if (wasRegressionAltPair(rest)) {
+    const fixed = { ...DEFAULTS };
+    s.set(STORE_KEY, { ...fixed });
+    return fixed;
+  }
   return { ...DEFAULTS, ...rest };
 }
 
diff --git a/surfsense_web/components/desktop/shortcut-recorder.tsx b/surfsense_web/components/desktop/shortcut-recorder.tsx
index 50ced5313..119cd298f 100644
--- a/surfsense_web/components/desktop/shortcut-recorder.tsx
+++ b/surfsense_web/components/desktop/shortcut-recorder.tsx
@@ -36,8 +36,8 @@ export function acceleratorToDisplay(accel: string): string[] {
 }
 
 export const DEFAULT_SHORTCUTS = {
-	generalAssist: "Alt+Shift+G",
-	quickAsk: "Alt+Shift+Q",
+	generalAssist: "CommandOrControl+Shift+S",
+	quickAsk: "CommandOrControl+Alt+S",
 };
 
 // ---------------------------------------------------------------------------