diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 985075dc..80660e6c 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -68,25 +68,25 @@ vim.g.suda_smart_edit = 1
 -- }
 
 
-vim.o.completeopt = 'menuone,noselect'
+vim.o.completeopt = 'menu,menuone,noselect'
 
-vim.g.coq_settings = {
-    auto_start = 'shut-up',
-    weights = {
-        prefix_matches = 4
-    },
-    clients = {
-        lsp = {
-            weight_adjust = 2
-        },
-        -- buffers = {
-        --     -- weight_adjust = -0.5
-        -- },
-        -- snippets = {
-        --     -- weight_adjust = -0.1
-        -- }
-    }
-}
+-- vim.g.coq_settings = {
+--     auto_start = 'shut-up',
+--     weights = {
+--         prefix_matches = 4
+--     },
+--     clients = {
+--         lsp = {
+--             weight_adjust = 2
+--         },
+--         -- buffers = {
+--         --     -- weight_adjust = -0.5
+--         -- },
+--         -- snippets = {
+--         --     -- weight_adjust = -0.1
+--         -- }
+--     }
+-- }
 -- vim.g.rooter_manual_only = 1
 
 local fnm_dir = os.getenv("FNM_DIR") or "/Users/fs0c131y/Library/Application Support/fnm"
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 660259a3..0c053736 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -15,22 +15,22 @@
   "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
   "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
-  "lspsaga.nvim": { "branch": "main", "commit": "c9b17bc7dc694bdbeb3788a583518073a30a6de2" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" },
-  "mason.nvim": { "branch": "main", "commit": "ee6a7f179ebf8aa9da9d53b1cf1b57d292ea0182" },
-  "neorg": { "branch": "main", "commit": "a6c2c4d17c139e942c069cac458c12e65d7e75d3" },
+  "lspsaga.nvim": { "branch": "main", "commit": "798c1b650d541bb14492fb54d533673162fb848f" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "20fd7f50f34b59031a7c3bbc2c207f4f60037628" },
+  "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
+  "neorg": { "branch": "main", "commit": "851a3a2b3cea5335fca233273d3c8861a017da14" },
   "no-neck-pain.nvim": { "branch": "main", "commit": "6000e12d13188e008e9539085c24ff34794da40b" },
   "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
   "nvim-dap": { "branch": "master", "commit": "0e6b7c47dd70e80793ed39271b2aa712d9366dbc" },
-  "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "0517d8522dcec286b1dba47aa3ee1ed8f523aed6" },
+  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d177ad277a638f262edb73c75ffe33e377b95dc5" },
   "nvim-nu": { "branch": "main", "commit": "f45f36a97fb0ea6e39f08cc2fac7a2fb3dc3999b" },
-  "nvim-treesitter": { "branch": "master", "commit": "80b4fa7970ee159e5c2c715bbcd386143c48dcb1" },
+  "nvim-treesitter": { "branch": "master", "commit": "15d327fe6324d8269451131ec34ad4f2a8ef1e01" },
   "nvim-treesitter-context": { "branch": "master", "commit": "b6c763db8cc486215ba96e0a67418848a710ab25" },
-  "nvim-web-devicons": { "branch": "master", "commit": "bc11ee2498de2310de5776477dd9dce65d03b464" },
+  "nvim-web-devicons": { "branch": "master", "commit": "925e2aa30dc9fe9332060199c19f132ec0f3d493" },
   "octo.nvim": { "branch": "master", "commit": "d1e52f9b3c755fcebb93d635821663a2c0f53281" },
-  "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" },
+  "plenary.nvim": { "branch": "master", "commit": "0232372b906f275f76ac42029eba25eaf95e76b9" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
   "rest.nvim": { "branch": "main", "commit": "22673c848768ff25517154a5aebfebc0c77d0b4f" },
   "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
@@ -38,16 +38,16 @@
   "ssr.nvim": { "branch": "main", "commit": "b2f35df231c6b090f6eb023ddf2ad0cb88d90eb4" },
   "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
-  "telescope.nvim": { "branch": "master", "commit": "20a37e43bb43c74c6091f9fea6551af0964ad45a" },
+  "telescope.nvim": { "branch": "master", "commit": "a19770625aed49ad2a9f591a5e3946707f7359f6" },
   "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
-  "toggleterm.nvim": { "branch": "main", "commit": "f2c720746238bc3ec620fe4bf92b58368317c266" },
+  "toggleterm.nvim": { "branch": "main", "commit": "0427b908ebefcb3701c7f2cfbdafa37d11afe71a" },
   "tree-sitter-just": { "branch": "main", "commit": "4e5f5f3ff37b12a1bbf664eb3966b3019e924594" },
   "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" },
   "vim-abolish": { "branch": "master", "commit": "cb3dcb220262777082f63972298d57ef9e9455ec" },
   "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
