From 082bbd2bb236fb2f4f20a710b4de5c77d4d1623d Mon Sep 17 00:00:00 2001
From: Steins7 <steinsset@gmail.com>
Date: Thu, 20 Oct 2022 18:00:42 +0200
Subject: [PATCH] Improve diff handling and sort keybindings

---
 lua/plugins.lua | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/lua/plugins.lua b/lua/plugins.lua
index ff1fb1b..dc1d0c5 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -15,7 +15,6 @@ local function manage_plugins()
     local plugins = {
         ["https://github.com/faerryn/plogins.nvim.git"] = {},
         ["https://github.com/tpope/vim-sensible.git"] = {},
-        ["https://github.com/neovim/nvim-lspconfig.git"] = {},
         ["https://github.com/ojroques/nvim-hardline.git"] = {
             packadd_hook = function()
                 require('hardline').setup()
@@ -86,9 +85,9 @@ local function manage_plugins()
                         -- documentation = cmp.config.window.bordered(),
                     },
                     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-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 }),
                         ["<Tab>"] = cmp.mapping(function(fallback)
@@ -149,7 +148,8 @@ local function manage_plugins()
             end
         },
 
-        -- LSP servers
+        -- LSP configuration
+        ["https://github.com/neovim/nvim-lspconfig.git"] = {},
         ["https://github.com/simrat39/rust-tools.nvim.git"] = {
             packadd_after = {
                 ["https://github.com/neovim/nvim-lspconfig.git"] = true,
@@ -164,11 +164,11 @@ local function manage_plugins()
                         capabilities = capabilities,
                         on_attach = function(_, bufnr)
                             -- Hover actions
-                            --vim.keymap.set("n", "<C-space>",
-                            --rt.hover_actions.hover_actions, { buffer = bufnr })
+                            vim.keymap.set("n", "<C-space>",
+                            rt.hover_actions.hover_actions, { buffer = bufnr })
                             ---- Code action groups
-                            --vim.keymap.set("n", "<Leader>a",
-                            --rt.code_action_group.code_action_group, { buffer = bufnr })
+                            vim.keymap.set("n", "<Leader>a",
+                            rt.code_action_group.code_action_group, { buffer = bufnr })
                         end,
                     },
                 })
@@ -191,6 +191,13 @@ local function manage_plugins()
                vim.cmd('set signcolumn=number')
             end
         },
+        ["https://github.com/nvim-lua/plenary.nvim.git"] = {},
+        ["https://github.com/sindrets/diffview.nvim.git"] = {
+            packadd_after = { ["https://github.com/nvim-lua/plenary.nvim.git"] = true },
+            packadd_hook = function()
+                vim.api.nvim_set_keymap('n', '<leader>g', ":DiffviewOpen",  {})
+            end
+        },
 
         -- Syntax highlight
         ["https://github.com/nvim-treesitter/nvim-treesitter.git"] = {