updated nvim config

This commit is contained in:
Thies Lennart Alff 2023-09-21 16:21:07 +02:00
parent 0a93212957
commit 1cfcb43bcc
6 changed files with 59 additions and 10 deletions

View file

@ -0,0 +1,16 @@
local mark = require('harpoon.mark')
local ui = require('harpoon.ui')
local cmd_ui = require('harpoon.cmd-ui')
local term = require('harpoon.term')
vim.keymap.set('n', '<leader>a', mark.add_file)
vim.keymap.set('n', '<C-e>', ui.toggle_quick_menu)
vim.keymap.set('n', '<C-h>', function() ui.nav_file(1) end)
vim.keymap.set('n', '<C-t>', function() ui.nav_file(2) end)
vim.keymap.set('n', '<C-n>', function() ui.nav_file(3) end)
vim.keymap.set('n', '<C-s>', function() ui.nav_file(4) end)
vim.keymap.set('n', '<leader>c', cmd_ui.toggle_quick_menu)
vim.keymap.set('n', '<leader>gt1', function() term.gotoTerminal(1) end)
vim.keymap.set('n', '<leader>br', function() term.sendCommand(1, 'build_ros') end)

View file

@ -9,7 +9,16 @@ require('mason-lspconfig').setup {
'lua_ls', 'clangd', 'pylsp', 'yamlls'
}
}
local lsp = require('lsp-zero').preset({})
local lsp = require('lsp-zero').preset({
manage_nvim_cmp = {
set_sources = 'lsp',
set_basic_mappings = true,
set_extra_mappings = false,
use_luasnip = true,
set_format = true,
documentation_window = true,
}
})
lsp.on_attach(function(client, bufnr)
lsp.default_keymaps({ buffer = bufnr })
@ -32,6 +41,7 @@ cmp.setup({
['<C-space>'] = cmp.mapping.complete(),
['<C-j>'] = cmp.mapping.scroll_docs(1),
['<C-k>'] = cmp.mapping.scroll_docs(-1),
['<CR>'] = cmp.mapping.confirm({ select = false }),
},
window = {
completion = cmp.config.window.bordered(),

View file

@ -1,3 +1,5 @@
require('lennartalff.remap')
require('lennartalff.set')
vim.cmd('colorscheme rose-pine')
-- vim.cmd('colorscheme rose-pine')
vim.o.termguicolors = true
vim.cmd.colorscheme 'catppuccin-frappe'

View file

@ -28,7 +28,20 @@ vim.keymap.set('n', '<leader>f', function()
end)
-- quickfix navigation
vim.keymap.set('n', '<C-k>', '<cmd>cnext<CR>zz')
vim.keymap.set('n', '<C-j>', '<cmd>cprev<CR>zz')
vim.keymap.set('n', '<leader>k', '<cmd>lnext<CR>zz')
vim.keymap.set('n', '<leader>j', '<cmd>lprev<CR>zz')
vim.keymap.set('n', '<C-j>', '<cmd>cnext<CR>zz')
vim.keymap.set('n', '<C-k>', '<cmd>cprev<CR>zz')
vim.keymap.set('n', '<leader>j', '<cmd>lnext<CR>zz')
vim.keymap.set('n', '<leader>k', '<cmd>lprev<CR>zz')
vim.keymap.set('n', '<leader>i', vim.lsp.buf.hover)
vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename)
vim.keymap.set('n', '<leader>dq', vim.diagnostic.setqflist)
local function quickfix()
vim.lsp.buf.code_action({
filter = function(a) return a.isPreferred end,
apply = true
})
end
vim.keymap.set('n', '<leader>qf', quickfix)

View file

@ -7,7 +7,8 @@ return {
{ 'nvim-lua/plenary.nvim' } }
},
{ 'rose-pine/neovim', name = 'rose-pine' },
-- 'tpope/fugitive',
{ 'catppuccin/nvim', name = 'catppuccin', priority = 1000 },
{ 'tpope/vim-fugitive', name = 'fugitive' },
{
'VonHeikemen/lsp-zero.nvim',
branch = 'v2.x',
@ -23,5 +24,13 @@ return {
{ 'L3MON4D3/LuaSnip' }, -- Required
},
},
{
'ThePrimeagen/harpoon',
dependencies = {
{ 'nvim-lua/plenary.nvim' },
},
},
{ 'ray-x/lsp_signature.nvim', event = 'VeryLazy', opts = {},
config = function(_, opts) require('lsp_signature').setup(opts) end },
}

View file

@ -89,9 +89,6 @@ else
export EDITOR='vim'
fi
export TERM="xterm-256color"
alias reboot-windows="systemctl reboot --boot-loader-entry=windows.conf"
alias reboot-linux="systemctl reboot --boot-loader-entry=arch.conf"
alias zshrc="vim ~/.zshrc"
@ -99,4 +96,6 @@ alias zshrc="vim ~/.zshrc"
alias mount-institut='kinit -kt "$HOME/keytabs/cta1233.keytab" cta1233@KERBEROS.TU-HARBURG.DE && mount /TUHH/Institut'
alias mount-lehre='kinit -kt "$HOME/keytabs/cta1233.keytab" cta1233@KERBEROS.TU-HARBURG.DE && mount /TUHH/Lehre'
alias rosterm='docker exec -it ros2-vim zsh'
alias git-delete-merged="git branch --merged main | grep -v '^[ *]*main$' | xargs git branch -d"