From ae4c7b5603cda4206c68e0c2b56354a8eabaac23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Sun, 20 Aug 2023 18:16:41 +0200
Subject: [PATCH] Add some more keymappings

---
 nvim/lazy-lock.json     |  1 +
 nvim/lua/lsp_config.lua | 33 +++++++++++++++++++++------------
 nvim/lua/plugins.lua    |  1 +
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 3f0a9ba..ea87690 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -7,6 +7,7 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "diffview.nvim": { "branch": "main", "commit": "db97e667e03294bfa9f15e544e78f3082247bf79" },
   "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" },
+  "formatter.nvim": { "branch": "master", "commit": "44c89f09dcc220dc2a9b056e93c3a87c86e79804" },
   "friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" },
   "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
   "leap.nvim": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" },
diff --git a/nvim/lua/lsp_config.lua b/nvim/lua/lsp_config.lua
index 1eb55f1..ee146ca 100644
--- a/nvim/lua/lsp_config.lua
+++ b/nvim/lua/lsp_config.lua
@@ -184,13 +184,6 @@ require('lspconfig').jdtls.setup {
 
 require('lspconfig').rust_analyzer.setup {
     capabilities = capabilities,
-    settings = {
-        ['rust-analyzer'] = {
-            diagnostics = {
-                enable = false;
-            }
-        }
-    }
 }
 
 require('lspconfig').gopls.setup {
@@ -244,12 +237,28 @@ vim.diagnostic.config({
     virtual_text = false
 })
 
+
+-- Provides the Format, FormatWrite, FormatLock, and FormatWriteLock commands
+require("formatter").setup {
+    filetype = {
+        lua = {
+            require("formatter.filetypes.lua").stylua,
+        },
+        python = {
+            require("formatter.filetypes.python").black,
+        },
+
+  }
+}
+
 -- Show line diagnostics automatically in hover window
 vim.o.updatetime = 250
 vim.cmd [[autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]]
 
-vim.api.nvim_set_keymap("n", "<leader>n", ":lua vim.diagnostic.goto_next()<CR>", { silent = true })
-vim.api.nvim_set_keymap("n", "<leader>p", ":lua vim.diagnostic.goto_prev()<CR>", { silent = true })
-vim.api.nvim_set_keymap("n", "<leader>f", ":lua vim.lsp.buf.code_action()<CR>", { silent = true })
-vim.api.nvim_set_keymap("n", "gd", ":lua vim.lsp.buf.definition()<CR>", { silent = true })
-vim.api.nvim_set_keymap("n", "gr", ":lua vim.lsp.buf.references()<CR>", { silent = true })
+vim.keymap.set("n", "<leader>n", vim.diagnostic.goto_next, { silent = true })
+vim.keymap.set("n", "<leader>p", vim.diagnostic.goto_prev, { silent = true })
+vim.keymap.set("n", "<leader>f", vim.lsp.buf.code_action, { silent = true })
+vim.keymap.set("n", "gd", vim.lsp.buf.definition, { silent = true })
+vim.keymap.set("n", "gr", vim.lsp.buf.references, { silent = true })
+vim.keymap.set("n", "<space>", vim.lsp.buf.hover, { noremap = true, silent = true })
+vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, { noremap = true, silent = true })
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index fbf0b64..ea6b42f 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -20,6 +20,7 @@ require('lazy').setup({
     'cappyzawa/trim.nvim',
     'ervandew/supertab',
     'ggandor/leap.nvim',
+    'mhartington/formatter.nvim',
     'gpanders/editorconfig.nvim',
     'intrntbrn/awesomewm-vim-tmux-navigator',
     'mbbill/undotree',