From 44f33ee2808460f5522d0ce1eb016af7da6242f2 Mon Sep 17 00:00:00 2001
From: dajanto <dajanto.1337@hotmail.de>
Date: Sat, 11 Jul 2026 17:42:56 +0200
Subject: [PATCH 1/4] Fix me up later please

---
 .config/nvim/BEDIENUNG.md                | 181 +++++++++++++++++++++++
 .config/nvim/README.md                   |  72 +++++++++
 .config/nvim/init.lua                    |   2 +
 .config/nvim/init.vim                    |   9 --
 .config/nvim/lazy-lock.json              |  36 +++++
 .config/nvim/lazyvim.json                |  10 ++
 .config/nvim/lua/config/autocmds.lua     |   3 +
 .config/nvim/lua/config/keymaps.lua      | 141 ++++++++++++++++++
 .config/nvim/lua/config/lazy.lua         |  53 +++++++
 .config/nvim/lua/config/options.lua      |  21 +++
 .config/nvim/lua/plugins/blade.lua       |  24 +++
 .config/nvim/lua/plugins/colorscheme.lua |  11 ++
 .config/nvim/lua/plugins/editor.lua      |  12 ++
 .config/nvim/lua/plugins/lang-php.lua    |  11 ++
 .config/nvim/lua/plugins/laravel.lua     |  20 +++
 .config/nvim/lua/plugins/tooling.lua     |  15 ++
 .config/nvim/lua/plugins/vue.lua         |  91 ++++++++++++
 .config/nvim/lua/plugins/web.lua         |  24 +++
 .config/nvim/stylua.toml                 |   6 +
 install.sh                               |  14 +-
 20 files changed, 743 insertions(+), 13 deletions(-)
 create mode 100644 .config/nvim/BEDIENUNG.md
 create mode 100644 .config/nvim/README.md
 create mode 100644 .config/nvim/init.lua
 delete mode 100644 .config/nvim/init.vim
 create mode 100644 .config/nvim/lazy-lock.json
 create mode 100644 .config/nvim/lazyvim.json
 create mode 100644 .config/nvim/lua/config/autocmds.lua
 create mode 100644 .config/nvim/lua/config/keymaps.lua
 create mode 100644 .config/nvim/lua/config/lazy.lua
 create mode 100644 .config/nvim/lua/config/options.lua
 create mode 100644 .config/nvim/lua/plugins/blade.lua
 create mode 100644 .config/nvim/lua/plugins/colorscheme.lua
 create mode 100644 .config/nvim/lua/plugins/editor.lua
 create mode 100644 .config/nvim/lua/plugins/lang-php.lua
 create mode 100644 .config/nvim/lua/plugins/laravel.lua
 create mode 100644 .config/nvim/lua/plugins/tooling.lua
 create mode 100644 .config/nvim/lua/plugins/vue.lua
 create mode 100644 .config/nvim/lua/plugins/web.lua
 create mode 100644 .config/nvim/stylua.toml
 mode change 100755 => 100644 install.sh