-  "vim-fugitive": { "branch": "master", "commit": "d4914b361b081c4d983e924f1dd337c143152833" },
+  "vim-fugitive": { "branch": "master", "commit": "6fcb0ad03982de646e3fecb6915e585651b9a9fb" },
   "vim-mergetool": { "branch": "master", "commit": "0275a85256ad173e3cde586d54f66566c01b607f" },
   "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
   "vim-speeddating": { "branch": "master", "commit": "5a36fd29df63ea3f65562bd2bb837be48a5ec90b" },
diff --git a/config/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua
new file mode 100644
index 00000000..c977f6d9
--- /dev/null
+++ b/config/nvim/lua/lsp.lua
@@ -0,0 +1,26 @@
+local lspconfig = require 'lspconfig'
+local lspstatus = require 'lsp-status'
+
+local cmp_nvim_lsp = require 'cmp_nvim_lsp'
+local capabilities = cmp_nvim_lsp.default_capabilities()
+require("mason-lspconfig").setup_handlers {
+    function(server_name) -- default handler (optional)
+        lspconfig[server_name].setup {
+            on_attach = lspstatus.on_attach,
+            capabilities = capabilities,
+        }
+    end,
+    ["rust_analyzer"] = function()
+        -- require 'lazy'.load('rust-tools');
+        vim.cmd([[autocmd BufEnter *.rs lua require("setup.rtools")]])
+    end,
+    ["clangd"] = function()
+        lspconfig.clangd.setup {
+            capabilities = capabilities,
+            cmd = { "clangd" },
+            filetypes = { "c", "cpp", "objc", "objcpp" },
+            root_dir = lspconfig.util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"),
+            single_file_support = true,
+        }
+    end,
+}
diff --git a/config/nvim/lua/lsp/clangd.lua b/config/nvim/lua/lsp/clangd.lua
deleted file mode 100644
index 9741e4b6..00000000
--- a/config/nvim/lua/lsp/clangd.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require'lsp-status'
--- local coq = require'coq'
-
-lspconfig.clangd.setup {
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-    capabilities = lspstatus.capabilities,
-    cmd = { "clangd" },
-    filetypes = { "c", "cpp", "objc", "objcpp" },
-    root_dir = lspconfig.util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"),
-    single_file_support = true,
-}
diff --git a/config/nvim/lua/lsp/deno.lua b/config/nvim/lua/lsp/deno.lua
deleted file mode 100644
index 0e063664..00000000
--- a/config/nvim/lua/lsp/deno.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require'lsp-status'
-local coq = require'coq'
-
-lspconfig.denols.setup{
-    on_attach=function(client) lspstatus.on_attach(client)  return end,
-    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-}
-
diff --git a/config/nvim/lua/lsp/init.lua b/config/nvim/lua/lsp/init.lua
deleted file mode 100644
index a7fc2a99..00000000
--- a/config/nvim/lua/lsp/init.lua
+++ /dev/null
@@ -1,41 +0,0 @@
--- local lspstatus = require('lsp-status')
--- lspstatus.register_progress()
-
-require 'lsp.lua-language-server'
-require 'lsp.clangd'
-
-require 'lspconfig'.tsserver.setup {}
--- require 'lspconfig'.pyright.setup {}
-require 'lspconfig'.sqlls.setup {}
--- require 'lspconfig'.jsonls.setup {
---     settings = {
---         json = {
---             schemas = require('schemastore').json.schemas(),
---             validate = { enable = true },
---         },
---     },
--- }
-
--- Set completeopt to have a better completion experience
--- vim.o.completeopt= "menuone,noinsert,noselect"
-vim.o.completeopt = "menuone,noselect"
-
--- vim.api.nvim_command [[autocmd CursorHold  <buffer> lua vim.lsp.buf.document_highlight()]]
--- vim.api.nvim_command [[autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()]]
--- vim.api.nvim_command [[autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()]]
---
-vim.api.nvim_buf_set_option(0, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
--- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-local lspconfig = require 'lspconfig'
-local lspstatus = require 'lsp-status'
--- local coq = require 'coq'
-
-require('mason-lspconfig').setup_handlers({
-    function(server_name)
-        lspconfig[server_name].setup({
-            on_attach = lspstatus.on_attach,
-            capabilities = lspstatus.capabilities,
-        })
-    end,
-})
diff --git a/config/nvim/lua/lsp/lua-language-server.lua b/config/nvim/lua/lsp/lua-language-server.lua
deleted file mode 100644
index 14c5a783..00000000
--- a/config/nvim/lua/lsp/lua-language-server.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-local lspconfig = require 'lspconfig'
-local lspstatus = require('lsp-status')
--- local coq = require 'coq'
-
-lspconfig.lua_ls.setup {
-    cmd = { "lua-language-server" },
-    on_attach = function(client) lspstatus.on_attach(client) end,
-    capabilities = lspstatus.capabilities,
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-    filetypes = { "lua" },
-    log_level = 2,
-    settings = {
-      Lua = {
-        diagnostics = {
-            globals = { 'vim' },
-        },
-        telemetry = {
-            enable = false,
-        },
-        formatting = {
-            end_of_line = 'lf',
-        },
-      }
-    }
-}
diff --git a/config/nvim/lua/lsp/pyls.lua b/config/nvim/lua/lsp/pyls.lua
deleted file mode 100644
index 2483bbb0..00000000
--- a/config/nvim/lua/lsp/pyls.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require('lsp-status')
-local coq = require'coq'
-
-lspconfig.pyls.setup{
-    cmd = { "pyls" },
-    on_attach=function(client) lspstatus.on_attach(client)  return end,
-    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-    filetypes = { "python" },
-}
diff --git a/config/nvim/lua/lsp/pyright.lua b/config/nvim/lua/lsp/pyright.lua
deleted file mode 100644
index 77ad1682..00000000
--- a/config/nvim/lua/lsp/pyright.lua
+++ /dev/null
@@ -1 +0,0 @@
-require'lspconfig'.pyright.setup{}
diff --git a/config/nvim/lua/lsp/rust-analyzer.lua b/config/nvim/lua/lsp/rust-analyzer.lua
deleted file mode 100644
index 4b156d91..00000000
--- a/config/nvim/lua/lsp/rust-analyzer.lua
+++ /dev/null
@@ -1,43 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require'lsp-status'
-local coq = require'coq'
-
-lspconfig.rust_analyzer.setup{
-    on_attach=function(client) lspstatus.on_attach(client) end,
-    capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-    cmd = { "rust-analyzer" },
-    filetypes = { "rust" },
-    root_dir = lspconfig.util.root_pattern("Cargo.toml"),
-    settings = {
-        ["rust-analyzer"] = {
-            lruCapacity = 64,
-            assist = {
-                importGranularity = "module",
-                importPrefix = "by_crate",
-            },
-            procMacro = {
-                enable = true,
-            },
-            checkOnSave = {
-                command = "clippy",
-                allTargets = false,
-            },
-            cargo = {
-                loadOutDirsFromCheck = true,
-                -- allFeatures = true,
-            },
-            completion = {
-                autoimport = {
-                    enable = true,
-                }
-            },
-            diagnostics = {
-                disabled = {
-                    "unresolved-macro-call"
-                }
-            }
-
-        }
-    },
-}
-
diff --git a/config/nvim/lua/lsp/solang.lua b/config/nvim/lua/lsp/solang.lua
deleted file mode 100644
index c1867ef9..00000000
--- a/config/nvim/lua/lsp/solang.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require'lsp-status'
--- local coq = require'coq'
-
-lspconfig.solang.setup{
-    on_attach=function(client) lspstatus.on_attach(client) end,
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-}
diff --git a/config/nvim/lua/lsp/tsserver.lua b/config/nvim/lua/lsp/tsserver.lua
deleted file mode 100644
index eccec78a..00000000
--- a/config/nvim/lua/lsp/tsserver.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-local lspconfig = require'lspconfig'
-local lspstatus = require'lsp-status'
--- local coq = require'coq'
-
-lspconfig.tsserver.setup{
-    on_attach=function(client) lspstatus.on_attach(client)  return end,
-    -- capabilities = coq.lsp_ensure_capabilities(lspstatus.capabilities),
-}
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index f1ee441e..2210fb39 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -53,8 +53,7 @@ return require('lazy').setup({
     {
         'github/copilot.vim',
         event = "LspAttach",
-        cmd =
-        "Copilot"
+        cmd = "Copilot",
     },
     -- 'ggandor/leap.nvim',
     {
@@ -147,7 +146,7 @@ return require('lazy').setup({
                     }
                 }
             })
-        end
+        end,
     },
     {
         "williamboman/mason-lspconfig.nvim",
@@ -156,7 +155,8 @@ return require('lazy').setup({
                 ensure_installed = { "lua_ls", "rust_analyzer", "pylsp" },
                 automatic_installation = true,
             })
-        end
+        end,
+        lazy = false,
     },
     {
         'NTBBloodbath/galaxyline.nvim',
@@ -239,11 +239,28 @@ return require('lazy').setup({
             require("lsp")
         end
     },
-    { 'hrsh7th/cmp-nvim-lsp', lazy = false },
-    { 'hrsh7th/cmp-buffer', lazy = false },
-    { 'hrsh7th/cmp-path', lazy = false },
-    { 'hrsh7th/cmp-cmdline', lazy = false },
-    { 'hrsh7th/nvim-cmp', lazy = false },
+    { 'hrsh7th/cmp-nvim-lsp',        lazy = false },
+    { 'hrsh7th/cmp-buffer',          lazy = false },
+    { 'hrsh7th/cmp-path',            lazy = false },
+    { 'hrsh7th/cmp-cmdline',         lazy = false },
+    {
+        'hrsh7th/nvim-cmp',
+        lazy = false,
+        setup = function()
+            local cmp = require("cmp")
+            -- print!"setting up cmp");
+            cmp.setup({
+                view = cmp.config.view({
+                    entries = { name = 'custom', selection_order = 'near_cursor' }
+                }),
+                sources = cmp.config.sources({
+                    { name = 'buffer' },
+                    { name = 'nvim_lsp' },
+                    { name = 'path' },
+                }),
+            })
+        end
+    },
     {
         'nvim-lua/lsp-status.nvim',
         event = "LspAttach"
@@ -356,9 +373,8 @@ return require('lazy').setup({
         'simrat39/rust-tools.nvim',
         ft = 'rust',
         config = function()
-            require 'setup.rust-tools'
+            require 'setup.rtools'
         end,
-        -- dependencies = "ms-jpq/coq_nvim"
     },
 
 
@@ -442,6 +458,6 @@ return require('lazy').setup({
 
 }, {
     defaults = {
-        lazy = true,
+        lazy = false,
     }
 });
diff --git a/config/nvim/lua/setup/rust-tools.lua b/config/nvim/lua/setup/rtools.lua
similarity index 98%
rename from config/nvim/lua/setup/rust-tools.lua
rename to config/nvim/lua/setup/rtools.lua
index a4201b86..d256a084 100644
--- a/config/nvim/lua/setup/rust-tools.lua
+++ b/config/nvim/lua/setup/rtools.lua
@@ -7,7 +7,6 @@ local liblldb_path = '/Users/fs0c131y/.vscode-oss/extensions/vadimcn.vscode-lldb
 local rt = require('rust-tools')
 local lspstatus = require('lsp-status')
 -- local lsp_signature = require('lsp_signature')
--- local coq = require('coq')
 
 local opts = {
     tools = { -- rust-tools options
@@ -230,7 +229,8 @@ local opts = {
             -- lsp_signature.on_attach(client, bufnr)
             lspstatus.on_attach(client)
         end,
-        capabilities = lspstatus.capabilities,
+        -- capabilities = lspstatus.capabilities,
+        capabilities = require('cmp_nvim_lsp').default_capabilities(),
 
     }, -- rust-analyer options
     -- debugging stuff