diff --git a/sub/nvim/after/plugin/mason-lspconfig.lua b/sub/nvim/after/plugin/mason-lspconfig.lua
new file mode 100644
index 0000000..43d7584
--- /dev/null
+++ b/sub/nvim/after/plugin/mason-lspconfig.lua
@@ -0,0 +1,6 @@
+
+local status, mason_lspconfig = pcall(require, "mason-lspconfig")
+if (not status) then return end
+
+
+mason_lspconfig.setup()
diff --git a/sub/nvim/after/plugin/mason.lua b/sub/nvim/after/plugin/mason.lua
new file mode 100644
index 0000000..7b163f2
--- /dev/null
+++ b/sub/nvim/after/plugin/mason.lua
@@ -0,0 +1,6 @@
+
+local status, mason = pcall(require, "mason")
+if (not status) then return end
+
+
+mason.setup()
diff --git a/sub/nvim/after/plugin/trouble.lua b/sub/nvim/after/plugin/trouble.lua
new file mode 100644
index 0000000..1a73863
--- /dev/null
+++ b/sub/nvim/after/plugin/trouble.lua
@@ -0,0 +1,17 @@
+
+local status, trouble = pcall(require, "trouble")
+if (not status) then return end
+
+trouble.setup()
+
+
+local function set_trouble_keymap(key, cmd)
+    local opts = {silent = true, noremap = true}
+    vim.keymap.set("n", string.format("<Leader>x%s", key), cmd, opts)
+end
+
+set_trouble_keymap("x", "<cmd>TroubleToggle<cr>")
+set_trouble_keymap("w", "<cmd>TroubleToggle workspace_diagnostics<cr>")
+set_trouble_keymap("d", "<cmd>TroubleToggle document_diagnostics<cr>")
+set_trouble_keymap("l", "<cmd>TroubleToggle loclist<cr>")
+set_trouble_keymap("q", "<cmd>TroubleToggle quickfix<cr>")
diff --git a/sub/nvim/lua/base/plugins.lua b/sub/nvim/lua/base/plugins.lua
index 1852c79..6cbeb29 100644
--- a/sub/nvim/lua/base/plugins.lua
+++ b/sub/nvim/lua/base/plugins.lua
@@ -1,9 +1,12 @@
+vim.cmd([[packadd packer.nvim]])
+
+
 return require('packer').startup(function(use)
     use 'wbthomason/packer.nvim'
 
     use {
       'nvim-lualine/lualine.nvim',
-      requires = { 'kyazdani42/nvim-web-devicons', opt = true }
+      requires = { 'kyazdani42/nvim-web-devicons' }
     }
 
     use 'ellisonleao/gruvbox.nvim'
@@ -32,12 +35,21 @@ return require('packer').startup(function(use)
         config = function() require('Comment').setup() end
     }
 
-    -- pyright
+    use { 'folke/trouble.nvim',
+        requires = { 'kyazdani42/nvim-web-devicons' }
+    }
+
     use 'neovim/nvim-lspconfig'
     use 'hrsh7th/nvim-cmp'
     use 'hrsh7th/cmp-nvim-lsp'
     use 'saadparwaiz1/cmp_luasnip'
     use 'L3MON4D3/LuaSnip'
+    use {
+        'williamboman/mason.nvim',
+        requires = {
+            "williamboman/mason-lspconfig.nvim"
+        },
+    }
 
     use {
         'nvim-telescope/telescope.nvim',