diff --git a/nvim/.config/nvim/lua/plugin/lspconfig.lua b/nvim/.config/nvim/lua/plugin/lspconfig.lua
index c49075b..ff1be79 100644
--- a/nvim/.config/nvim/lua/plugin/lspconfig.lua
+++ b/nvim/.config/nvim/lua/plugin/lspconfig.lua
@@ -29,7 +29,7 @@ return {
                 end, bufopts)
                 vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
                 vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
-                vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
+                vim.keymap.set('n', '<space>a', vim.lsp.buf.code_action, bufopts)
                 vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
                 vim.keymap.set('n', '<space>fm', function() vim.lsp.buf.format { async = true } end, bufopts)
             end
@@ -70,6 +70,7 @@ return {
 
     {
         "williamboman/mason.nvim",
+        lazy = true,
         cmd = "Mason",
         config = function()
             require("mason").setup({
diff --git a/nvim/.config/nvim/lua/plugin/null-ls.lua b/nvim/.config/nvim/lua/plugin/null-ls.lua
index daf38f3..fcdda5c 100644
--- a/nvim/.config/nvim/lua/plugin/null-ls.lua
+++ b/nvim/.config/nvim/lua/plugin/null-ls.lua
@@ -2,9 +2,32 @@ return {
     {
         "jose-elias-alvarez/null-ls.nvim",
         -- event = "BufReadPost",
+        dependencies = {
+            {
+                "nvim-telescope/telescope-ui-select.nvim",
+                lazy = true,
+                config = function ()
+                    -- This is your opts table
+                    require("telescope").setup {
+                        extensions = {
+                            ["ui-select"] = {
+                                -- require("telescope.themes").get_dropdown {
+                                    --     -- even more opts
+                                    -- }
+                                }
+                            }
+                        }
+                        require("telescope").load_extension("ui-select")
+                    end,
+                },
+            },
         opts = function()
             local null_ls = require('null-ls')
             return {
+                on_attach = function(client, bufnr)
+                    local bufopts = { noremap = true, silent = true, buffer = bufnr }
+                    vim.keymap.set('n', '<space>a', vim.lsp.buf.code_action, bufopts)
+                end,
                 sources = {
                     null_ls.builtins.diagnostics.trail_space.with{
                         disabled_filetypes = { "lua" }
diff --git a/nvim/.config/nvim/lua/plugin/telescope.lua b/nvim/.config/nvim/lua/plugin/telescope.lua
index 3602661..d7f5243 100644
--- a/nvim/.config/nvim/lua/plugin/telescope.lua
+++ b/nvim/.config/nvim/lua/plugin/telescope.lua
@@ -13,7 +13,6 @@ return {
             {"<leader>/", "<cmd>Telescope live_grep<cr>", desc = "Grep Content in Files" },
             {"<leader>fG", "<cmd>Telescope git_files<cr>", desc = "Find Git Files" },
             {"<leader>fk", "<cmd>Telescope keymaps<cr>", desc = "Find Git Files" },
-
         },
     },
 }