From 04065422203190d891c06fd96931a7bfe74fc066 Mon Sep 17 00:00:00 2001
From: Martin <git@pander-on.de>
Date: Wed, 16 Jul 2025 19:08:58 +0200
Subject: [PATCH] Merge main

---
 nix/user/nvim.nix | 26 +++++++++++---------------
 nvim/keymaps.lua  |  9 +++++++++
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/nix/user/nvim.nix b/nix/user/nvim.nix
index 0b478f2..1fa0df8 100644
--- a/nix/user/nvim.nix
+++ b/nix/user/nvim.nix
@@ -8,17 +8,13 @@
     vimAlias = true;
 
     plugins = with pkgs.vimPlugins; [
-      aerial-nvim
-      zen-mode-nvim
-      # vim-commentary
+      vim-repeat
+      vim-surround
       ts-comments-nvim
       vim-fugitive
       gitsigns-nvim
-      vim-repeat
-      vim-surround
       nvim-tree-lua
       targets-vim
-      # delimitMate
       mini-pairs
       mini-align
       mini-bracketed
@@ -29,12 +25,9 @@
       trouble-nvim
       conform-nvim
       nvim-lint
-      todo-comments-nvim
-      # vim-startify
       promise-async
       nvim-ufo
       vim-windowswap
-      vim-nix
       plenary-nvim
       telescope-nvim
       telescope-fzf-native-nvim
@@ -55,13 +48,7 @@
       lspkind-nvim
       copilot-lua
       copilot-cmp
-      image-nvim
-      img-clip-nvim
-      markdown-preview-nvim
-      vim-markdown
-      plantuml-syntax
       bullets-vim
-      obsidian-nvim
       nvim-dap
       nvim-nio
       nvim-dap-ui
@@ -69,6 +56,15 @@
       nvim-dap-go
       nvim-dap-python
       nvim-dap-lldb
+      todo-comments-nvim
+      vim-markdown
+      zen-mode-nvim
+      plantuml-syntax
+      obsidian-nvim
+      markdown-preview-nvim
+      image-nvim
+      img-clip-nvim
+      vim-nix
       (nvim-treesitter.withPlugins (p: [ p.awk p.bash p.c p.c_sharp p.cpp p.css p.diff p.dockerfile p.doxygen p.git_config p.gitcommit p.go p.gomod p.gosum p.gotmpl p.helm p.haskell p.html p.http p.java p.javascript p.json p.latex p.lua p.markdown p.markdown_inline p.matlab p.nix p.printf p.python p.regex p.rust p.sql p.strace p.supercollider p.svelte p.swift p.terraform p.tmux p.toml p.typescript p.vim p.xml p.yaml p.zig ]))
     ];
 
diff --git a/nvim/keymaps.lua b/nvim/keymaps.lua
index 28cf9ac..ce7c559 100644
--- a/nvim/keymaps.lua
+++ b/nvim/keymaps.lua
@@ -50,6 +50,15 @@ vim.keymap.set('n', '<leader>cl', '<cmd>Trouble lsp toggle focus=true win.positi
 vim.keymap.set('n', '<leader>cd', '<cmd>Trouble diagnostics toggle focus=true win.position=bottom<cr>')
 vim.keymap.set('n', '<leader>cq', '<cmd>Trouble quickfix toggle focus=true win.position=bottom<cr>')
 vim.keymap.set('n', '<leader>cr', vim.lsp.buf.rename, { desc = 'LSP Rename' })
+vim.keymap.set('n', '<leader>ct', vim.lsp.buf.type_definition, { desc = 'LSP Type Definition' })
+vim.keymap.set('n', '<leader>cgd', vim.lsp.buf.definition, { desc = 'LSP Definition' })
+vim.keymap.set('n', '<leader>cgD', vim.lsp.buf.declaration, { desc = 'LSP Declaration' })
+vim.keymap.set('n', '<leader>cwa', vim.lsp.buf.add_workspace_folder, { desc = 'LSP Add Workspace Folder' })
+vim.keymap.set('n', '<leader>cwl', vim.lsp.buf.list_workspace_folders, { desc = 'LSP List Workspace Folders' })
+vim.keymap.set('n', '<leader>cwr', vim.lsp.buf.remove_workspace_folder, { desc = 'LSP Remove Workspace Folder' })
+vim.keymap.set('n', '<leader>cws', vim.lsp.buf.workspace_symbol, { desc = 'LSP Workspace Symbol' })
+vim.keymap.set('n', '<leader>ch', vim.lsp.buf.hover, { desc = 'LSP Hover' })
+vim.keymap.set('n', '<leader>cH', vim.lsp.buf.signature_help, { desc = 'LSP Signature Help' })
 vim.keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, { desc = 'LSP Code Action' })
 vim.keymap.set('n', '<leader>cde', ToggleDiagnostics, { desc = 'Toggle Diagnostics' })