cleanup
This commit is contained in:
Alexander Gehrke
parent
daa9394fd5
commit
41d779e3c7
14
.editorconfig
Normal file
14
.editorconfig
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
end_of_line = lf
|
||||||
|
insert_final_newline = true
|
||||||
|
charset = utf-8
|
||||||
|
|
||||||
|
[*.{lua,vim}]
|
||||||
|
indent_size = tab
|
||||||
|
indent_style = tab
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
|
[*.{lua}]
|
||||||
|
max_line_length = 140
|
||||||
45
init.lua
45
init.lua
|
|
@ -20,7 +20,7 @@ vim.opt.rtp:prepend(lazypath)
|
||||||
require("lazy").setup("plugins", {
|
require("lazy").setup("plugins", {
|
||||||
dev = {
|
dev = {
|
||||||
path = "~/projects/nvim/",
|
path = "~/projects/nvim/",
|
||||||
patterns = {"crater2150"},
|
patterns = { "crater2150" },
|
||||||
fallback = true
|
fallback = true
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
@ -45,6 +45,9 @@ vim.opt.shell = "/bin/zsh"
|
||||||
vim.opt.ignorecase = true
|
vim.opt.ignorecase = true
|
||||||
vim.opt.smartcase = true
|
vim.opt.smartcase = true
|
||||||
vim.opt.inccommand = "split"
|
vim.opt.inccommand = "split"
|
||||||
|
vim.opt.listchars = "tab:⇥\\ ,trail:-,nbsp:+,lead:␣"
|
||||||
|
vim.opt.list = true
|
||||||
|
vim.cmd [[hi link Whitespace Comment]]
|
||||||
|
|
||||||
vim.opt.wildmode = { "list:longest", "list:full" }
|
vim.opt.wildmode = { "list:longest", "list:full" }
|
||||||
vim.opt.wildignore = { "*.so", "*.swp", "*.zip", "*.o" }
|
vim.opt.wildignore = { "*.so", "*.swp", "*.zip", "*.o" }
|
||||||
|
|
@ -76,35 +79,35 @@ vim.g.tex_flavor = 'latex'
|
||||||
|
|
||||||
local key = vim.keymap.set
|
local key = vim.keymap.set
|
||||||
|
|
||||||
key('n', '<space>', 'za', { desc = 'toggle fold' })
|
key('n', '<space>', 'za', { desc = 'toggle fold' })
|
||||||
key('v', '.', '<cmd>normal .<CR>', { desc = 'repeat last command in visual mode' })
|
key('v', '.', '<cmd>normal .<CR>', { desc = 'repeat last command in visual mode' })
|
||||||
key('n', 'cy', '"*y', { desc = 'copy to system clipboard' })
|
key('n', 'cy', '"*y', { desc = 'copy to system clipboard' })
|
||||||
|
|
||||||
key('t', '<C-q>', '<C-\\><C-n>', { desc = 'exit terminal mode' })
|
key('t', '<C-q>', '<C-\\><C-n>', { desc = 'exit terminal mode' })
|
||||||
|
|
||||||
-- Arrow keys for window movement and resizing
|
-- Arrow keys for window movement and resizing
|
||||||
key('n', '<Left>', '<C-w>h')
|
key('n', '<Left>', '<C-w>h')
|
||||||
key('n', '<Down>', '<C-w>j')
|
key('n', '<Down>', '<C-w>j')
|
||||||
key('n', '<Up>', '<C-w>k')
|
key('n', '<Up>', '<C-w>k')
|
||||||
key('n', '<Right>', '<C-w>l')
|
key('n', '<Right>', '<C-w>l')
|
||||||
--
|
--
|
||||||
key('n', '<S-Left>', "<C-w><")
|
key('n', '<S-Left>', "<C-w><")
|
||||||
key('n', '<S-Right>', "<C-w>>")
|
key('n', '<S-Right>', "<C-w>>")
|
||||||
key('n', '<S-Down>', "<C-w>-")
|
key('n', '<S-Down>', "<C-w>-")
|
||||||
key('n', '<S-Up>', "<C-w>+")
|
key('n', '<S-Up>', "<C-w>+")
|
||||||
|
|
||||||
key('n', '<M-[>', function() vim.fn.search('^[^[:space:])\\]}]', 'be') end, { desc = 'jump to previous unindented line' })
|
key('n', '<M-[>', function() vim.fn.search('^[^[:space:])\\]}]', 'be') end, { desc = 'jump to previous unindented line' })
|
||||||
key('n', '<M-]>', function() vim.fn.search('^[^[:space:])\\]}]', 'e') end, { desc = 'jump to next unindented line' })
|
key('n', '<M-]>', function() vim.fn.search('^[^[:space:])\\]}]', 'e') end, { desc = 'jump to next unindented line' })
|
||||||
|
|
||||||
key('i', '<C-U>', '<C-G>u<C-U>')
|
key('i', '<C-U>', '<C-G>u<C-U>')
|
||||||
key('n', '&', ':&&<CR>')
|
key('n', '&', ':&&<CR>')
|
||||||
key('x', '&', ':&&<CR>')
|
key('x', '&', ':&&<CR>')
|
||||||
key('n', 'Y', 'y$')
|
key('n', 'Y', 'y$')
|
||||||
|
|
||||||
|
|
||||||
key('i', '<C-Space>', '<C-x><C-o>', { desc = 'completion' })
|
key('i', '<C-Space>', '<C-x><C-o>', { desc = 'completion' })
|
||||||
key('n', '<C-l>', '<cmd>noh<CR><cmd>redraw!<CR>', { desc = 'clear search highlight' })
|
key('n', '<C-l>', '<cmd>noh<CR><cmd>redraw!<CR>', { desc = 'clear search highlight' })
|
||||||
key('v', 'gs', "<cmd>'<,'>sort<CR>", { desc = 'sort selection' })
|
key('v', 'gs', "<cmd>'<,'>sort<CR>", { desc = 'sort selection' })
|
||||||
|
|
||||||
|
|
||||||
key({ 'n', 'x' }, '<M-a>', "<Plug>(EasyAlign)", { desc = 'align selection' })
|
key({ 'n', 'x' }, '<M-a>', "<Plug>(EasyAlign)", { desc = 'align selection' })
|
||||||
|
|
|
||||||
|
|
@ -1,73 +0,0 @@
|
||||||
--local lsp_status = require('lsp-status')
|
|
||||||
|
|
||||||
--lsp_status.register_progress()
|
|
||||||
|
|
||||||
local map = vim.keymap.set
|
|
||||||
map("n", "<leader>dr", function() require("dap").repl.toggle() end, { silent = true })
|
|
||||||
|
|
||||||
-- Use an on_attach function to only map the following keys
|
|
||||||
-- after the language server attaches to the current buffer
|
|
||||||
local on_attach = function(client, bufnr)
|
|
||||||
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
|
|
||||||
|
|
||||||
--Enable completion triggered by <c-x><c-o>
|
|
||||||
vim.bo[bufnr].omnifunc = 'v:lua.vim.lsp.omnifunc'
|
|
||||||
|
|
||||||
-- Mappings.
|
|
||||||
local opts = { silent = true, buffer = bufnr }
|
|
||||||
local loud = { buffer = bufnr }
|
|
||||||
|
|
||||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
|
||||||
map('n', 'gD', vim.lsp.buf.declaration, opts)
|
|
||||||
map('n', 'gd', vim.lsp.buf.definition, opts)
|
|
||||||
map('n', 'K', vim.lsp.buf.hover, opts)
|
|
||||||
map('v', 'K', vim.lsp.buf.hover, opts)
|
|
||||||
map('n', 'gi', vim.lsp.buf.implementation, opts)
|
|
||||||
map('n', '<C-k>', vim.lsp.buf.signature_help, opts)
|
|
||||||
map('n', '<Leader>D', vim.lsp.buf.type_definition, opts)
|
|
||||||
map('n', '<Leader>rn', vim.lsp.buf.rename, opts)
|
|
||||||
map('n', '<M-x>', vim.lsp.buf.code_action, loud)
|
|
||||||
map('n', '<M-s>', vim.lsp.codelens.run, loud)
|
|
||||||
map('n', 'gr', vim.lsp.buf.references, opts)
|
|
||||||
map('n', '<M-e>', vim.diagnostic.open_float, opts)
|
|
||||||
map('n', '[d', vim.diagnostic.goto_prev, opts)
|
|
||||||
map('n', ']d', vim.diagnostic.goto_next, opts)
|
|
||||||
map('n', '<M-q>', vim.diagnostic.setloclist, opts)
|
|
||||||
map("n", "<Leader>f", function() vim.lsp.buf.format { async = true } end, opts)
|
|
||||||
map("n", "<leader>dc", function() require("dap").continue() end, opts)
|
|
||||||
map("n", "<leader>dK", function() require("dap.ui.widgets").hover() end, opts)
|
|
||||||
map("n", "<leader>dt", function() require("dap").toggle_breakpoint() end, opts)
|
|
||||||
map("n", "<leader>dso", function() require("dap").step_over() end, opts)
|
|
||||||
map("n", "<leader>dsi", function() require("dap").step_into() end, opts)
|
|
||||||
map("n", "<leader>dl", function() require("dap").run_last() end, opts)
|
|
||||||
|
|
||||||
map("n", "<leader>aa", vim.diagnostic.setqflist, opts)
|
|
||||||
map("n", "<leader>aw", function() vim.diagnostic.setqflist({ severity = "W" }) end, opts)
|
|
||||||
map("n", "<leader>ae", function() vim.diagnostic.setqflist({ severity = "E" }) end, opts)
|
|
||||||
|
|
||||||
vim.cmd [[autocmd CursorHoldI * silent! lua vim.lsp.buf.signature_help()]]
|
|
||||||
vim.cmd [[autocmd CursorHold * lua vim.diagnostic.open_float({max_width = 100, focusable = false})]]
|
|
||||||
end
|
|
||||||
|
|
||||||
require("lsp.installer")(on_attach)
|
|
||||||
require("lsp.metals")(on_attach)
|
|
||||||
require("lsp.typescript")(on_attach)
|
|
||||||
|
|
||||||
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
|
|
||||||
vim.lsp.diagnostic.on_publish_diagnostics, {
|
|
||||||
virtual_text = false,
|
|
||||||
underline = true,
|
|
||||||
signs = true,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
|
|
||||||
vim.lsp.handlers.signature_help, {
|
|
||||||
silent = true, focusable = false
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
local signature_help_cfg = {}
|
|
||||||
require "lsp_signature".setup(signature_help_cfg)
|
|
||||||
|
|
||||||
return { on_attach = on_attach }
|
|
||||||
|
|
@ -1,45 +1,41 @@
|
||||||
local on_attach = function(args)
|
local on_attach = function(args)
|
||||||
local bufnr = args.buf
|
--Enable completion triggered by <c-x><c-o>
|
||||||
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
|
vim.bo[args.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
|
||||||
|
|
||||||
--Enable completion triggered by <c-x><c-o>
|
-- Mappings.
|
||||||
vim.bo[bufnr].omnifunc = 'v:lua.vim.lsp.omnifunc'
|
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||||
|
for _, mapping in ipairs({
|
||||||
|
{ 'gD', vim.lsp.buf.declaration, "Go to declaration" },
|
||||||
|
{ 'gd', require('telescope.builtin').lsp_definitions, "Go to definition" },
|
||||||
|
{ 'gi', vim.lsp.buf.implementation, "Go to implementation" },
|
||||||
|
{ '<C-k>', vim.lsp.buf.signature_help, "Show signature help" },
|
||||||
|
{ '<Leader>D', vim.lsp.buf.type_definition, "Go to type definition" },
|
||||||
|
{ '<Leader>rn', vim.lsp.buf.rename, "Rename" },
|
||||||
|
{ '<M-x>', vim.lsp.buf.code_action, "Code action" },
|
||||||
|
{ '<M-s>', vim.lsp.codelens.run, "Run code lens" },
|
||||||
|
{ 'gr', vim.lsp.buf.references, "Go to references" },
|
||||||
|
{ '<M-e>', vim.diagnostic.open_float, "Open diagnostics" },
|
||||||
|
{ '[d', vim.diagnostic.goto_prev, "Go to previous diagnostic" },
|
||||||
|
{ '[d', vim.diagnostic.goto_prev, "Go to next diagnostic" },
|
||||||
|
{ '<M-q>', vim.diagnostic.setloclist, "Add buffer diagnostics to location list" },
|
||||||
|
{ "<Leader>f", function() vim.lsp.buf.format { async = true } end, "Format buffer" },
|
||||||
|
{ "<leader>dc", function() require("dap").continue() end, "Debug: Continue" },
|
||||||
|
{ "<leader>dK", function() require("dap.ui.widgets").hover() end, "Debug: Hover" },
|
||||||
|
{ "<leader>dt", function() require("dap").toggle_breakpoint() end, "Debug: Toggle breakpoint" },
|
||||||
|
{ "<leader>dso", function() require("dap").step_over() end, "Debug: Step over" },
|
||||||
|
{ "<leader>dsi", function() require("dap").step_into() end, "Debug: Step into" },
|
||||||
|
{ "<leader>dl", function() require("dap").run_last() end, "Debug: Run last" },
|
||||||
|
{ "<leader>aa", vim.diagnostic.setqflist, "Add all diagnostics to quickfix list" },
|
||||||
|
{ "<leader>aw", function() vim.diagnostic.setqflist({ severity = "W" }) end, "Add all warnings to quickfix list" },
|
||||||
|
{ "<leader>ae", function() vim.diagnostic.setqflist({ severity = "E" }) end, "Add all errors to quickfix list" },
|
||||||
|
}) do
|
||||||
|
vim.keymap.set('n', mapping[1], mapping[2], { silent = true, buffer = args.buf, desc = mapping[3] })
|
||||||
|
end
|
||||||
|
|
||||||
-- Mappings.
|
vim.keymap.set("n", "<leader>dr", function() require("dap").repl.toggle() end, { silent = true, desc = "Toogle debug REPL" })
|
||||||
local opts = { silent = true, buffer = bufnr }
|
|
||||||
local loud = { buffer = bufnr }
|
|
||||||
local desc = function(text) return { silent = true, buffer = bufnr, desc = text} end
|
|
||||||
|
|
||||||
local map = vim.keymap.set
|
vim.cmd [[autocmd CursorHoldI * silent! lua vim.lsp.buf.signature_help()]]
|
||||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
vim.cmd [[autocmd CursorHold * lua vim.diagnostic.open_float({max_width = 100, focusable = false})]]
|
||||||
map("n", "<leader>dr", function() require("dap").repl.toggle() end, { silent = true })
|
|
||||||
map('n', 'gD', vim.lsp.buf.declaration, desc("Go to declaration"))
|
|
||||||
map('n', 'gd', vim.lsp.buf.definition, desc("Go to definition"))
|
|
||||||
map('n', 'gi', vim.lsp.buf.implementation, desc("Go to implementation"))
|
|
||||||
map('n', '<C-k>', vim.lsp.buf.signature_help, desc("Show signature help"))
|
|
||||||
map('n', '<Leader>D', vim.lsp.buf.type_definition, desc("Go to type definition"))
|
|
||||||
map('n', '<Leader>rn', vim.lsp.buf.rename, desc("Rename"))
|
|
||||||
map('n', '<M-x>', vim.lsp.buf.code_action, desc("Code action"))
|
|
||||||
map('n', '<M-s>', vim.lsp.codelens.run, desc("Run code lens"))
|
|
||||||
map('n', 'gr', vim.lsp.buf.references, desc("Go to references"))
|
|
||||||
map('n', '<M-e>', vim.diagnostic.open_float, desc("Open diagnostics"))
|
|
||||||
map('n', '[d', vim.diagnostic.goto_prev, desc("Go to previous diagnostic"))
|
|
||||||
map('n', '[d', vim.diagnostic.goto_prev, desc("Go to next diagnostic"))
|
|
||||||
map('n', '<M-q>', vim.diagnostic.setloclist, desc("Add buffer diagnostics to location list"))
|
|
||||||
map("n", "<Leader>f", function() vim.lsp.buf.format { async = true } end, desc("Format buffer"))
|
|
||||||
map("n", "<leader>dc", function() require("dap").continue() end, desc("Debug: Continue"))
|
|
||||||
map("n", "<leader>dK", function() require("dap.ui.widgets").hover() end, desc("Debug: Hover"))
|
|
||||||
map("n", "<leader>dt", function() require("dap").toggle_breakpoint() end, desc("Debug: Toggle breakpoint"))
|
|
||||||
map("n", "<leader>dso", function() require("dap").step_over() end, desc("Debug: Step over"))
|
|
||||||
map("n", "<leader>dsi", function() require("dap").step_into() end, desc("Debug: Step into"))
|
|
||||||
map("n", "<leader>dl", function() require("dap").run_last() end, desc("Debug: Run last"))
|
|
||||||
|
|
||||||
map("n", "<leader>aa", vim.diagnostic.setqflist, desc("Add all diagnostics to quickfix list"))
|
|
||||||
map("n", "<leader>aw", function() vim.diagnostic.setqflist({ severity = "W" }) end, desc("Add all warnings to quickfix list"))
|
|
||||||
map("n", "<leader>ae", function() vim.diagnostic.setqflist({ severity = "E" }) end, desc("Add all errors to quickfix list"))
|
|
||||||
|
|
||||||
vim.cmd [[autocmd CursorHoldI * silent! lua vim.lsp.buf.signature_help()]]
|
|
||||||
vim.cmd [[autocmd CursorHold * lua vim.diagnostic.open_float({max_width = 100, focusable = false})]]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd("LspAttach", { callback = on_attach })
|
vim.api.nvim_create_autocmd("LspAttach", { callback = on_attach })
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue