4 files changed, 8 insertions, 10 deletions
diff --git a/store/config/nvim/lua/plugins.lua b/store/config/nvim/lua/plugins.lua
index 85de362..b511c5a 100644
--- a/store/config/nvim/lua/plugins.lua
+++ b/store/config/nvim/lua/plugins.lua
@@ -31,10 +31,12 @@ return {
         dependencies = { 'nvim-lua/plenary.nvim' }
     },
     { "lewis6991/gitsigns.nvim" },
+    { "sindrets/diffview.nvim" },
     { "hrsh7th/nvim-cmp" },
     { "hrsh7th/cmp-nvim-lsp" },
     { "hrsh7th/cmp-buffer" },
     { "hrsh7th/cmp-path" },
+    { "echasnovski/mini.bufremove" },
     { "windwp/nvim-autopairs" },
     { "mfussenegger/nvim-lint" },
 }
diff --git a/store/config/nvim/lua/setup/init.lua b/store/config/nvim/lua/setup/init.lua
index bbce01c..d5522d2 100644
--- a/store/config/nvim/lua/setup/init.lua
+++ b/store/config/nvim/lua/setup/init.lua
@@ -22,6 +22,9 @@ local function setup()
     vim.keymap.set("n", "<c-tab>", "<cmd>bnext<cr>")
     vim.keymap.set("n", "<c-s-tab>", "<cmd>bNext<cr>")
     vim.keymap.set("n", "<esc>", close_float)
+    vim.keymap.set("n", "<C-q>", function ()
+        require("mini.bufremove").delete()
+    end)
     vim.keymap.set('t', '<A-n>', '<C-\\><C-n>')
     vim.keymap.set('t', '<A-p>', function()
         local register = vim.fn.input("Enter register: ")
diff --git a/store/config/nvim/lua/setup/lsp.lua b/store/config/nvim/lua/setup/lsp.lua
index 4216f1c..45aa100 100644
--- a/store/config/nvim/lua/setup/lsp.lua
+++ b/store/config/nvim/lua/setup/lsp.lua
@@ -13,19 +13,10 @@ local function client_name_is(ev, name)
 end
 
 local function setup_clangd()
-    local clangd = "clangd"
-    local brew_clangd_path = "/usr/local/opt/llvm/bin/clangd"
-
-    if vim.uv.fs_stat(brew_clangd_path) ~= nil then
-        clangd = brew_clangd_path
-    end
-
-    vim.lsp.config("clangd", { cmd = { clangd } })
-
     vim.api.nvim_create_autocmd("LspAttach", {
         callback = function(ev)
             if client_name_is(ev, "clangd") then
-                vim.keymap.set("n", "grs", "<cmd>ClangdSwitchSourceHeader<cr>", {
+                vim.keymap.set("n", "grs", "<cmd>LspClangdSwitchSourceHeader<cr>", {
                     buffer = ev.buf
                 })
             end
diff --git a/store/config/nvim/lua/setup/plugins/init.lua b/store/config/nvim/lua/setup/plugins/init.lua
index 8f1346b..ac99886 100644
--- a/store/config/nvim/lua/setup/plugins/init.lua
+++ b/store/config/nvim/lua/setup/plugins/init.lua
@@ -12,11 +12,13 @@ local function setup()
 
     require("setup.plugins.telescope").setup()
     require("setup.plugins.gitsigns").setup()
+    require("diffview").setup {}
 
     require("setup.plugins.tree-sitter").setup()
     require("setup.plugins.lint").setup()
     require("setup.plugins.cmp").setup()
     require("nvim-autopairs").setup {}
+    require('mini.bufremove').setup {}
 end
 
 return {