From ff694f8bc7c59eeb8d605d73192ac42a5fa18f95 Mon Sep 17 00:00:00 2001
From: RonniSkansing <rskansing@gmail.com>
Date: Sat, 12 Sep 2026 22:44:12 +0200
Subject: [PATCH] add editor vim hotkey

Signed-off-by: RonniSkansing <rskansing@gmail.com>
---
 frontend/src/lib/components/editor/Editor.svelte    |  1 +
 .../remote-browser/RemoteBrowserEditor.svelte       |  3 ++-
 frontend/src/routes/+layout.svelte                  | 13 +++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/editor/Editor.svelte b/frontend/src/lib/components/editor/Editor.svelte
index 9cf3848e..88db2680 100644
--- a/frontend/src/lib/components/editor/Editor.svelte
+++ b/frontend/src/lib/components/editor/Editor.svelte
@@ -1124,6 +1124,7 @@
 			<!-- vim mode toggle button -->
 			<button
 				type="button"
+				title="Toggle vim mode (Ctrl+Alt+V)"
 				on:click={() => {
 					vimModeEnabled.update((v) => !v);
 				}}
diff --git a/frontend/src/lib/components/remote-browser/RemoteBrowserEditor.svelte b/frontend/src/lib/components/remote-browser/RemoteBrowserEditor.svelte
index e0779a56..98b8ac01 100644
--- a/frontend/src/lib/components/remote-browser/RemoteBrowserEditor.svelte
+++ b/frontend/src/lib/components/remote-browser/RemoteBrowserEditor.svelte
@@ -1136,7 +1136,8 @@ declare var Infinity: number;
 				<span class="text-xs font-mono text-gray-500 dark:text-gray-400">JavaScript</span>
 				<button
 					type="button"
-					on:click={() => vimModeEnabled.update((v) => !v)}
+					title="Toggle vim mode (Ctrl+Alt+V)"
+						on:click={() => vimModeEnabled.update((v) => !v)}
 					class="h-8 border-2 rounded-md w-20 px-3 text-center cursor-pointer hover:opacity-80 flex items-center justify-center gap-2 transition-colors duration-200"
 					class:font-bold={localVimMode}
 					class:bg-blue-600={localVimMode}
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 6a298b82..c85f0d8d 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -20,6 +20,7 @@
 	import Header from '$lib/components/header/Header.svelte';
 	import { setupTheme, setupOSThemeListener } from '$lib/theme.js';
 	import { displayMode } from '$lib/store/displayMode';
+	import { toggleVimMode } from '$lib/store/vimMode.js';
 
 	// services
 	const session = Session.instance;
@@ -79,6 +80,17 @@
 		const pinned = getCookie('menuPinned');
 		isMenuPinned = pinned === 'true';
 
+		// Ctrl+Alt+V (Cmd+Alt+V on macOS) toggles vim mode in every editor at once.
+		// Uses e.code so it works regardless of keyboard layout, and the capture
+		// phase so an editor with vim active does not swallow it first.
+		const handleVimShortcut = (e) => {
+			if ((e.ctrlKey || e.metaKey) && e.altKey && e.code === 'KeyV') {
+				e.preventDefault();
+				toggleVimMode();
+			}
+		};
+		window.addEventListener('keydown', handleVimShortcut, true);
+
 		(async () => {
 			// handle session
 			// if the user already has a active session, then the session will be
@@ -194,6 +206,7 @@
 		// on unmount
 		return () => {
 			console.log('layout: unmounting');
+			window.removeEventListener('keydown', handleVimShortcut, true);
 			// stop listening for sessions
 			try {
 				session.stop();