diff --git a/.config/nvim/BEDIENUNG.md b/.config/nvim/BEDIENUNG.md
new file mode 100644
index 0000000..5387b82
--- /dev/null
+++ b/.config/nvim/BEDIENUNG.md
@@ -0,0 +1,181 @@
+# Bedienungsanleitung — Neovim wie IntelliJ (Alltag)
+
+Diese Config ist **LazyVim + eine JetBrains-Tastenebene**. Ziel: du arbeitest mit deinen
+IntelliJ-Reflexen (Ctrl+B, Shift+F6, Alt+Enter, Ctrl+Shift+F …), bekommst aber Vim-Editing dazu.
+
+> **Wichtigster Trick:** Wenn du eine Taste vergisst, drück **`Leertaste`** (= Leader) und warte —
+> ein Menü (which-key) zeigt dir alle Befehle. So brauchst du nichts auswendig zu lernen.
+
+---
+
+## 1. Start
+
+```sh
+cd ~/mein/projekt
+nvim .            # öffnet Explorer im Projekt
+# oder direkt eine Datei:
+nvim app/Models/User.php
+```
+
+Erststart lädt Plugins automatisch. Sprachserver/Formatter kommen über Mason (`:Mason`),
+Treesitter-Parser über `:TSInstall` bzw. automatisch beim Öffnen der jeweiligen Dateityp.
+
+**Speichern & Beenden** (die drei, die du sofort brauchst):
+- Speichern: `:w` + Enter (oder `Leertaste w`)
+- Beenden: `:q` + Enter — alles beenden: `:qa`
+- Speichern **und** beenden: `ZZ` (Großbuchstaben, im Normal-Modus)
+
+---
+
+## 2. Vim-Grundlagen für IntelliJ-Umsteiger (2 Minuten)
+
+Neovim ist **modal**. Du bist meistens im **Normal-Modus** (Tasten = Befehle, nicht Text).
+
+| Modus | Wozu | Rein | Raus |
+|---|---|---|---|
+| **Normal** | Navigieren, Befehle | `Esc` | — |
+| **Insert** | Text tippen | `i` (vor Cursor), `a` (nach), `o` (neue Zeile) | `Esc` |
+| **Visual** | Markieren | `v` (Zeichen), `V` (Zeile), `Ctrl+v` (Block) | `Esc` |
+
+**Das absolute Minimum an Motions** (im Normal-Modus):
+- Bewegen: `h j k l` (←↓↑→), Wort `w`/`b`, Zeilenanfang `^`, Zeilenende `$`, Datei `gg`/`G`
+- Löschen/Ändern: `dd` (Zeile löschen), `ciw` (Wort ersetzen), `x` (Zeichen), `u` (undo), `Ctrl+r` (redo)
+- Kopieren/Einfügen: `yy` (Zeile yanken), `p` (einfügen)
+- **`.`** wiederholt die letzte Änderung — extrem nützlich.
+
+Du kannst die JetBrains-Tasten unten nutzen, ohne Vim zu „können" — aber diese Handvoll Motions
+macht dich sofort schneller.
+
+---
+
+## 3. Der typische Arbeitstag
+
+### Dateien & Suche
+| Was | Taste (JetBrains) | Alternative (Leader) |
+|---|---|---|
+| Search Everywhere | `Leertaste Leertaste` | — |
+| Datei öffnen (Go to File) | `Ctrl+Shift+N` | `Leertaste f f` |
+| Im Projekt suchen (Find in Path) | `Ctrl+Shift+F` | `Leertaste /` |
+| Zuletzt benutzte Dateien | `Ctrl+E` | `Leertaste f r` |
+| Symbol in Datei (Go to Class) | `Ctrl+N` | `Leertaste s s` |
+| Aktion/Befehl finden | `Ctrl+Shift+A` | `Leertaste :` |
+| Projekt-Explorer (Tree) | `Alt+1` | `Leertaste e` |
+| Ersetzen im Projekt | `Ctrl+Shift+R` | — |
+
+> In der Suchliste: mit `Ctrl+j`/`Ctrl+k` (oder ↑↓) wählen, `Enter` öffnen, `Ctrl+v`/`Ctrl+s` in
+> vertikalem/horizontalem Split öffnen, `Esc` schließen.
+
+### Im Code navigieren
+| Was | Taste | |
+|---|---|---|
+| Zur Definition | `Ctrl+B` | (auch `gd`) |
+| Zur Implementierung | `Ctrl+Alt+B` | (auch `gI`) |
+| Zum Typ | `Ctrl+Shift+B` | (auch `gy`) |
+| Verwendungen (Find Usages) | `Alt+F7` | (auch `gr`) |
+| Zurück / Vor (Cursor-History) | `Ctrl+Alt+←` / `Ctrl+Alt+→` | |
+| Nächster/voriger Fehler | `]d` / `[d` | |
+
+### Code ändern & refactoren
+| Was | Taste | |
+|---|---|---|
+| Kontextaktionen / Quick Fix | `Alt+Enter` oder `Ctrl+.` | (auch `Leertaste c a`) |
+| Umbenennen (Rename) | `Shift+F6` | (auch `Leertaste c r`) |
+| Code formatieren | `Ctrl+Alt+L` | (auch `Leertaste c f`) |
+| Zeile aus-/einkommentieren | `Ctrl+/` | |
+| Zeile verschieben | `Alt+Shift+↑` / `Alt+Shift+↓` | |
+| Quick-Doku (Hover) | `Ctrl+Q` oder `K` | |
+| Parameter-Info | `Ctrl+P` | |
+| Autovervollständigung | tippen → Liste; `Enter` bestätigt, `Ctrl+Space` erzwingt | |
+
+### Diagnose / Fehler
+- Fehlerliste (Trouble): `Leertaste x x`
+- Fehler unter Cursor anzeigen: `Leertaste c d`
+- Springen: `]d` / `[d` (Diagnose), `]e` / `[e` (nur Fehler)
+
+### Git
+- **lazygit** (volle Git-UI): `Leertaste g g`
+- Zeilen-Blame: `Leertaste g b` · Datei-History: `Leertaste g f`
+- Hunk vor/zurück: `]h` / `[h` · Hunk stagen: im Gitsigns-Menü `Leertaste g h`
+
+### Terminal
+- Terminal auf/zu: `Alt+F12`
+- Aus dem Terminal zurück in Normal: `Ctrl+\` `Ctrl+n`
+
+### Fenster, Tabs & Buffer
+| Was | Taste |
+|---|---|
+| Zwischen Splits springen | `Ctrl+h/j/k/l` |
+| Vertikal/horizontal teilen | `Leertaste \|` / `Leertaste -` |
+| Nächster/voriger Buffer (Tab) | `Shift+l` / `Shift+h` |
+| Buffer schließen | `Leertaste b d` |
+| Suche-Highlight weg | `Esc` (oder `F9`) |
+
+---
+
+## 4. Pro Sprache/Framework
+
+### PHP / Laravel
+- **Intelephense** liefert Completion, Go-to-Definition, Hover, Diagnostics.
+- **Rename (`Shift+F6`) & Code-Actions (`Alt+Enter`)** brauchen **Intelephense Premium**.
+  Kostenlose Alternative: in `lua/config/lazy.lua` `vim.g.lazyvim_php_lsp = "phpactor"` setzen.
+- **Formatieren** mit **Laravel Pint** (`Ctrl+Alt+L`) — legt eine `pint.json` ins Projekt, dann wird
+  euer Team-Standard genutzt. Braucht ein `php`-Binary (`brew install php composer`).
+- **Blade** (`*.blade.php`): eigenes Highlighting (Treesitter), Format via `blade-formatter`.
+- **Artisan/Routes/Views** über `laravel.nvim`: `Leertaste L` (Menü), z.B. `Leertaste L a` (Artisan).
+
+### Vue / Nuxt
+- `.vue`-Dateien: **vtsls** (TypeScript-Intelligenz inkl. Komponenten) + **vue_ls** (Template/SFC).
+- Nuxt braucht keinen eigenen Server — funktioniert über die Vue/TS-Server. Auto-Imports werden erkannt,
+  sobald das Projekt einmal `npm install` gelaufen ist.
+- Formatieren: **Prettier** (`Ctrl+Alt+L`).
+- *Hinweis:* `vue_ls` wird automatisch repariert (es zieht sonst eine inkompatible TypeScript-7-Preview
+  und stürzt ab). Beim allerersten Mal ggf. einmal `:VueFixTs` ausführen und Neovim neu starten.
+
+### TypeScript / JavaScript
+- **vtsls**: Completion, Typen, Go-to-Definition, Refactorings; **ESLint** als Linter, **Prettier** zum Formatieren.
+
+### Tailwind / CSS
+- **Tailwind**: Klassen-Autocomplete **mit Farb-Vorschau** — auch in Blade- und Vue-Dateien.
+  Greift, sobald das Projekt eine Tailwind-Config hat.
+- **CSS/SCSS/LESS**: `cssls` (Hover, Completion) + Prettier.
+
+---
+
+## 5. Wenn eine Taste nicht geht (Terminal-Protokoll)
+
+Chords wie `Ctrl+.`, `Ctrl+Shift+F`, `Ctrl+Alt+L` brauchen das **kitty keyboard protocol**:
+- **Ghostty** (macOS): läuft ✓
+- **Windows Terminal** (WSL): ab **v1.25** ✓ — sonst nimm die `Leertaste`-Alternativen aus den Tabellen.
+
+Schnelltest: `nvim` → `i` (Insert) → `Ctrl+v` → dann `Ctrl+.` drücken.
+- Erscheint etwas wie `^[[46;5u` → Protokoll aktiv ✓
+- Kommt nur `.` → Terminal aktualisieren/wechseln, bis dahin `Leertaste`-Wege nutzen.
+
+---
+
+## 6. Wartung & Hilfe
+
+| Befehl | Zweck |
+|---|---|
+| `:Lazy` | Plugins (Status, Update mit `U`, Sync mit `S`) |
+| `:Mason` | LSP-Server & Formatter installieren/prüfen |
+| `:checkhealth` | Diagnose der ganzen Installation |
+| `:LspInfo` | Welche Sprachserver hängen am aktuellen Buffer? |
+| `Leertaste s k` | Alle Tastenkürzel durchsuchen |
+
+**Anpassen:** Tasten in `lua/config/keymaps.lua`, Optionen in `lua/config/options.lua`,
+Sprachen in `lua/config/lazy.lua` (oder `:LazyExtras`), eigene Plugins in `lua/plugins/*.lua`.
+
+---
+
+## 7. Aktivieren (fest installieren)
+
+Bisher läuft alles isoliert testbar über `NVIM_APPNAME=nvim-jb nvim` (verändert deine bestehende
+`~/.config/nvim` nicht). Wenn du es zum Standard machen willst:
+
+```sh
+cd ~/github/dotfiles
+./install.sh      # kopiert nach ~/.config/nvim und sichert eine vorhandene Config als Backup
+```
+
+Danach startet `nvim` (bzw. dein Alias `vim`) direkt diese Config.
diff --git a/.config/nvim/README.md b/.config/nvim/README.md
new file mode 100644
index 0000000..fcbfb7a
--- /dev/null
+++ b/.config/nvim/README.md
@@ -0,0 +1,72 @@
+# Neovim mit IntelliJ/JetBrains-Feeling (LazyVim)
+
+Diese Neovim-Config ist [LazyVim](https://www.lazyvim.org) + eine eigene **JetBrains-Keymap-Ebene**.
+Die JetBrains-Shortcuts zeigen auf echte IDE-Features (LSP, Snacks-Picker, conform, which-key), nicht
+nur auf Tastenkombis.
+
+## Voraussetzungen
+
+| Tool | Zweck | Installation |
+|---|---|---|
+| Neovim ≥ 0.10 | Basis (kitty-Protokoll-Client) | linuxbrew: `brew install neovim` |
+| ripgrep, fd | Find in Path / Dateisuche | `brew install ripgrep fd` |
+| Node ≥ 18 (20+ empfohlen) | LSP-Server (intelephense, vue_ls, vtsls, …) | `brew install node` |
+| php + composer | Laravel Pint (Format) & Artisan-Runtime | `brew install php composer` |
+
+**Terminal:** Chords wie `Ctrl+.`, `Ctrl+Shift+F`, `Ctrl+Alt+L` brauchen das **kitty keyboard protocol**.
+- **Ghostty** (macOS): standardmäßig aktiv ✓
+- **Windows Terminal** (WSL): ab **v1.25** (März 2026) ✓ — vorher greifen die `<leader>`-Fallbacks.
+
+## Aktivierung
+
+```sh
+# Variante A: fest installieren (aus dem dotfiles-Repo). Sichert eine vorhandene
+# ~/.config/nvim automatisch nach ~/.config/nvim.backup.<ts>
+./install.sh
+
+# Variante B: gefahrlos testen, ohne die bestehende Config anzufassen
+ln -s ~/github/dotfiles/.config/nvim ~/.config/nvim-jb
+NVIM_APPNAME=nvim-jb nvim
+```
+
+Beim ersten Start installiert LazyVim automatisch alle Plugins; die LSP-Server/Formatter kommen über
+Mason (`:Mason`), Treesitter-Parser über `:TSInstall`.
+
+## JetBrains-Tastenbelegung (Windows/Linux-Keymap, Ctrl-basiert)
+
+`[proto]` = braucht kitty-Protokoll (Ghostty / Windows Terminal ≥ 1.25).
+
+| Aktion | Shortcut | | Aktion | Shortcut |
+|---|---|---|---|---|
+| Search Everywhere | `Space Space` | | Go to Definition | `Ctrl+B` |
+| Find in Path (grep) | `Ctrl+Shift+F` `[proto]` | | Go to Implementation | `Ctrl+Alt+B` `[proto]` |
+| Go to File | `Ctrl+Shift+N` `[proto]` | | Go to Type Definition | `Ctrl+Shift+B` `[proto]` |
+| Go to Symbol (Datei) | `Ctrl+N` | | Find Usages | `Alt+F7` |
+| Find Action | `Ctrl+Shift+A` `[proto]` | | Context Actions / Quick Fix | `Alt+Enter` / `Ctrl+.` |
+| Recent Files | `Ctrl+E` | | Rename | `Shift+F6` |
+| Project-Explorer | `Alt+1` | | Quick Documentation | `Ctrl+Q` (oder `K`) |
+| Reformat Code | `Ctrl+Alt+L` `[proto]` | | Parameter Info | `Ctrl+P` (normal mode) |
+| Comment Line | `Ctrl+/` | | Navigate Back / Forward | `Ctrl+Alt+←/→` `[proto]` |
+| Replace in Path | `Ctrl+Shift+R` `[proto]` | | Move Line Up/Down | `Alt+Shift+↑/↓` |
+| Terminal | `Alt+F12` | | Laravel-Menü | `Space L` |
+
+**Absichtlich Vim-typisch belassen** (nicht auf JetBrains gebogen): `Ctrl+R` = Redo, `Ctrl+W` = Fenster,
+`Ctrl+D/U` = Scroll, `Ctrl+V` = Visual-Block. Alles ist zusätzlich über `<space>` (which-key) erreichbar.
+
+## Sprachen & Frameworks
+
+- **PHP**: intelephense (Completion/Navigation). *Rename & Code-Actions brauchen Intelephense Premium
+  oder wechsle in `lua/config/lazy.lua` auf `vim.g.lazyvim_php_lsp = "phpactor"` (kostenlos).*
+- **Laravel/Blade**: Blade-Filetype + Treesitter-Grammar + `blade-formatter`; `laravel.nvim` unter `Space L`.
+- **Vue/Nuxt**: vue_ls + vtsls (`<script setup lang="ts">` inkl. Nuxt-Auto-Imports). `vue_ls` zieht sonst
+  die kaputte TypeScript-7-Preview — `lua/plugins/vue.lua` pinnt seine TS automatisch auf 5.x (bzw. `:VueFixTs`).
+- **TypeScript/JavaScript**: vtsls; ESLint + Prettier.
+- **Tailwind**: tailwindcss-LSP inkl. Blade-Dateien (Farb-Swatches in der Completion).
+- **CSS/SCSS/LESS**: cssls + Prettier.
+
+## Anpassen
+
+- Keymaps: `lua/config/keymaps.lua`
+- Optionen: `lua/config/options.lua`
+- Extras (Sprachen): `lua/config/lazy.lua` bzw. `:LazyExtras`
+- Eigene Plugins/Overrides: `lua/plugins/*.lua`
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
new file mode 100644
index 0000000..2514f9e
--- /dev/null
+++ b/.config/nvim/init.lua
@@ -0,0 +1,2 @@
+-- bootstrap lazy.nvim, LazyVim and your plugins
+require("config.lazy")
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
deleted file mode 100644
index 3251e20..0000000
--- a/.config/nvim/init.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
-let &packpath=&runtimepath
-source ~/.vimrc
-set undodir=~/.config/nvim/undo
-if empty(glob('~/.config/nvim/autoload/plug.vim'))
-	silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs
-				\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-	autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-endif
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
new file mode 100644
index 0000000..c63ca4c
--- /dev/null
+++ b/.config/nvim/lazy-lock.json
@@ -0,0 +1,36 @@
+{
+  "LazyVim": { "branch": "main", "commit": "c10948c50b18fae7f256433afdef09e432410480" },
+  "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
+  "catppuccin": { "branch": "main", "commit": "05e8787020dcfdb937bf2ff23855ea2415b4e072" },
+  "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
+  "flash.nvim": { "branch": "main", "commit": "b6346946d10d07998efee029fb0f7a593806d0cd" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "gitsigns.nvim": { "branch": "main", "commit": "eb60cc7b94c46005237fd34170d76f3a089a90aa" },
+  "grug-far.nvim": { "branch": "main", "commit": "beb2ce490b72048c587e8a3d919cba1b4608bb04" },
+  "gruvbox.nvim": { "branch": "main", "commit": "154eb5ff5b96d0641307113fa385eaf0d36d9796" },
+  "laravel.nvim": { "branch": "main", "commit": "261bbd12aaf0ebc589ed7c1137071b0141f1c14c" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
+  "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
+  "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "47059d71b42d74b0a1e9f61c1d99d301039c3b5b" },
+  "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" },
+  "mini.ai": { "branch": "main", "commit": "25248c6aa002391936a6200f12d1466015987133" },
+  "mini.icons": { "branch": "main", "commit": "98faae31e9be1cc054ae63485e58ceb185efcad0" },
+  "mini.pairs": { "branch": "main", "commit": "b1fd9df3bb4a41c8f45778a3859ee80ef6b367e3" },
+  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-lint": { "branch": "master", "commit": "a219b2c9e5b4765e5c845aba119dad55806fcaf1" },
+  "nvim-lspconfig": { "branch": "master", "commit": "5955a100ae7155962330643924e21a798b9bdc91" },
+  "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "88c1453db4ba7dd24131086fe51fdf74e587d275" },
+  "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
+  "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
+  "snacks.nvim": { "branch": "main", "commit": "882c996cf28183f4d63640de0b4c02ec886d01f2" },
+  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
+  "tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" },
+  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "ts-comments.nvim": { "branch": "main", "commit": "a59d6092213447450191122c9346f309161504cb" },
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
+}
diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
new file mode 100644
index 0000000..d8bcaf6
--- /dev/null
+++ b/.config/nvim/lazyvim.json
@@ -0,0 +1,10 @@
+{
+  "extras": [
+
+  ],
+  "install_version": 8,
+  "news": {
+    "NEWS.md": "11866"
+  },
+  "version": 8
+}
\ No newline at end of file
diff --git a/.config/nvim/lua/config/autocmds.lua b/.config/nvim/lua/config/autocmds.lua
new file mode 100644
index 0000000..147344a
--- /dev/null
+++ b/.config/nvim/lua/config/autocmds.lua
@@ -0,0 +1,3 @@
+-- Add your autocmds here.
+-- LazyVim's default autocmds live in `lazyvim.config.autocmds` and are loaded
+-- automatically. This file is for your own additions.
diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
new file mode 100644
index 0000000..db21b43
--- /dev/null
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -0,0 +1,141 @@
+-- JetBrains / IntelliJ-style keymaps layered on top of LazyVim.
+--
+-- Design notes:
+--  * Uses the JetBrains **Windows/Linux** keymap (Ctrl-based) so a single set of
+--    bindings works in Windows Terminal (WSL) and Ghostty (macOS). The Cmd key is
+--    never used because a terminal does not deliver it to Neovim.
+--  * Chords marked "[proto]" (Ctrl+Shift+..., Ctrl+., Ctrl+Alt+...) need Neovim >= 0.10
+--    and a terminal that speaks the kitty keyboard protocol (Ghostty, or Windows
+--    Terminal >= 1.25). If your terminal can't deliver them, LazyVim's <leader> maps
+--    are the always-working fallback -- press <space> to discover them via which-key.
+--  * We deliberately do NOT clobber load-bearing Vim keys: Ctrl+R (redo),
+--    Ctrl+W (windows), Ctrl+D/Ctrl+U (scroll), Ctrl+V (visual block).
+
+local map = vim.keymap.set
+
+--------------------------------------------------------------------------------
+-- Search / navigation (pickers) -- Snacks is LazyVim's built-in picker
+--------------------------------------------------------------------------------
+
+-- Search Everywhere: double-Shift is not mappable in a terminal, so Space Space.
+map("n", "<leader><space>", function() Snacks.picker.smart() end, { desc = "Search Everywhere (Smart)" })
+
+-- Find in Path / grep across the project (Ctrl+Shift+F)                     [proto]
+map({ "n", "x" }, "<C-S-f>", function() Snacks.picker.grep() end, { desc = "Find in Path (grep)" })
+
+-- Go to File (Ctrl+Shift+N)                                                 [proto]
+map("n", "<C-S-n>", function() Snacks.picker.files() end, { desc = "Go to File" })
+
+-- Go to Symbol in file (Ctrl+N; JetBrains "Go to Class")
+map("n", "<C-n>", function() Snacks.picker.lsp_symbols() end, { desc = "Go to Symbol (document)" })
+
+-- Find Action / command palette (Ctrl+Shift+A)                             [proto]
+map("n", "<C-S-a>", function() Snacks.picker.commands() end, { desc = "Find Action" })
+
+-- Recent Files (Ctrl+E) -- overrides Vim's scroll-one-line
+map("n", "<C-e>", function() Snacks.picker.recent() end, { desc = "Recent Files" })
+
+-- Project tool window (Alt+1) -- reuse LazyVim's explorer toggle
+map("n", "<M-1>", "<leader>e", { remap = true, desc = "Project Explorer" })
+
+--------------------------------------------------------------------------------
+-- Editing / code
+--------------------------------------------------------------------------------
+
+-- Reformat Code (Ctrl+Alt+L) -- conform (pint/prettier/...) with LSP fallback   [proto]
+map({ "n", "x" }, "<C-A-l>", function()
+  local ok = pcall(function() LazyVim.format({ force = true }) end)
+  if not ok then
+    pcall(function() require("conform").format({ async = true, lsp_format = "fallback" }) end)
+  end
+end, { desc = "Reformat Code" })
+
+-- Comment line / selection (Ctrl+/). This overrides LazyVim's terminal toggle on
+-- Ctrl+/, so the terminal moves to Alt+F12 (JetBrains) below. <C-_> is what older
+-- terminals send for Ctrl+/.
+map("n", "<C-/>", "gcc", { remap = true, desc = "Comment Line" })
+map("x", "<C-/>", "gc", { remap = true, desc = "Comment Selection" })
+map("n", "<C-_>", "gcc", { remap = true, desc = "Comment Line" })
+map("x", "<C-_>", "gc", { remap = true, desc = "Comment Selection" })
+
+-- Terminal (Alt+F12) -- since Ctrl+/ is now "comment"
+map("n", "<M-F12>", function() Snacks.terminal() end, { desc = "Terminal" })
+map("t", "<M-F12>", "<cmd>close<cr>", { desc = "Hide Terminal" })
+
+-- Move line / selection up & down (Alt+Shift+Up/Down)
+map("n", "<M-S-Down>", "<cmd>execute 'move .+1'<cr>==", { desc = "Move Line Down" })
+map("n", "<M-S-Up>", "<cmd>execute 'move .-2'<cr>==", { desc = "Move Line Up" })
+map("i", "<M-S-Down>", "<esc><cmd>m .+1<cr>==gi", { desc = "Move Line Down" })
+map("i", "<M-S-Up>", "<esc><cmd>m .-2<cr>==gi", { desc = "Move Line Up" })
+map("x", "<M-S-Down>", ":m '>+1<cr>gv=gv", { desc = "Move Selection Down" })
+map("x", "<M-S-Up>", ":m '<-2<cr>gv=gv", { desc = "Move Selection Up" })
+
+-- Navigate Back / Forward (Ctrl+Alt+Left/Right -> jumplist)                 [proto]
+map("n", "<C-A-Left>", "<C-o>", { desc = "Navigate Back" })
+map("n", "<C-A-Right>", "<C-i>", { desc = "Navigate Forward" })
+
+--------------------------------------------------------------------------------
+-- LSP-dependent JetBrains keys -- set per-buffer once a language server attaches
+--------------------------------------------------------------------------------
+
+vim.api.nvim_create_autocmd("LspAttach", {
+  group = vim.api.nvim_create_augroup("jetbrains_lsp_keys", { clear = true }),
+  callback = function(ev)
+    local buf = ev.buf
+    local function bmap(mode, lhs, rhs, desc)
+      vim.keymap.set(mode, lhs, rhs, { buffer = buf, desc = desc, silent = true })
+    end
+
+    -- Go to Declaration / Definition (Ctrl+B; gd also works in LazyVim)
+    bmap("n", "<C-b>", function() Snacks.picker.lsp_definitions() end, "Go to Definition")
+    -- Go to Implementation (Ctrl+Alt+B)                                     [proto]
+    bmap("n", "<C-A-b>", function() Snacks.picker.lsp_implementations() end, "Go to Implementation")
+    -- Go to Type Definition (Ctrl+Shift+B)                                  [proto]
+    bmap("n", "<C-S-b>", function() Snacks.picker.lsp_type_definitions() end, "Go to Type Definition")
+    -- Find Usages (Alt+F7)
+    bmap("n", "<M-F7>", function() Snacks.picker.lsp_references() end, "Find Usages")
+    -- Context Actions (Alt+Enter) & Quick Fix (Ctrl+.)                      [proto for Ctrl+.]
+    bmap({ "n", "x" }, "<M-CR>", vim.lsp.buf.code_action, "Context Actions")
+    bmap({ "n", "x" }, "<C-.>", vim.lsp.buf.code_action, "Quick Fix / Code Action")
+    -- Rename (Shift+F6)
+    bmap("n", "<S-F6>", vim.lsp.buf.rename, "Rename")
+    -- Quick Documentation (Ctrl+Q; K also works)
+    bmap("n", "<C-q>", function() vim.lsp.buf.hover() end, "Quick Documentation")
+    -- Parameter Info (Ctrl+P in normal mode; insert-mode Ctrl+P stays completion)
+    bmap("n", "<C-p>", function() vim.lsp.buf.signature_help() end, "Parameter Info")
+  end,
+})
+
+--------------------------------------------------------------------------------
+-- Ergonomics carried over from the old .vimrc
+--------------------------------------------------------------------------------
+
+map("n", "n", "nzzzv", { desc = "Next search result (centered)" })
+map("n", "N", "Nzzzv", { desc = "Prev search result (centered)" })
+map("n", "J", "mzJ`z", { desc = "Join lines (keep cursor)" })
+map("n", "Y", "yg_", { desc = "Yank to end of line" })
+map("x", "p", '"_dP', { desc = "Paste without yanking selection" })
+map("n", "#", "*N", { desc = "Search word under cursor (forward)" })
+
+-- German-keyboard ergonomics
+map("n", "ö", "viB", { desc = "Select inside {}" })
+map("n", "ä", "^", { desc = "First non-blank char" })
+
+-- Ergodox half-page scroll
+map("", "<PageUp>", "<C-u>", { desc = "Half page up" })
+map("", "<PageDown>", "<C-d>", { desc = "Half page down" })
+
+-- Misc utilities from .vimrc
+map("n", "<F9>", "<cmd>nohlsearch<cr>", { desc = "Clear search highlight" })
+map("n", "<F2>", "<cmd>set spell<cr>", { desc = "Spell on" })
+map("n", "<F3>", "<cmd>set nospell<cr>", { desc = "Spell off" })
+map("n", "<F4>", "A✔️<esc>j^", { desc = "Append checkmark" })
+map("n", "<F5>", '"=strftime("%c")<cr>P', { desc = "Insert date/time" })
+map("n", "<F6>", ":s/", { desc = "Substitute (line)" })
+map("n", "<F7>", ":%s/", { desc = "Substitute (file)" })
+
+-- NOTE: intentionally NOT migrated (they conflict with the new space-leader /
+-- LazyVim, or are rarely useful):
+--  * `<space>` -> `/`   (space is now the leader key; use `/` to search)
+--  * leader Y/X leetcode copy helpers (old leader was `q`)
+--  * Q/q macro swap (LazyVim uses `q` to close special windows)
diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua
new file mode 100644
index 0000000..893395f
--- /dev/null
+++ b/.config/nvim/lua/config/lazy.lua
@@ -0,0 +1,53 @@
+-- Set leader keys and LazyVim toggles BEFORE lazy starts, so plugins/extras
+-- pick them up correctly.
+vim.g.mapleader = " "
+vim.g.maplocalleader = "\\"
+
+-- The LazyVim `lang.php` extra defaults to phpactor. Use Intelephense instead
+-- (stronger completion/navigation). NOTE: rename & code-actions need Intelephense
+-- Premium; for free refactoring switch this to "phpactor".
+vim.g.lazyvim_php_lsp = "intelephense"
+
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+  if vim.v.shell_error ~= 0 then
+    vim.api.nvim_echo({
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+      { out, "WarningMsg" },
+      { "\nPress any key to exit..." },
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup({
+  spec = {
+    -- LazyVim core + its default plugins (LSP via mason, Snacks picker,
+    -- conform, blink.cmp, which-key, treesitter, ...)
+    { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+
+    -- Language & tooling extras. Mason installs the servers automatically.
+    -- IMPORTANT: typescript must be imported before vue (vtsls would otherwise crash).
+    { import = "lazyvim.plugins.extras.lang.typescript" },
+    { import = "lazyvim.plugins.extras.lang.vue" },
+    { import = "lazyvim.plugins.extras.lang.php" },
+    { import = "lazyvim.plugins.extras.lang.tailwind" },
+    { import = "lazyvim.plugins.extras.linting.eslint" },
+    { import = "lazyvim.plugins.extras.formatting.prettier" },
+
+    -- Your own plugin specs / overrides (lua/plugins/*.lua)
+    { import = "plugins" },
+  },
+  defaults = { lazy = false, version = false },
+  install = { colorscheme = { "gruvbox", "tokyonight", "habamax" } },
+  checker = { enabled = true, notify = false },
+  performance = {
+    rtp = {
+      disabled_plugins = { "gzip", "tarPlugin", "tohtml", "tutor", "zipPlugin" },
+    },
+  },
+})
diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua
new file mode 100644
index 0000000..f1c0418
--- /dev/null
+++ b/.config/nvim/lua/config/options.lua
@@ -0,0 +1,21 @@
+-- LazyVim already sets sensible defaults (relativenumber, cursorline, undofile,
+-- ignorecase+smartcase, termguicolors, ...). Here we only add personal
+-- preferences carried over from the old .vimrc.
+
+local opt = vim.opt
+
+-- German + English spell checking (toggle with F2/F3, see keymaps.lua). Spell is
+-- kept OFF in code by default (LazyVim enables it for text/markdown). To force it
+-- everywhere like the old .vimrc, set: opt.spell = true
+opt.spelllang = { "de_de", "en_us" }
+
+-- Keep more context around the cursor when scrolling (old .vimrc used 8).
+opt.scrolloff = 8
+
+-- NOTE on indentation: the old .vimrc used real tabs (noexpandtab, width 4).
+-- For PHP/Laravel (Pint / PSR-12 = 4 spaces) and Vue/Nuxt/JS (Prettier = 2 spaces),
+-- indentation is decided per project by the formatter and .editorconfig, so we keep
+-- LazyVim's defaults (expandtab, shiftwidth=2). To force tabs again, uncomment:
+-- opt.expandtab = false
+-- opt.tabstop = 4
+-- opt.shiftwidth = 4
diff --git a/.config/nvim/lua/plugins/blade.lua b/.config/nvim/lua/plugins/blade.lua
new file mode 100644
index 0000000..4ba4532
--- /dev/null
+++ b/.config/nvim/lua/plugins/blade.lua
@@ -0,0 +1,24 @@
+return {
+  -- Laravel Blade: filetype detection + treesitter grammar + formatter.
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      -- *.blade.php -> filetype "blade"
+      vim.filetype.add({ pattern = { [".*%.blade%.php"] = "blade" } })
+      -- "blade" ships in the nvim-treesitter parser registry, so we just request it
+      -- (plus php_only for the embedded-PHP grammar). No custom parser registration
+      -- needed on the current nvim-treesitter (main) branch.
+      opts.ensure_installed = opts.ensure_installed or {}
+      vim.list_extend(opts.ensure_installed, { "blade", "php", "php_only", "html", "css", "javascript" })
+    end,
+  },
+
+  -- Format Blade files with blade-formatter (installed via Mason in tooling.lua).
+  {
+    "stevearc/conform.nvim",
+    opts = function(_, opts)
+      opts.formatters_by_ft = opts.formatters_by_ft or {}
+      opts.formatters_by_ft.blade = { "blade-formatter" }
+    end,
+  },
+}
diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua
new file mode 100644
index 0000000..290762d
--- /dev/null
+++ b/.config/nvim/lua/plugins/colorscheme.lua
@@ -0,0 +1,11 @@
+return {
+  -- Keep the Gruvbox look from the old setup. Swap `colorscheme` below for
+  -- "tokyonight" (LazyVim default) or add a Darcula theme for a PhpStorm vibe.
+  { "ellisonleao/gruvbox.nvim", lazy = true },
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "gruvbox",
+    },
+  },
+}
diff --git a/.config/nvim/lua/plugins/editor.lua b/.config/nvim/lua/plugins/editor.lua
new file mode 100644
index 0000000..c15c7ed
--- /dev/null
+++ b/.config/nvim/lua/plugins/editor.lua
@@ -0,0 +1,12 @@
+return {
+  -- Replace in Path (JetBrains Ctrl+Shift+R). grug-far gives a project-wide
+  -- search & replace UI. Lazy-loaded on the :GrugFar command.
+  {
+    "MagicDuck/grug-far.nvim",
+    cmd = "GrugFar",
+    opts = {},
+    keys = {
+      { "<C-S-r>", "<cmd>GrugFar<cr>", desc = "Replace in Path" },
+    },
+  },
+}
diff --git a/.config/nvim/lua/plugins/lang-php.lua b/.config/nvim/lua/plugins/lang-php.lua
new file mode 100644
index 0000000..3297423
--- /dev/null
+++ b/.config/nvim/lua/plugins/lang-php.lua
@@ -0,0 +1,11 @@
+return {
+  -- Format PHP with Laravel Pint instead of the php extra's default (php-cs-fixer).
+  -- Pint auto-detects a project's pint.json. Requires a `php` binary + pint installed.
+  {
+    "stevearc/conform.nvim",
+    opts = function(_, opts)
+      opts.formatters_by_ft = opts.formatters_by_ft or {}
+      opts.formatters_by_ft.php = { "pint" }
+    end,
+  },
+}
diff --git a/.config/nvim/lua/plugins/laravel.lua b/.config/nvim/lua/plugins/laravel.lua
new file mode 100644
index 0000000..eb8ef71
--- /dev/null
+++ b/.config/nvim/lua/plugins/laravel.lua
@@ -0,0 +1,20 @@
+return {
+  -- Laravel helpers (Artisan runner, route/view navigation) -- closest thing to
+  -- PhpStorm's Laravel plugin. Lazy-loaded on the :Laravel command / keys so it can
+  -- never break startup. Most useful inside an actual Laravel project.
+  {
+    "adalessa/laravel.nvim",
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+      "MunifTanjim/nui.nvim",
+    },
+    cmd = { "Laravel" },
+    keys = {
+      { "<leader>La", "<cmd>Laravel artisan<cr>", desc = "Laravel: Artisan" },
+      { "<leader>Lr", "<cmd>Laravel routes<cr>", desc = "Laravel: Routes" },
+      { "<leader>Lm", "<cmd>Laravel related<cr>", desc = "Laravel: Related" },
+    },
+    opts = {},
+    config = true,
+  },
+}
diff --git a/.config/nvim/lua/plugins/tooling.lua b/.config/nvim/lua/plugins/tooling.lua
new file mode 100644
index 0000000..a090b59
--- /dev/null
+++ b/.config/nvim/lua/plugins/tooling.lua
@@ -0,0 +1,15 @@
+return {
+  -- Extra Mason tools not covered by any LazyVim extra.
+  -- (Intelephense, prettierd, eslint_d, css-lsp are installed automatically by the
+  -- php / prettier / eslint extras and the cssls server.)
+  {
+    "mason-org/mason.nvim",
+    opts = function(_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      vim.list_extend(opts.ensure_installed, {
+        "pint", -- Laravel Pint (PHP formatter) -- needs a `php` binary at runtime
+        "blade-formatter", -- Blade template formatter
+      })
+    end,
+  },
+}
diff --git a/.config/nvim/lua/plugins/vue.lua b/.config/nvim/lua/plugins/vue.lua
new file mode 100644
index 0000000..e535781
--- /dev/null
+++ b/.config/nvim/lua/plugins/vue.lua
@@ -0,0 +1,91 @@
+-- Vue / Nuxt fix.
+--
+-- @vue/language-server (vue_ls) 3.x does a hard `require("typescript")` from its own
+-- node_modules. Because it declares `typescript: "*"` as a peer dep, npm installs the
+-- native TypeScript 7 preview there, which lacks the classic `ts.server.protocol` API
+-- and crashes vue_ls on startup:
+--   TypeError: Cannot read properties of undefined (reading 'protocol')
+-- Setting init_options.typescript.tsdk does NOT help (the crash is in the hard require).
+-- The reliable fix is to pin the TypeScript *inside vue_ls's own package* to 5.x.
+--
+-- This file self-heals that (idempotent: only acts when TS major >= 6) and also exposes
+-- :VueFixTs. Once upstream ships a TS7-compatible vue_ls, this whole file can be deleted.
+
+local function pin_vue_typescript(notify)
+  local dir = vim.fn.stdpath("data") .. "/mason/packages/vue-language-server"
+  local pj = dir .. "/node_modules/typescript/package.json"
+  if vim.fn.filereadable(pj) == 0 then
+    return
+  end
+  local content = table.concat(vim.fn.readfile(pj), "\n")
+  local major = tonumber(content:match('"version"%s*:%s*"(%d+)'))
+  if not major or major < 6 then
+    return -- already on TS 5.x (or older) -> nothing to do
+  end
+  if notify then
+    vim.notify("vue_ls: pinning bundled TypeScript to 5.x …", vim.log.levels.INFO)
+  end
+  vim.fn.jobstart({ "npm", "install", "typescript@5", "--silent", "--no-audit", "--no-fund" }, {
+    cwd = dir,
+    on_exit = function(_, code)
+      vim.schedule(function()
+        if code == 0 then
+          vim.notify("vue_ls: TypeScript pinned to 5.x — restart Neovim.", vim.log.levels.INFO)
+        else
+          vim.notify("vue_ls: TS pin failed; run :VueFixTs manually.", vim.log.levels.WARN)
+        end
+      end)
+    end,
+  })
+end
+
+return {
+  -- Point vue_ls at a stable TS 5.x tsdk too (harmless; helps project TS resolution).
+  {
+    "neovim/nvim-lspconfig",
+    opts = function(_, opts)
+      local hits =
+        vim.fn.glob(vim.fn.stdpath("data") .. "/mason/packages/vtsls/**/node_modules/typescript/lib", true, true)
+      local tsdk = hits and hits[1]
+      if tsdk and tsdk ~= "" then
+        opts.servers = opts.servers or {}
+        opts.servers.vue_ls = opts.servers.vue_ls or {}
+        opts.servers.vue_ls.init_options = vim.tbl_deep_extend(
+          "force",
+          opts.servers.vue_ls.init_options or {},
+          { typescript = { tsdk = tsdk } }
+        )
+      end
+    end,
+  },
+
+  -- Register the self-heal (command + on startup + after any mason (re)install).
+  {
+    "mason-org/mason.nvim",
+    opts = function()
+      vim.api.nvim_create_user_command("VueFixTs", function()
+        pin_vue_typescript(true)
+      end, { desc = "Pin vue_ls's TypeScript to 5.x (fixes TS7 crash)" })
+
+      vim.api.nvim_create_autocmd("User", {
+        pattern = "VeryLazy",
+        callback = function()
+          pin_vue_typescript(false)
+        end,
+      })
+
+      pcall(function()
+        require("mason-registry"):on(
+          "package:install:success",
+          vim.schedule_wrap(function(pkg)
+            if pkg and pkg.name == "vue-language-server" then
+              vim.defer_fn(function()
+                pin_vue_typescript(false)
+              end, 500)
+            end
+          end)
+        )
+      end)
+    end,
+  },
+}
diff --git a/.config/nvim/lua/plugins/web.lua b/.config/nvim/lua/plugins/web.lua
new file mode 100644
index 0000000..974140a
--- /dev/null
+++ b/.config/nvim/lua/plugins/web.lua
@@ -0,0 +1,24 @@
+return {
+  -- CSS / SCSS / LESS language server (no dedicated LazyVim extra) + Tailwind tweak.
+  {
+    "neovim/nvim-lspconfig",
+    opts = {
+      servers = {
+        cssls = {}, -- Mason installs "css-lsp" automatically
+        tailwindcss = {
+          -- Enable Tailwind IntelliSense inside Blade files. Vue/JS/TS are included
+          -- by the tailwind extra already.
+          filetypes_include = { "blade" },
+        },
+      },
+    },
+  },
+  -- Treesitter parsers for stylesheets.
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function(_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      vim.list_extend(opts.ensure_installed, { "css", "scss" })
+    end,
+  },
+}
diff --git a/.config/nvim/stylua.toml b/.config/nvim/stylua.toml
new file mode 100644
index 0000000..6090f42
--- /dev/null
+++ b/.config/nvim/stylua.toml
@@ -0,0 +1,6 @@
+column_width = 120
+line_endings = "Unix"
+indent_type = "Spaces"
+indent_width = 2
+quote_style = "AutoPreferDouble"
+call_parentheses = "Always"
diff --git a/install.sh b/install.sh
old mode 100755
new mode 100644
index 8825168..f8d8370
--- a/install.sh
+++ b/install.sh
@@ -5,15 +5,21 @@ case "$OSTYPE" in
     echo "OSX detected. Installing..."
     cp .vimrc ~
     cp .zshrc ~
