From 46b2c33e7b34e83119b8d21ac6ddd9cc78c18883 Mon Sep 17 00:00:00 2001
From: Martin <git@pander-on.de>
Date: Wed, 16 Jul 2025 20:16:14 +0200
Subject: [PATCH] Merge main

---
 nix/user/nvim.nix |  1 +
 nvim/filetype.lua |  2 +-
 nvim/keymaps.lua  | 16 +++-------------
 nvim/plugins.lua  | 21 ++++++++++++++++++---
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/nix/user/nvim.nix b/nix/user/nvim.nix
index 1fa0df8..c5932cf 100644
--- a/nix/user/nvim.nix
+++ b/nix/user/nvim.nix
@@ -31,6 +31,7 @@
       plenary-nvim
       telescope-nvim
       telescope-fzf-native-nvim
+      telescope-ui-select-nvim
       yanky-nvim
       lualine-nvim
       undotree
diff --git a/nvim/filetype.lua b/nvim/filetype.lua
index 7ffe874..d855162 100644
--- a/nvim/filetype.lua
+++ b/nvim/filetype.lua
@@ -22,7 +22,7 @@ vim.api.nvim_create_autocmd('FileType', {
 -- require('dap-python').setup()
 -- require('dap-go').setup()
 
-lspconfig.pyright.setup({ capabilities = capabilities })
+lspconfig.ruff.setup({ capabilities = capabilities })
 lspconfig.gopls.setup({ capabilities = capabilities })
 lspconfig.marksman.setup({ capabilities = capabilities })
 lspconfig.rust_analyzer.setup({
diff --git a/nvim/keymaps.lua b/nvim/keymaps.lua
index ce7c559..924321c 100644
--- a/nvim/keymaps.lua
+++ b/nvim/keymaps.lua
@@ -1,15 +1,9 @@
 vim.g.mapleader = " "
 
 -- Navigation
-vim.keymap.set('n', 'j', 'gj', {})
-vim.keymap.set('n', 'k', 'gk', {})
-vim.keymap.set('v', 'j', 'gj', {})
-vim.keymap.set('v', 'k', 'gk', {})
+vim.keymap.set({'n', 'v'}, 'j', 'gj', {})
+vim.keymap.set({'n', 'v'}, 'k', 'gk', {})
 
--- vim.keymap.set('n', '<C-h>', '<C-w>h', {})
--- vim.keymap.set('n', '<C-j>', '<C-w>j', {})
--- vim.keymap.set('n', '<C-k>', '<C-w>k', {})
--- vim.keymap.set('n', '<C-l>', '<C-w>l', {})
 vim.keymap.set('n', '<C-M-h>', '<C-w>h', {})
 vim.keymap.set('n', '<C-M-j>', '<C-w>j', {})
 vim.keymap.set('n', '<C-M-k>', '<C-w>k', {})
@@ -28,7 +22,6 @@ vim.keymap.set('t', '<C-M-U>', '<C-\\><C-n><C-w>5+', {})
 vim.keymap.set('t', '<C-M-I>', '<C-\\><C-n><C-w>5-', {})
 vim.keymap.set('t', '<C-M-O>', '<C-\\><C-n><C-w>5>', {})
 
-
 vim.keymap.set('n', '<leader>s', ':call WindowSwap#EasyWindowSwap()<CR>', {})
 
 -- Convenience
@@ -51,6 +44,7 @@ vim.keymap.set('n', '<leader>cd', '<cmd>Trouble diagnostics toggle focus=true wi
 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>cf', require("conform").format, { desc = 'LSP Format' })
 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' })
@@ -62,8 +56,6 @@ vim.keymap.set('n', '<leader>cH', vim.lsp.buf.signature_help, { desc = 'LSP Sign
 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' })
 
-
-
 -- Yanky
 vim.keymap.set({"n","x"}, "p", "<Plug>(YankyPutAfter)")
 vim.keymap.set({"n","x"}, "P", "<Plug>(YankyPutBefore)")
@@ -100,5 +92,3 @@ vim.keymap.set('n', "<F11>", function() require("dap").step_into() end)
 vim.keymap.set('n', "<F10>", function() require("dap").step_over() end)
 vim.keymap.set('n', "<F12>", function() require("dap").step_out() end)
 
--- nnoremap <silent> <leader>t :CtrlPBufTagAll<CR>
--- nnoremap <silent> <leader>T :TagbarToggle<CR>
diff --git a/nvim/plugins.lua b/nvim/plugins.lua
index 975db71..b1123ee 100644
--- a/nvim/plugins.lua
+++ b/nvim/plugins.lua
@@ -134,6 +134,15 @@ require("yanky").setup({
   },
 })
 
+require("telescope").setup {
+  extensions = {
+    ["ui-select"] = {
+      require("telescope.themes").get_dropdown {
+      }
+    }
+  }
+}
+require("telescope").load_extension("ui-select")
 require("telescope").load_extension("yank_history")
 
 require'nvim-treesitter.configs'.setup {
@@ -280,10 +289,16 @@ require('gitsigns').setup {
 }
 
 require("conform").setup({
-  python = {"black"},
-  rust = {"rustfmt"},
-  go = {"gofmt"},
+  formatters_by_ft = {
+    python = {"ruff_fix", "ruff_format", "ruff_organize_imports", lsp_format = "fallback"},
+    rust = {"rustfmt", lsp_format = "fallback"},
+    go = {"gofmt", "goimports", lsp_format = "fallback"},
+    lua = { "stylua", lsp_format = "fallback"},
+  },
 })
+require('lint').linters_by_ft = {
+  markdown = {'vale'},
+}
 require("trouble").setup()
 require("todo-comments").setup()