3 files changed, 35 insertions, 22 deletions

diff --git a/init.vim b/init.vim
index bc11895..031965f 120000
--- a/init.vim
+++ b/init.vim
@@ -1 +1 @@
-/nix/store/2c32chzx6k2w0n18ijnsdlkklj58dx2h-home-manager-files/.config/nvim/init.vim
\ No newline at end of file
+/nix/store/qk7sa1a8bvgzs4419vwlqdp715l2c2a0-home-manager-files/.config/nvim/init.vim
\ No newline at end of file
diff --git a/lua/completions.lua b/lua/completions.lua
index f7598a6..770de43 100644
--- a/lua/completions.lua
+++ b/lua/completions.lua
@@ -14,6 +14,22 @@ cmp.setup({
             c = cmp.mapping.close(),
         }),
         ['<CR>'] = cmp.mapping.confirm({ select = true }),
+
+        ['<C-n>'] = cmp.mapping(function(fallback)
+            if cmp.visible() then
+                cmp.select_next_item()
+            else
+                fallback()
+            end
+        end, { 'i', 's' }),
+
+        ['<C-p>'] = cmp.mapping(function(fallback)
+            if cmp.visible() then
+                cmp.select_prev_item()
+            else
+                fallback()
+            end
+        end, { 'i', 's' }),
     },
     sources = cmp.config.sources({
         { name = 'nvim_lsp' },
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 7509593..257f5a3 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -6,26 +6,19 @@ local on_attach = function(client, bufnr)
     buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
 
     -- Mappings.
-    local opts = { noremap=true, silent=true }
-    buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
-    buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
-    buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
-    buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
-    buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-    buf_set_keymap('n', '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-    buf_set_keymap('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-    buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-    buf_set_keymap('n', '<leader>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
-    buf_set_keymap('n', '[g', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
-    buf_set_keymap('n', ']g', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
-    buf_set_keymap('n', '<leader>q', '<cmd>lua vim.diagnostic.set_qflist()<CR>', opts)
+    local bufopts = { noremap=true, silent=true, buffer=bufnr }
+    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
+    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+    vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
+    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
+    vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
 
-    -- Set some keybinds conditional on server capabilities
-    if client.server_capabilities.document_formatting then
-        buf_set_keymap("n", "<leader>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
-    elseif client.server_capabilities.document_range_formatting then
-        buf_set_keymap("n", "<leader>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
-    end
+    local opts = { noremap=true, silent=true }
+    vim.keymap.set('n', '<space>d', vim.diagnostic.open_float, opts)
+    vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
+    vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
+    vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
+    vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
 end
 
 local servers = { "hls", "rnix", "bashls" }
@@ -35,11 +28,13 @@ for _, lsp in ipairs(servers) do
     }
 end
 
-local capabilities = vim.lsp.protocol.make_client_capabilities()
+local capabilities = require('cmp_nvim_lsp')
+    .update_capabilities(vim.lsp.protocol.make_client_capabilities())
+
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
 nvim_lsp.rust_analyzer.setup {
-    capabilities = capabilities, 
+    on_attach = on_attach,
     settings = {
         ["rust-analyzer"] = {
             procMacro = {
@@ -53,6 +48,8 @@ nvim_lsp.rust_analyzer.setup {
 }
 
 nvim_lsp.ccls.setup {
+    capabilities = capabilities, 
+    on_attach = on_attach,
     init_options = {
         index = {
             threads = 0;