From 6b84433e4eb2195c11d8c7beff3b76d30cd49dce Mon Sep 17 00:00:00 2001
From: Saeed Afzal <saeed.afzal@protonmail.com>
Date: Sat, 14 May 2022 23:08:26 +0100
Subject: [PATCH] Update lsp config

---
 lua/plugins/config/cmp.lua       | 24 ++++++++++++
 lua/plugins/config/lspconfig.lua |  7 ++++
 lua/plugins/config/nvimtree.lua  | 14 ++++---
 lua/plugins/config/whichkey.lua  | 15 ++++++--
 lua/plugins/setup.lua            | 66 ++++++++++++++++++++++++++++++++
 5 files changed, 117 insertions(+), 9 deletions(-)
 create mode 100644 lua/plugins/config/cmp.lua
 create mode 100644 lua/plugins/config/lspconfig.lua

diff --git a/lua/plugins/config/cmp.lua b/lua/plugins/config/cmp.lua
new file mode 100644
index 0000000..55174c4
--- /dev/null
+++ b/lua/plugins/config/cmp.lua
@@ -0,0 +1,24 @@
+local cmp = require("cmp")
+
+cmp.setup {
+    snippet = {
+        expand = function(args)
+            require("luasnip").lsp_expand(args.body)
+        end
+    },
+
+    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 })
+    }),
+
+    sources = cmp.config.sources({
+        { name = "nvim_lsp" },
+        { name = "luasnip" }
+    }, {
+        { name = "buffer" }
+    })
+}
diff --git a/lua/plugins/config/lspconfig.lua b/lua/plugins/config/lspconfig.lua
new file mode 100644
index 0000000..e2f5d04
--- /dev/null
+++ b/lua/plugins/config/lspconfig.lua
@@ -0,0 +1,7 @@
+local capabilities = require("cmp_nvim_lsp").update_capabilities(vim.lsp.protocol.make_client_capabilities())
+
+local lspconfig = require("lspconfig")
+
+lspconfig.sumneko_lua.setup {
+    capabilities = capabilities
+}
diff --git a/lua/plugins/config/nvimtree.lua b/lua/plugins/config/nvimtree.lua
index 8748a60..b1b8f7a 100644
--- a/lua/plugins/config/nvimtree.lua
+++ b/lua/plugins/config/nvimtree.lua
@@ -10,11 +10,6 @@ require("nvim-tree").setup {
     hijack_cursor = true,
     update_cwd = true,
 
-    update_focused_file = {
-        enable = true,
-        update_cwd = true
-    },
-
     view = {
         hide_root_folder = true
     },
@@ -23,5 +18,14 @@ require("nvim-tree").setup {
         indent_markers = {
             enable = true
         }
+    },
+
+    update_focused_file = {
+        enable = true,
+        update_cwd = true
+    },
+
+    diagnostics = {
+        enable = true
     }
 }
diff --git a/lua/plugins/config/whichkey.lua b/lua/plugins/config/whichkey.lua
index 0d91948..3a9b713 100644
--- a/lua/plugins/config/whichkey.lua
+++ b/lua/plugins/config/whichkey.lua
@@ -12,11 +12,11 @@ wk.register({
             x = { "<cmd>BufferClose<CR>", "Close Buffer" },
             n = { "<cmd>BufferMoveNext<CR>", "Move Next" },
             m = { "<cmd>BufferMovePrevious<CR>", "Move Previous" },
-            
+
             p = {
                 name = "Pinned Buffers",
                 p = { "<cmd>BufferPin<CR>", "Pin Buffer" },
-                x = { "<cmd>BufferCloseAllButPinned<CR>", "Close All But Pinned" } 
+                x = { "<cmd>BufferCloseAllButPinned<CR>", "Close All But Pinned" }
             }
         },
 
@@ -27,7 +27,8 @@ wk.register({
             f = { "<cmd>Telescope fd<CR>", "Find Files" },
             c = { "<cmd>Telescope current_buffer_fuzzy_find<CR>", "Find In Current Buffer" },
             b = { "<cmd>Telescope buffers<CR>", "Buffers" },
-            k = { "<cmd>Telescope keymaps<CR>", "Keymaps" }
+            k = { "<cmd>Telescope keymaps<CR>", "Keymaps" },
+            t = { "<cmd>TodoTelescope<CR>", "Todos" }
         },
 
         g = {
@@ -42,5 +43,11 @@ wk.register({
 
     -- Barbar (switching buffers)
     ["<TAB>"] = { "<cmd>BufferNext<CR>", "Next Buffer" },
-    ["<S-TAB>"] = { "<cmd>BufferPrevious<CR>", "Previous Buffer" }
+    ["<S-TAB>"] = { "<cmd>BufferPrevious<CR>", "Previous Buffer" },
+
+    ["t"] = {
+        name = "Trouble",
+        t = { "<cmd>TroubleToggle<CR>", "Trouble Toggle" },
+        d = { "<cmd>TodoTrouble<CR>", "Todos" }
+    }
 })
diff --git a/lua/plugins/setup.lua b/lua/plugins/setup.lua
index 81376f7..c4bf856 100644
--- a/lua/plugins/setup.lua
+++ b/lua/plugins/setup.lua
@@ -118,6 +118,72 @@ require("packer").startup(function(use)
         end
     }
 
+    -- NOTE: LSP
+    use {
+        "williamboman/nvim-lsp-installer",
+        {
+            "neovim/nvim-lspconfig",
+            config = function()
+                require("nvim-lsp-installer").setup()
+            end
+        }
+    }
+
+    use {
+        "ray-x/lsp_signature.nvim",
+        after = "nvim-lspconfig",
+        config = function()
+            require("lsp_signature").setup()
+        end
+    }
+
+    use {
+        "L3MON4D3/LuaSnip",
+        "saadparwaiz1/cmp_luasnip"
+    }
+
+    use {
+        "hrsh7th/cmp-nvim-lsp",
+        "hrsh7th/cmp-buffer",
+        "hrsh7th/cmp-path",
+        "hrsh7th/cmp-cmdline",
+        {
+            "hrsh7th/nvim-cmp",
+            config = function()
+                require("plugins.config.cmp")
+                require("plugins.config.lspconfig")
+            end
+        }
+    }
+
+    use {
+        "rafamadriz/friendly-snippets",
+        event = "InsertCharPre"
+    }
+
+    use {
+        "windwp/nvim-autopairs",
+        config = function()
+            require("nvim-autopairs").setup()
+        end
+    }
+
+    use {
+        "folke/trouble.nvim",
+        requires = "kyazdani42/nvim-web-devicons",
+        config = function()
+            require("trouble").setup()
+        end
+    }
+
+    use {
+        "folke/todo-comments.nvim",
+        requires = "nvim-lua/plenary.nvim",
+        config = function()
+            require("todo-comments").setup()
+        end
+    }
+
     if packer_bootstrap then
         require("packer").sync()
     end