1 files changed, 7 insertions, 9 deletions

diff --git a/nvim/keymaps.vim b/nvim/keymaps.vim
index 2c1d65b..2aff916 100644
--- a/nvim/keymaps.vim
+++ b/nvim/keymaps.vim
@@ -24,18 +24,9 @@ map k gk
 "map $ g$
 "map 0 g0
 
-" Vernünftige Tastenbelegungen für Autocomplete
-inoremap <expr> <CR>  pumvisible() ? "\<C-y>" : "\<CR>"
-inoremap <expr> <Tab> pumvisible() ? "\<C-y>" : "\<Tab>"
-inoremap <expr> <Esc> pumvisible() ? "\<C-e>" : "\<Esc>"
-inoremap <expr> <C-j> pumvisible() ? "\<C-n>" : "\<Down>"
-inoremap <expr> <C-k> pumvisible() ? "\<C-p>" : "\<Up>"
-
 " Funktionstasten
 nnoremap <silent> <F4> :NvimTreeToggle<CR>
 nnoremap <silent> <F5> :make<CR>
-nnoremap <silent> <F7> :MundoToggle<CR>
-nnoremap <silent> <F8> :TagbarToggle<CR>
 
 " Telescope
 nnoremap <leader>ff <cmd>Telescope find_files<cr>
@@ -45,6 +36,12 @@ nnoremap <leader>fh <cmd>Telescope help_tags<cr>
 
 " LSP Keybindings
 lua << EOF
+vim.keymap.set("i", "<c-space>", function() vim.lsp.completion.get() end)
+
+-- map <cr> to <c-y> when the popup menu is visible
+vim.keymap.set("i", "<cr>", "pumvisible() ? '<c-y>' : '<cr>'", { expr = true })
+
+--[[
 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)
@@ -75,4 +72,5 @@ vim.api.nvim_create_autocmd('LspAttach', {
     end, opts)
   end,
 })
+]]
 EOF