diff --git a/.config/nvim/lua/kamu/plugins/lsp.lua b/.config/nvim/lua/kamu/plugins/lsp.lua
index 5611cc2..c4d110c 100644
--- a/.config/nvim/lua/kamu/plugins/lsp.lua
+++ b/.config/nvim/lua/kamu/plugins/lsp.lua
@@ -1,61 +1,76 @@
-return {
-  'VonHeikemen/lsp-zero.nvim',
-  branch = 'v3.x',
-  dependencies = {
-    'williamboman/mason.nvim',
-    'williamboman/mason-lspconfig.nvim',
-    'neovim/nvim-lspconfig',
-    'hrsh7th/cmp-nvim-lsp',
-    'hrsh7th/nvim-cmp',
-    'L3MON4D3/LuaSnip'
-  },
-  config = function()
-    local lsp_zero = require('lsp-zero')
-
-    lsp_zero.on_attach(function(client, bufnr)
-      local opts = {buffer = bufnr, remap = false}
-
-      vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
-      vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
-      vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
-      vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
-      vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
-      vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
-      vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
-      vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
-      vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
-      vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
-    end)
-
-    require('mason').setup({})
-    require('mason-lspconfig').setup({
-      ensure_installed = {'rust_analyzer'},
-      handlers = {
-        lsp_zero.default_setup,
-        lua_ls = function()
-          local lua_opts = lsp_zero.nvim_lua_ls()
-          require('lspconfig').lua_ls.setup(lua_opts)
-        end,
-      }
-    })
-
-    local cmp = require('cmp')
-    local cmp_select = {behavior = cmp.SelectBehavior.Select}
-
-    cmp.setup({
-      sources = {
-        {name = 'path'},
-        {name = 'nvim_lsp'},
-        {name = 'nvim_lua'},
-      },
-      formatting = lsp_zero.cmp_format(),
-      mapping = cmp.mapping.preset.insert({
-        ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
-        ['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
-        ['<Enter>'] = cmp.mapping.confirm({ select = true }),
-        ['<C-Space>'] = cmp.mapping.complete(),
-      }),
-    })
-  end,
-}
-
+return {
+  {
+    -- lsp client plugin
+    "neovim/nvim-lspconfig",               -- https://github.com/neovim/nvim-lspconfig
+    dependencies = {
+      "williamboman/mason.nvim",           -- https://github.com/williamboman/mason.nvim
+      "williamboman/mason-lspconfig.nvim", -- https://github.com/williamboman/mason-lspconfig.nvim bridges the gab between lspconfig and mason
+      -- "folke/neodev.nvim",                 -- https://github.com/folke/neodev.nvim
+    },
+    config = function()
+      local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
+      require('mason').setup()
+      require('mason-lspconfig').setup({
+        ensure_installed = {
+          'lua_ls',
+        },
+        handlers = {
+          -- set up all installed servers automatically
+          function(server_name)
+            require("lspconfig")[server_name].setup({
+              -- print(server_name),
+              capabilities = capabilities
+            })
+          end,
+
+          ["ansiblels"] = function()
+            require("lspconfig")['ansiblels'].setup({
+              filetypes = {
+                "yaml",
+              },
+              -- settings = {
+              -- },
+            })
+          end,
+        }
+      })
+
+      -- require("neodev").setup({})
+
+      vim.api.nvim_create_autocmd('LspAttach', {
+        group = vim.api.nvim_create_augroup('KamuLspConfig', {}),
+        callback = function(ev)
+          local opts = { buffer = ev.buf }
+          vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
+          vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
+          vim.keymap.set("n", "<leader>ca", function() vim.lsp.buf.code_action() end, opts)
+          vim.keymap.set('n', '<space>f', function()
+            vim.lsp.buf.format { async = true }
+          end, opts)
+
+          vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
+          vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
+          vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
+          vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
+          vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
+          vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
+          vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
+        end,
+      })
+    end
+  },
+  {
+    "nvimtools/none-ls.nvim",
+    config = function()
+      local null_ls = require("null-ls")
+
+      null_ls.setup({
+        sources = {
+          null_ls.builtins.formatting.black,
+          null_ls.builtins.formatting.isort,
+        }
+      })
+    end
+  }
+}