stuff

home/nvim/config.vim

@@ -4,7 +4,7 @@ let maplocalleader="\\"
 set colorcolumn=+1
 set expandtab
 set ignorecase
-set iskeyword+=ä,Ä,ö,Ö,ü,Ü,ß
+set iskeyword+=-,ä,Ä,ö,Ö,ü,Ü,ß
 set linebreak
 set list listchars=tab:»\ ,trail:·,nbsp:~
 set number

home/nvim/default.nix

@@ -16,7 +16,6 @@
         };
       };
     in [
-      # todo: SNIPPETS pandoc, completion, lsp
       {
         plugin = woof;
         config = ''
@@ -33,7 +32,7 @@
       cmp-nvim-ultisnips
       nvim-cmp
       {
-        plugin =  nvim-lspconfig;
+        plugin = nvim-lspconfig;
         config = builtins.readFile ./lsp.vim;
       }
       {

home/nvim/lsp.vim

@@ -1,22 +1,22 @@
 lua <<EOF
-  local cmp = require'cmp'
+  local cmp = require('cmp')
   cmp.setup({
     snippet = {
       expand = function(args)
-        vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+        vim.fn["UltiSnips#Anon"](args.body)
       end,
     },
     window = {
-      -- completion = cmp.config.window.bordered(),
-      -- documentation = cmp.config.window.bordered(),
+      documentation = cmp.config.window.bordered(),
+      completion = cmp.config.window.bordered(),
+    },
+    mapping = {
+      ['<C-p>'] = cmp.mapping.select_prev_item(),
+      ['<C-n>'] = cmp.mapping.select_next_item(),
+      ['<C-g>'] = cmp.mapping.abort(),
+      ['<Tab>'] = cmp.mapping.confirm({ select = true }),
+      ['<Cr>'] = cmp.mapping.confirm({ select = false }),
     },
-    mapping = cmp.mapping.preset.insert({
-      ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-      ['<C-f>'] = cmp.mapping.scroll_docs(4),
-      ['<C-Space>'] = cmp.mapping.complete(),
-      ['<C-e>'] = cmp.mapping.abort(),
-      ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-    }),
     sources = cmp.config.sources({
       { name = 'nvim_lsp' },
       { name = 'ultisnips' },
@@ -41,7 +41,6 @@ lua <<EOF
     }
   })
 
-  -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
   cmp.setup.cmdline(':', {
     mapping = cmp.mapping.preset.cmdline(),
     sources = cmp.config.sources({
@@ -51,14 +50,17 @@ lua <<EOF
     })
   })
 
---  -- Set up lspconfig.
---  local capabilities = require('cmp_nvim_lsp').default_capabilities()
---  -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
---  require('lspconfig')['typescript'].setup {
---    capabilities = capabilities
---  }
+  local on_attach = function(_, _)
+    vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, {})
+    vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, {})
+    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, {})
+    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, {})
+    vim.keymap.set('n', 'gr', vim.lsp.buf.references, {})
+    vim.keymap.set('n', 'K', vim.lsp.buf.hover, {})
+  end
 
   local nvim_lsp = require('lspconfig')
+  local capabilities = require('cmp_nvim_lsp').default_capabilities()
   local servers = { "r_language_server", "tsserver" }
   for _, lsp in ipairs(servers) do
     nvim_lsp[lsp].setup {