-    mkdir -p ~/.config/nvim/
-    cp .config/nvim/* ~/.config/nvim
+    mkdir -p ~/.config
+    if [ -e ~/.config/nvim ] || [ -L ~/.config/nvim ]; then
+      mv ~/.config/nvim ~/.config/nvim.backup.$(date +%s)
+    fi
+    cp -r .config/nvim ~/.config/
     echo "...finished!" ;;
   linux*)
     echo "Linux detected. Installing..."
     cp .vimrc ~
     cp .zshrc ~
-    mkdir -p ~/.config/nvim/
-    cp .config/nvim/* ~/.config/nvim
+    mkdir -p ~/.config
+    if [ -e ~/.config/nvim ] || [ -L ~/.config/nvim ]; then
+      mv ~/.config/nvim ~/.config/nvim.backup.$(date +%s)
+    fi
+    cp -r .config/nvim ~/.config/
     echo "...finished!" ;;
   *)
     echo "Please install manually for $OSTYPE" ;;

From 021bf23895b64609833da11c038b30619d98325a Mon Sep 17 00:00:00 2001
From: dajanto <dajanto.1337@hotmail.de>
Date: Sat, 11 Jul 2026 18:14:43 +0200
Subject: [PATCH 2/4] Fix me up later please

---
 .config/nvim/BEDIENUNG.md | 57 ++++++++++-----------------------------
 1 file changed, 14 insertions(+), 43 deletions(-)

diff --git a/.config/nvim/BEDIENUNG.md b/.config/nvim/BEDIENUNG.md
index 5387b82..fcd551e 100644
--- a/.config/nvim/BEDIENUNG.md
+++ b/.config/nvim/BEDIENUNG.md
@@ -1,10 +1,10 @@
 # Bedienungsanleitung — Neovim wie IntelliJ (Alltag)
 
-Diese Config ist **LazyVim + eine JetBrains-Tastenebene**. Ziel: du arbeitest mit deinen
-IntelliJ-Reflexen (Ctrl+B, Shift+F6, Alt+Enter, Ctrl+Shift+F …), bekommst aber Vim-Editing dazu.
+Diese Config ist **LazyVim + eine JetBrains-Tastenebene**: du arbeitest mit deinen IntelliJ-Reflexen
+(Ctrl+B, Shift+F6, Alt+Enter, Ctrl+Shift+F …).
 
 > **Wichtigster Trick:** Wenn du eine Taste vergisst, drück **`Leertaste`** (= Leader) und warte —
-> ein Menü (which-key) zeigt dir alle Befehle. So brauchst du nichts auswendig zu lernen.
+> ein Menü (which-key) zeigt dir alle Befehle.
 
 ---
 
@@ -13,42 +13,15 @@ IntelliJ-Reflexen (Ctrl+B, Shift+F6, Alt+Enter, Ctrl+Shift+F …), bekommst aber
 ```sh
 cd ~/mein/projekt
 nvim .            # öffnet Explorer im Projekt
-# oder direkt eine Datei:
 nvim app/Models/User.php
 ```
 
 Erststart lädt Plugins automatisch. Sprachserver/Formatter kommen über Mason (`:Mason`),
-Treesitter-Parser über `:TSInstall` bzw. automatisch beim Öffnen der jeweiligen Dateityp.
-
-**Speichern & Beenden** (die drei, die du sofort brauchst):
-- Speichern: `:w` + Enter (oder `Leertaste w`)
-- Beenden: `:q` + Enter — alles beenden: `:qa`
-- Speichern **und** beenden: `ZZ` (Großbuchstaben, im Normal-Modus)
-
----
-
-## 2. Vim-Grundlagen für IntelliJ-Umsteiger (2 Minuten)
-
-Neovim ist **modal**. Du bist meistens im **Normal-Modus** (Tasten = Befehle, nicht Text).
-
-| Modus | Wozu | Rein | Raus |
-|---|---|---|---|
-| **Normal** | Navigieren, Befehle | `Esc` | — |
-| **Insert** | Text tippen | `i` (vor Cursor), `a` (nach), `o` (neue Zeile) | `Esc` |
-| **Visual** | Markieren | `v` (Zeichen), `V` (Zeile), `Ctrl+v` (Block) | `Esc` |
-
-**Das absolute Minimum an Motions** (im Normal-Modus):
-- Bewegen: `h j k l` (←↓↑→), Wort `w`/`b`, Zeilenanfang `^`, Zeilenende `$`, Datei `gg`/`G`
-- Löschen/Ändern: `dd` (Zeile löschen), `ciw` (Wort ersetzen), `x` (Zeichen), `u` (undo), `Ctrl+r` (redo)
-- Kopieren/Einfügen: `yy` (Zeile yanken), `p` (einfügen)
-- **`.`** wiederholt die letzte Änderung — extrem nützlich.
-
-Du kannst die JetBrains-Tasten unten nutzen, ohne Vim zu „können" — aber diese Handvoll Motions
-macht dich sofort schneller.
+Treesitter-Parser automatisch beim Öffnen des jeweiligen Dateityps.
 
 ---
 
-## 3. Der typische Arbeitstag
+## 2. Der typische Arbeitstag
 
 ### Dateien & Suche
 | Was | Taste (JetBrains) | Alternative (Leader) |
@@ -62,7 +35,7 @@ macht dich sofort schneller.
 | Projekt-Explorer (Tree) | `Alt+1` | `Leertaste e` |
 | Ersetzen im Projekt | `Ctrl+Shift+R` | — |
 
-> In der Suchliste: mit `Ctrl+j`/`Ctrl+k` (oder ↑↓) wählen, `Enter` öffnen, `Ctrl+v`/`Ctrl+s` in
+> In der Auswahlliste: mit `Ctrl+j`/`Ctrl+k` (oder ↑↓) wählen, `Enter` öffnen, `Ctrl+v`/`Ctrl+s` in
 > vertikalem/horizontalem Split öffnen, `Esc` schließen.
 
 ### Im Code navigieren
@@ -95,11 +68,10 @@ macht dich sofort schneller.
 ### Git
 - **lazygit** (volle Git-UI): `Leertaste g g`
 - Zeilen-Blame: `Leertaste g b` · Datei-History: `Leertaste g f`
-- Hunk vor/zurück: `]h` / `[h` · Hunk stagen: im Gitsigns-Menü `Leertaste g h`
+- Hunk vor/zurück: `]h` / `[h`
 
 ### Terminal
 - Terminal auf/zu: `Alt+F12`
-- Aus dem Terminal zurück in Normal: `Ctrl+\` `Ctrl+n`
 
 ### Fenster, Tabs & Buffer
 | Was | Taste |
@@ -108,11 +80,10 @@ macht dich sofort schneller.
 | Vertikal/horizontal teilen | `Leertaste \|` / `Leertaste -` |
 | Nächster/voriger Buffer (Tab) | `Shift+l` / `Shift+h` |
 | Buffer schließen | `Leertaste b d` |
-| Suche-Highlight weg | `Esc` (oder `F9`) |
 
 ---
 
-## 4. Pro Sprache/Framework
+## 3. Pro Sprache/Framework
 
 ### PHP / Laravel
 - **Intelephense** liefert Completion, Go-to-Definition, Hover, Diagnostics.
@@ -141,19 +112,19 @@ macht dich sofort schneller.
 
 ---
 
-## 5. Wenn eine Taste nicht geht (Terminal-Protokoll)
+## 4. Wenn eine Taste nicht geht (Terminal-Protokoll)
 
 Chords wie `Ctrl+.`, `Ctrl+Shift+F`, `Ctrl+Alt+L` brauchen das **kitty keyboard protocol**:
 - **Ghostty** (macOS): läuft ✓
 - **Windows Terminal** (WSL): ab **v1.25** ✓ — sonst nimm die `Leertaste`-Alternativen aus den Tabellen.
 
-Schnelltest: `nvim` → `i` (Insert) → `Ctrl+v` → dann `Ctrl+.` drücken.
+Schnelltest: `nvim` → `i` → `Ctrl+v` → dann `Ctrl+.` drücken.
 - Erscheint etwas wie `^[[46;5u` → Protokoll aktiv ✓
-- Kommt nur `.` → Terminal aktualisieren/wechseln, bis dahin `Leertaste`-Wege nutzen.
+- Kommt nur `.` → Terminal aktualisieren/wechseln, bis dahin die `Leertaste`-Wege nutzen.
 
 ---
 
-## 6. Wartung & Hilfe
+## 5. Wartung & Hilfe
 
 | Befehl | Zweck |
 |---|---|
@@ -168,10 +139,10 @@ Sprachen in `lua/config/lazy.lua` (oder `:LazyExtras`), eigene Plugins in `lua/p
 
 ---
 
-## 7. Aktivieren (fest installieren)
+## 6. Aktivieren (fest installieren)
 
 Bisher läuft alles isoliert testbar über `NVIM_APPNAME=nvim-jb nvim` (verändert deine bestehende
-`~/.config/nvim` nicht). Wenn du es zum Standard machen willst:
+`~/.config/nvim` nicht). Zum Standard machen:
 
 ```sh
 cd ~/github/dotfiles

From 5eea2c375a1d5fc445095dc1615b756b3ea9ea9d Mon Sep 17 00:00:00 2001
From: dajanto <dajanto.1337@hotmail.de>
Date: Sat, 11 Jul 2026 18:31:08 +0200
Subject: [PATCH 3/4] Fix me up later please

---
 .config/nvim/lazy-lock.json              |  2 +-
 .config/nvim/lua/config/lazy.lua         |  2 +-
 .config/nvim/lua/plugins/colorscheme.lua | 18 ++++++++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index c63ca4c..9c994e4 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -8,7 +8,7 @@
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
   "gitsigns.nvim": { "branch": "main", "commit": "eb60cc7b94c46005237fd34170d76f3a089a90aa" },
   "grug-far.nvim": { "branch": "main", "commit": "beb2ce490b72048c587e8a3d919cba1b4608bb04" },
-  "gruvbox.nvim": { "branch": "main", "commit": "154eb5ff5b96d0641307113fa385eaf0d36d9796" },
+  "jb.nvim": { "branch": "main", "commit": "1cd3e9aeb81cd4b60b7b094a7900e6fc39d7dd79" },
   "laravel.nvim": { "branch": "main", "commit": "261bbd12aaf0ebc589ed7c1137071b0141f1c14c" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua
index 893395f..78edeae 100644
--- a/.config/nvim/lua/config/lazy.lua
+++ b/.config/nvim/lua/config/lazy.lua
@@ -43,7 +43,7 @@ require("lazy").setup({
     { import = "plugins" },
   },
   defaults = { lazy = false, version = false },
-  install = { colorscheme = { "gruvbox", "tokyonight", "habamax" } },
+  install = { colorscheme = { "jb", "tokyonight", "habamax" } },
   checker = { enabled = true, notify = false },
   performance = {
     rtp = {
diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua
index 290762d..57cdb11 100644
--- a/.config/nvim/lua/plugins/colorscheme.lua
+++ b/.config/nvim/lua/plugins/colorscheme.lua
@@ -1,11 +1,21 @@
 return {
-  -- Keep the Gruvbox look from the old setup. Swap `colorscheme` below for
-  -- "tokyonight" (LazyVim default) or add a Darcula theme for a PhpStorm vibe.
-  { "ellisonleao/gruvbox.nvim", lazy = true },
+  -- JetBrains colorscheme (Darcula & co.) -- matches the IntelliJ look.
+  -- https://github.com/nickkadutskyi/jb.nvim
+  {
+    "nickkadutskyi/jb.nvim",
+    lazy = false,
+    priority = 1000,
+    opts = {
+      -- transparent = true,  -- uncomment for a transparent background
+      -- colorblind = false,  -- colorblind-friendly light palette
+    },
+  },
+
+  -- Make jb the active colorscheme. Light/dark follows `:set background=light|dark`.
   {
     "LazyVim/LazyVim",
     opts = {
-      colorscheme = "gruvbox",
+      colorscheme = "jb",
     },
   },
 }

From 44b1108475fa263318a2531324c7acdeb096d5ec Mon Sep 17 00:00:00 2001
From: dajanto <dajanto.1337@hotmail.de>
Date: Sat, 11 Jul 2026 19:07:02 +0200
Subject: [PATCH 4/4] g

---
 .config/nvim/BEDIENUNG.md             | 49 ++++++++++++++-------------
 .config/nvim/README.md                | 12 ++++---
 .config/nvim/lua/config/keymaps.lua   | 11 +++---
 .config/nvim/lua/config/lazy.lua      |  6 ++--
 .config/nvim/lua/config/options.lua   |  6 ++++
 .config/nvim/lua/plugins/whichkey.lua | 15 ++++++++
 6 files changed, 62 insertions(+), 37 deletions(-)
 create mode 100644 .config/nvim/lua/plugins/whichkey.lua

diff --git a/.config/nvim/BEDIENUNG.md b/.config/nvim/BEDIENUNG.md
index fcd551e..22b9ff0 100644
--- a/.config/nvim/BEDIENUNG.md
+++ b/.config/nvim/BEDIENUNG.md
@@ -3,8 +3,8 @@
 Diese Config ist **LazyVim + eine JetBrains-Tastenebene**: du arbeitest mit deinen IntelliJ-Reflexen
 (Ctrl+B, Shift+F6, Alt+Enter, Ctrl+Shift+F …).
 
-> **Wichtigster Trick:** Wenn du eine Taste vergisst, drück **`Leertaste`** (= Leader) und warte —
-> ein Menü (which-key) zeigt dir alle Befehle.
+> **Zwei Tasten zum Merken:** **`Leertaste`** = Suche in der Datei (`/`, wie in deiner `.vimrc`).
+> **`q`** = Leader (Befehlstaste): drück `q` und warte — das which-key-Menü zeigt dir alle Befehle.
 
 ---
 
@@ -24,15 +24,16 @@ Treesitter-Parser automatisch beim Öffnen des jeweiligen Dateityps.
 ## 2. Der typische Arbeitstag
 
 ### Dateien & Suche
-| Was | Taste (JetBrains) | Alternative (Leader) |
+| Was | Taste (JetBrains) | Alternative (Leader `q`) |
 |---|---|---|
-| Search Everywhere | `Leertaste Leertaste` | — |
-| Datei öffnen (Go to File) | `Ctrl+Shift+N` | `Leertaste f f` |
-| Im Projekt suchen (Find in Path) | `Ctrl+Shift+F` | `Leertaste /` |
-| Zuletzt benutzte Dateien | `Ctrl+E` | `Leertaste f r` |
-| Symbol in Datei (Go to Class) | `Ctrl+N` | `Leertaste s s` |
-| Aktion/Befehl finden | `Ctrl+Shift+A` | `Leertaste :` |
-| Projekt-Explorer (Tree) | `Alt+1` | `Leertaste e` |
+| In Datei suchen | `Leertaste` | — |
+| Search Everywhere | `q` dann `Leertaste` | — |
+| Datei öffnen (Go to File) | `Ctrl+Shift+N` | `q f f` |
+| Im Projekt suchen (Find in Path) | `Ctrl+Shift+F` | `q /` |
+| Zuletzt benutzte Dateien | `Ctrl+E` | `q f r` |
+| Symbol in Datei (Go to Class) | `Ctrl+N` | `q s s` |
+| Aktion/Befehl finden | `Ctrl+Shift+A` | `q :` |
+| Projekt-Explorer (Tree) | `Alt+1` | `q e` |
 | Ersetzen im Projekt | `Ctrl+Shift+R` | — |
 
 > In der Auswahlliste: mit `Ctrl+j`/`Ctrl+k` (oder ↑↓) wählen, `Enter` öffnen, `Ctrl+v`/`Ctrl+s` in
@@ -51,9 +52,9 @@ Treesitter-Parser automatisch beim Öffnen des jeweiligen Dateityps.
 ### Code ändern & refactoren
 | Was | Taste | |
 |---|---|---|
-| Kontextaktionen / Quick Fix | `Alt+Enter` oder `Ctrl+.` | (auch `Leertaste c a`) |
-| Umbenennen (Rename) | `Shift+F6` | (auch `Leertaste c r`) |
-| Code formatieren | `Ctrl+Alt+L` | (auch `Leertaste c f`) |
+| Kontextaktionen / Quick Fix | `Alt+Enter` oder `Ctrl+.` | (auch `q c a`) |
+| Umbenennen (Rename) | `Shift+F6` | (auch `q c r`) |
+| Code formatieren | `Ctrl+Alt+L` | (auch `q c f`) |
 | Zeile aus-/einkommentieren | `Ctrl+/` | |
 | Zeile verschieben | `Alt+Shift+↑` / `Alt+Shift+↓` | |
 | Quick-Doku (Hover) | `Ctrl+Q` oder `K` | |
@@ -61,13 +62,13 @@ Treesitter-Parser automatisch beim Öffnen des jeweiligen Dateityps.
 | Autovervollständigung | tippen → Liste; `Enter` bestätigt, `Ctrl+Space` erzwingt | |
 
 ### Diagnose / Fehler
-- Fehlerliste (Trouble): `Leertaste x x`
-- Fehler unter Cursor anzeigen: `Leertaste c d`
+- Fehlerliste (Trouble): `q x x`
+- Fehler unter Cursor anzeigen: `q c d`
 - Springen: `]d` / `[d` (Diagnose), `]e` / `[e` (nur Fehler)
 
 ### Git
-- **lazygit** (volle Git-UI): `Leertaste g g`
-- Zeilen-Blame: `Leertaste g b` · Datei-History: `Leertaste g f`
+- **lazygit** (volle Git-UI): `q g g`
+- Zeilen-Blame: `q g b` · Datei-History: `q g f`
 - Hunk vor/zurück: `]h` / `[h`
 
 ### Terminal
@@ -77,9 +78,9 @@ Treesitter-Parser automatisch beim Öffnen des jeweiligen Dateityps.
 | Was | Taste |
 |---|---|
 | Zwischen Splits springen | `Ctrl+h/j/k/l` |
-| Vertikal/horizontal teilen | `Leertaste \|` / `Leertaste -` |
+| Vertikal/horizontal teilen | `q \|` / `q -` |
 | Nächster/voriger Buffer (Tab) | `Shift+l` / `Shift+h` |
-| Buffer schließen | `Leertaste b d` |
+| Buffer schließen | `q b d` |
 
 ---
 
@@ -92,7 +93,7 @@ Treesitter-Parser automatisch beim Öffnen des jeweiligen Dateityps.
 - **Formatieren** mit **Laravel Pint** (`Ctrl+Alt+L`) — legt eine `pint.json` ins Projekt, dann wird
   euer Team-Standard genutzt. Braucht ein `php`-Binary (`brew install php composer`).
 - **Blade** (`*.blade.php`): eigenes Highlighting (Treesitter), Format via `blade-formatter`.
-- **Artisan/Routes/Views** über `laravel.nvim`: `Leertaste L` (Menü), z.B. `Leertaste L a` (Artisan).
+- **Artisan/Routes/Views** über `laravel.nvim`: `q L` (Menü), z.B. `q L a` (Artisan).
 
 ### Vue / Nuxt
 - `.vue`-Dateien: **vtsls** (TypeScript-Intelligenz inkl. Komponenten) + **vue_ls** (Template/SFC).
@@ -116,11 +117,11 @@ Treesitter-Parser automatisch beim Öffnen des jeweiligen Dateityps.
 
 Chords wie `Ctrl+.`, `Ctrl+Shift+F`, `Ctrl+Alt+L` brauchen das **kitty keyboard protocol**:
 - **Ghostty** (macOS): läuft ✓
-- **Windows Terminal** (WSL): ab **v1.25** ✓ — sonst nimm die `Leertaste`-Alternativen aus den Tabellen.
+- **Windows Terminal** (WSL): ab **v1.25** ✓ — sonst nimm die `q`-Alternativen aus den Tabellen.
 
 Schnelltest: `nvim` → `i` → `Ctrl+v` → dann `Ctrl+.` drücken.
 - Erscheint etwas wie `^[[46;5u` → Protokoll aktiv ✓
-- Kommt nur `.` → Terminal aktualisieren/wechseln, bis dahin die `Leertaste`-Wege nutzen.
+- Kommt nur `.` → Terminal aktualisieren/wechseln, bis dahin die `q`-Wege nutzen.
 
 ---
 
@@ -132,9 +133,9 @@ Schnelltest: `nvim` → `i` → `Ctrl+v` → dann `Ctrl+.` drücken.
 | `:Mason` | LSP-Server & Formatter installieren/prüfen |
 | `:checkhealth` | Diagnose der ganzen Installation |
 | `:LspInfo` | Welche Sprachserver hängen am aktuellen Buffer? |
-| `Leertaste s k` | Alle Tastenkürzel durchsuchen |
+| `q s k` | Alle Tastenkürzel durchsuchen |
 
-**Anpassen:** Tasten in `lua/config/keymaps.lua`, Optionen in `lua/config/options.lua`,
+**Anpassen:** Tasten in `lua/config/keymaps.lua`, Optionen (inkl. Leader) in `lua/config/options.lua`,
 Sprachen in `lua/config/lazy.lua` (oder `:LazyExtras`), eigene Plugins in `lua/plugins/*.lua`.
 
 ---
diff --git a/.config/nvim/README.md b/.config/nvim/README.md
index fcbfb7a..17fd714 100644
--- a/.config/nvim/README.md
+++ b/.config/nvim/README.md
@@ -15,7 +15,7 @@ nur auf Tastenkombis.
 
 **Terminal:** Chords wie `Ctrl+.`, `Ctrl+Shift+F`, `Ctrl+Alt+L` brauchen das **kitty keyboard protocol**.
 - **Ghostty** (macOS): standardmäßig aktiv ✓
-- **Windows Terminal** (WSL): ab **v1.25** (März 2026) ✓ — vorher greifen die `<leader>`-Fallbacks.
+- **Windows Terminal** (WSL): ab **v1.25** (März 2026) ✓ — vorher greifen die `q`-Fallbacks (Leader).
 
 ## Aktivierung
 
@@ -34,11 +34,13 @@ Mason (`:Mason`), Treesitter-Parser über `:TSInstall`.
 
 ## JetBrains-Tastenbelegung (Windows/Linux-Keymap, Ctrl-basiert)
 
+**Leader = `q`**, **`Leertaste` = Suche** (`/`, wie in der alten `.vimrc`), Makro-Aufnahme ist aus.
+
 `[proto]` = braucht kitty-Protokoll (Ghostty / Windows Terminal ≥ 1.25).
 
 | Aktion | Shortcut | | Aktion | Shortcut |
 |---|---|---|---|---|
-| Search Everywhere | `Space Space` | | Go to Definition | `Ctrl+B` |
+| Search Everywhere | `q` `Space` | | Go to Definition | `Ctrl+B` |
 | Find in Path (grep) | `Ctrl+Shift+F` `[proto]` | | Go to Implementation | `Ctrl+Alt+B` `[proto]` |
 | Go to File | `Ctrl+Shift+N` `[proto]` | | Go to Type Definition | `Ctrl+Shift+B` `[proto]` |
 | Go to Symbol (Datei) | `Ctrl+N` | | Find Usages | `Alt+F7` |
@@ -48,16 +50,16 @@ Mason (`:Mason`), Treesitter-Parser über `:TSInstall`.
 | Reformat Code | `Ctrl+Alt+L` `[proto]` | | Parameter Info | `Ctrl+P` (normal mode) |
 | Comment Line | `Ctrl+/` | | Navigate Back / Forward | `Ctrl+Alt+←/→` `[proto]` |
 | Replace in Path | `Ctrl+Shift+R` `[proto]` | | Move Line Up/Down | `Alt+Shift+↑/↓` |
-| Terminal | `Alt+F12` | | Laravel-Menü | `Space L` |
+| Terminal | `Alt+F12` | | Laravel-Menü | `q L` |
 
 **Absichtlich Vim-typisch belassen** (nicht auf JetBrains gebogen): `Ctrl+R` = Redo, `Ctrl+W` = Fenster,
-`Ctrl+D/U` = Scroll, `Ctrl+V` = Visual-Block. Alles ist zusätzlich über `<space>` (which-key) erreichbar.
+`Ctrl+D/U` = Scroll, `Ctrl+V` = Visual-Block. Alles ist zusätzlich über `q` (which-key) erreichbar.
 
 ## Sprachen & Frameworks
 
 - **PHP**: intelephense (Completion/Navigation). *Rename & Code-Actions brauchen Intelephense Premium
   oder wechsle in `lua/config/lazy.lua` auf `vim.g.lazyvim_php_lsp = "phpactor"` (kostenlos).*
-- **Laravel/Blade**: Blade-Filetype + Treesitter-Grammar + `blade-formatter`; `laravel.nvim` unter `Space L`.
+- **Laravel/Blade**: Blade-Filetype + Treesitter-Grammar + `blade-formatter`; `laravel.nvim` unter `q L`.
 - **Vue/Nuxt**: vue_ls + vtsls (`<script setup lang="ts">` inkl. Nuxt-Auto-Imports). `vue_ls` zieht sonst
   die kaputte TypeScript-7-Preview — `lua/plugins/vue.lua` pinnt seine TS automatisch auf 5.x (bzw. `:VueFixTs`).
 - **TypeScript/JavaScript**: vtsls; ESLint + Prettier.
diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
index db21b43..8d59707 100644
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -134,8 +134,9 @@ map("n", "<F5>", '"=strftime("%c")<cr>P', { desc = "Insert date/time" })
 map("n", "<F6>", ":s/", { desc = "Substitute (line)" })
 map("n", "<F7>", ":%s/", { desc = "Substitute (file)" })
 
--- NOTE: intentionally NOT migrated (they conflict with the new space-leader /
--- LazyVim, or are rarely useful):
---  * `<space>` -> `/`   (space is now the leader key; use `/` to search)
---  * leader Y/X leetcode copy helpers (old leader was `q`)
---  * Q/q macro swap (LazyVim uses `q` to close special windows)
+-- Restored from the old .vimrc: leader is "q" (set in config/options.lua), so Space
+-- is free for search again. which-key intercepts `q` as a trigger (lua/plugins/whichkey.lua),
+-- so pressing `q` opens the menu instead of recording a macro; Q (replay) is off too.
+map({ "n", "x", "o" }, "<Space>", "/", { desc = "Search (like .vimrc)" })
+map("n", "Q", "<Nop>", { desc = "Macro replay off" })
+-- (Not migrated: the leader Y/X leetcode-copy helpers -- niche.)
diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua
index 78edeae..ec6a031 100644
--- a/.config/nvim/lua/config/lazy.lua
+++ b/.config/nvim/lua/config/lazy.lua
@@ -1,6 +1,6 @@
--- Set leader keys and LazyVim toggles BEFORE lazy starts, so plugins/extras
--- pick them up correctly.
-vim.g.mapleader = " "
+-- Set leader keys and LazyVim toggles BEFORE lazy starts, so plugin `keys=` specs
+-- pick them up. (Also set in config/options.lua, which overrides LazyVim's default.)
+vim.g.mapleader = "q"
 vim.g.maplocalleader = "\\"
 
 -- The LazyVim `lang.php` extra defaults to phpactor. Use Intelephense instead
diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua
index f1c0418..0acb42a 100644
--- a/.config/nvim/lua/config/options.lua
+++ b/.config/nvim/lua/config/options.lua
@@ -2,6 +2,12 @@
 -- ignorecase+smartcase, termguicolors, ...). Here we only add personal
 -- preferences carried over from the old .vimrc.
 
+-- Leader = "q" like the old .vimrc, so Space is free for search (see keymaps.lua).
+-- Must live here: LazyVim loads its own options (mapleader = Space) first and the
+-- user's options.lua after, so this is where the override actually wins.
+vim.g.mapleader = "q"
+vim.g.maplocalleader = "\\"
+
 local opt = vim.opt
 
 -- German + English spell checking (toggle with F2/F3, see keymaps.lua). Spell is
diff --git a/.config/nvim/lua/plugins/whichkey.lua b/.config/nvim/lua/plugins/whichkey.lua
new file mode 100644
index 0000000..86602de
--- /dev/null
+++ b/.config/nvim/lua/plugins/whichkey.lua
@@ -0,0 +1,15 @@
+return {
+  -- Our leader is `q`. which-key's default `<auto>` triggers deliberately skip `q`
+  -- (to preserve macro recording), so pressing `q` would record a macro instead of
+  -- opening the menu. Registering `q` as an explicit trigger makes which-key intercept
+  -- it (per buffer): `q` opens the menu and can't start a macro, while `q…` combos work.
+  {
+    "folke/which-key.nvim",
+    opts = {
+      triggers = {
+        { "<auto>", mode = "nxso" },
+        { "q", mode = "n" },
+      },
+    },
+  },
+}