2 files changed, 58 insertions, 6 deletions

diff --git a/nvim/keymaps.vim b/nvim/keymaps.vim
index a94533b..a37bdd1 100644
--- a/nvim/keymaps.vim
+++ b/nvim/keymaps.vim
@@ -4,8 +4,7 @@ let mapleader=','
 nnoremap <silent> <C-PageUp>   :tabprevious<CR>
 nnoremap <silent> <C-PageDown> :tabnext<CR>
 
-" besseres Verhalten von <Page*>
-" https://vimrc-dissection.blogspot.com/2009/02/fixing-pageup-and-pagedown.html
+" besseres Verhalten von <PageUp und <PageDown>
 map  <silent> <PageUp>        1000<C-U>
 map  <silent> <PageDown>      1000<C-D>
 imap <silent> <PageUp>   <C-O>1000<C-U>
@@ -31,7 +30,41 @@ inoremap <expr> <C-j> pumvisible() ? "\<C-n>" : "\<Down>"
 inoremap <expr> <C-k> pumvisible() ? "\<C-p>" : "\<Up>"
 
 " Funktionstasten
-nnoremap <F4> :NERDTreeToggle<CR>
-nnoremap <F5> :make<CR>
-nnoremap <F7> :MundoToggle<CR>
-nnoremap <F8> :TagbarToggle<CR>
+nnoremap <silent> <F4> :NERDTreeToggle<CR>
+nnoremap <silent> <F5> :make<CR>
+nnoremap <silent> <F7> :MundoToggle<CR>
+nnoremap <silent> <F8> :TagbarToggle<CR>
+
+" LSP Keybindings
+lua << EOF
+vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
+vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
+vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
+vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
+
+vim.api.nvim_create_autocmd('LspAttach', {
+  group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+  callback = function(ev)
+    vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
+
+    local opts = { buffer = ev.buf }
+    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+    vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
+    vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+    vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
+    vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
+    vim.keymap.set('n', '<space>wl', function()
+      print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+    end, opts)
+    vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
+    vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
+    vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, opts)
+    vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+    vim.keymap.set('n', '<space>f', function()
+      vim.lsp.buf.format { async = true }
+    end, opts)
+  end,
+})
+EOF
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index 3111f6a..65477d8 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -17,6 +17,7 @@ call plug#begin()
   Plug 'tpope/vim-repeat'
   Plug 'tpope/vim-surround'
   Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+  Plug 'neovim/nvim-lspconfig'
 call plug#end()
 
 " EMMET
@@ -67,3 +68,21 @@ require'nvim-treesitter.configs'.setup {
   },
 }
 EOF
+
+" LSP
+lua << EOF
+local lspconfig = require'lspconfig'
+lspconfig.clangd.setup {
+        cmd = { 'clangd15' }
+}
+lspconfig.lua_ls.setup {}
+lspconfig.pyright.setup {}
+lspconfig.tsserver.setup {}
+lspconfig.vimls.setup {}
+lspconfig.rust_analyzer.setup {
+  -- Server-specific settings. See `:help lspconfig-setup`
+  settings = {
+    ['rust-analyzer'] = {},
+  },
+}
+EOF