diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 9373523f..66b50d71 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -5,7 +5,6 @@ augroup AutoSaveGroup
     autocmd BufWinLeave,BufLeave,BufWritePost,BufHidden,QuitPre ?* nested mkview!
     autocmd BufWinEnter ?* silent! loadview
 augroup end
-au BufNewFile,BufRead,BufReadPost *.html.tera set syntax=HTML
 ]], false)
 
 vim.api.nvim_exec([[
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 4e30d843..ee3dd432 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,61 +1,53 @@
 {
-  "SchemaStore.nvim": { "branch": "main", "commit": "a592fbe98959d13014b022ec1b1418498309019c" },
-  "barbecue.nvim": { "branch": "main", "commit": "a0e19486ccc1fb134f6ef7bf914d07bbb462e346" },
-  "chadtree": { "branch": "chad", "commit": "67b12761b2ab6885f1585ef9820221cdeae9100f" },
+  "barbecue.nvim": { "branch": "main", "commit": "0ed58f0c8bc8483f1e6b5e94505d11024e03dabc" },
   "comfortable-motion.vim": { "branch": "master", "commit": "e20aeafb07c6184727b29f7674530150f7ab2036" },
   "copilot.vim": { "branch": "release", "commit": "b6e5624351ba735e25eb8864d7d22819aad00606" },
-  "coq.artifacts": { "branch": "artifacts", "commit": "82e29fb9443f41573483fa83e39490d7a6324c8c" },
-  "coq.thirdparty": { "branch": "3p", "commit": "83b1b7b9545b94f20df42b4ef224de576e628aaf" },
-  "coq_nvim": { "branch": "coq", "commit": "45137deb2a34a8b1482fa0f49927e171223a9173" },
+  "coq.artifacts": { "branch": "artifacts", "commit": "be72c7ad5d8dfe942fd5aec89505805c2e474b93" },
+  "coq.thirdparty": { "branch": "3p", "commit": "ee47eb595100b311ebd81d7285304d58bf28db29" },
+  "coq_nvim": { "branch": "coq", "commit": "4c764a092b0a64ad45d69273fde35224cfb89861" },
   "d2-vim": { "branch": "master", "commit": "981c87dccb63df2887cc41b96e84bf550f736c57" },
   "diffview.nvim": { "branch": "main", "commit": "6bebefbc4c90e6d2b8c65e65b055d284475d89f8" },
+  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
   "formatter.nvim": { "branch": "master", "commit": "ed949c13e1a942db29ababa35e8c7864ced90eb6" },
   "galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" },
   "git-conflict.nvim": { "branch": "main", "commit": "80bc8931d4ed8c8c4d289a08e1838fcf4741408d" },
   "glow.nvim": { "branch": "main", "commit": "a3f24fdaa71d2c25a2b88026032b34f5b6a6e215" },
-  "hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" },
   "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
   "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
-  "leap.nvim": { "branch": "main", "commit": "f74473d23ebf60957e0db3ff8172349a82e5a442" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "1882019270be445a8cad4353f1530574f2b2d02d" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "d88d3564b2ae1d35163ccefda7184d7df104e198" },
-  "mason.nvim": { "branch": "main", "commit": "b54d4e3171cc9735de915dbb97e987fb1f05dad9" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "775c0cdf5be5adcc08f27c9058edb00b5b517520" },
+  "lspsaga.nvim": { "branch": "main", "commit": "5099b46f9fd9747f8c69be228ff54c2cb8ce229f" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a8d5db8f227b9b236d1c54a9c6234bc033825ce7" },
+  "mason.nvim": { "branch": "main", "commit": "2311d9d883eb709ad9979a726a38c5ce1343b63c" },
   "no-neck-pain.nvim": { "branch": "main", "commit": "33db10e593edc7d720c0f5c0320899bd1dd014e1" },
-  "null-ls.nvim": { "branch": "main", "commit": "5855128178fa78293acdfb5b4e41ef046779240b" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-dap": { "branch": "master", "commit": "1dd02e82c77d558e30ba831db4c2e7ed534e874f" },
-  "nvim-dap-ui": { "branch": "master", "commit": "56a2df0e96bfa64ebd6967e7cad877a1530633d5" },
-  "nvim-lspconfig": { "branch": "master", "commit": "7d5af779acbc8a6ff9dfd7f2d39ae898fb67480f" },
+  "nvim-dap": { "branch": "master", "commit": "debd7c2f80eaf20c5f5df25db8d8c1b9b18f4421" },
+  "nvim-dap-ui": { "branch": "master", "commit": "286f682f366fbc652b38dff893569374e9433dd3" },
+  "nvim-lspconfig": { "branch": "master", "commit": "10fa01d553ce10646350461ac5ddc71f189e9d1a" },
   "nvim-navic": { "branch": "master", "commit": "27124a773d362628b114cd12016e743dab4ccf3e" },
-  "nvim-notify": { "branch": "master", "commit": "50d037041ada0895aeba4c0215cde6d11b7729c4" },
-  "nvim-nu": { "branch": "main", "commit": "f45f36a97fb0ea6e39f08cc2fac7a2fb3dc3999b" },
-  "nvim-treesitter": { "branch": "master", "commit": "c85d059c462ae7de0aa2a6ed0589f0b223e0e6a9" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "68eaeb86738c660f7f31afb2cbfb2bdec50bbd92" },
-  "nvim-web-devicons": { "branch": "master", "commit": "0568104bf8d0c3ab16395433fcc5c1638efc25d4" },
+  "nvim-treesitter": { "branch": "master", "commit": "cc360a9beb1b30d172438f640e2c3450358c4086" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "38203f5e6c62617b3c07662dc71ce3047ecd90d3" },
+  "nvim-web-devicons": { "branch": "master", "commit": "f16ec8f6e5d23e4349501dae46e0a661918e086e" },
   "octo.nvim": { "branch": "master", "commit": "f37efab489a99b4a104e5ee18c73453d5e828b62" },
-  "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
+  "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
   "rest.nvim": { "branch": "main", "commit": "0fdb69f328529b34a2279c14be63b3325dc52740" },
   "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
   "sonokai": { "branch": "master", "commit": "a4d96b68fb1ba00fb2e91d2f46705de9cddbb348" },
+  "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
-  "telescope.nvim": { "branch": "master", "commit": "942fe5faef47b21241e970551eba407bc10d9547" },
+  "telescope.nvim": { "branch": "master", "commit": "6258d50b09f9ae087317e392efe7c05a7323492d" },
   "todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" },
-  "toggleterm.nvim": { "branch": "main", "commit": "b86982429325112d2b20c6d0cc7a5c4b182ab705" },
+  "toggleterm.nvim": { "branch": "main", "commit": "2e477f7ee8ee8229ff3158e3018a067797b9cd38" },
   "trouble.nvim": { "branch": "main", "commit": "2ae7237c2917d661f458443c9a88680f8ca2d7b2" },
-  "twilight.nvim": { "branch": "main", "commit": "2e13bd1886562b737f38c418ed542677b41ef5cb" },
-  "vim-abolish": { "branch": "master", "commit": "7a05efb84e6068a0b0801d736b58fc645e5cdfd2" },
-  "vim-base64": { "branch": "master", "commit": "d15253105f6a329cd0632bf9dcbf2591fb5944b8" },
+  "vim-abolish": { "branch": "master", "commit": "cb3dcb220262777082f63972298d57ef9e9455ec" },
   "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
   "vim-fugitive": { "branch": "master", "commit": "ef99f1d90cdb33a52931aed5868785b51fb9411d" },
-  "vim-gh-line": { "branch": "master", "commit": "fbf368bdfad7e5478009a6dc62559e6b2c72d603" },
   "vim-mergetool": { "branch": "master", "commit": "0275a85256ad173e3cde586d54f66566c01b607f" },
   "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
   "vim-speeddating": { "branch": "master", "commit": "5a36fd29df63ea3f65562bd2bb837be48a5ec90b" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" },
-  "which-key.nvim": { "branch": "main", "commit": "4b73390eec680b4c061ea175eb32c0ff3412271d" },
-  "zen-mode.nvim": { "branch": "main", "commit": "d907e638c879642d226d27469b53db6925f69d4c" }
+  "which-key.nvim": { "branch": "main", "commit": "4b73390eec680b4c061ea175eb32c0ff3412271d" }
 }
\ No newline at end of file
diff --git a/config/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua
index e8cf39b7..33fc53a8 100644
--- a/config/nvim/lua/keymaps.lua
+++ b/config/nvim/lua/keymaps.lua
@@ -46,8 +46,8 @@ local normal_mode_maps = {
 
     { key = '<leader>rd', map = [[<cmd>RustDebuggables<cr>]] },
     { key = '<leader>rr', map = [[<cmd>RustRunnables<cr>]] },
-    { key = 'Vff', map = [[<cmd>vertical Gdiffsplit<cr>]] },
-    { key = 'Vff!', map = [[<cmd>vertical Gdiffsplit!<cr>]] },
+    { key = 'vff', map = [[<cmd>vertical Gdiffsplit<cr>]] },
+    { key = 'vff!', map = [[<cmd>vertical Gdiffsplit!<cr>]] },
     { key = 'ssr', map = [[<cmd>lua require'rust-tools'.ssr.ssr(query)<cr>]] },
 
     -- Session
@@ -67,7 +67,8 @@ local normal_mode_maps = {
     { key = 'F', map = [[<cmd>lua vim.lsp.buf.format { async = true }<cr>]] },
     { key = 'T', map = [[<cmd>lua require'lsp_extensions'.inlay_hints()<cr>]] },
 
-    -- { key = '<C-W-%>', map = [[<cmd>vsplit<cr>]] },
+    { key = '<C-W>%', map = [[<cmd>vsplit<cr>]] },
+    { key = '<C-l>', map = [[<cmd>:SymbolsOutline<cr>]] },
 
     -- Other
     { key = '<leader>m', map = [[<cmd>silent !mpcfzf<cr>]] },
diff --git a/config/nvim/lua/lsp/init.lua b/config/nvim/lua/lsp/init.lua
index 3097b21d..90e2adef 100644
--- a/config/nvim/lua/lsp/init.lua
+++ b/config/nvim/lua/lsp/init.lua
@@ -7,14 +7,14 @@ 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 },
-        },
-    },
-}
+-- 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"
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 8e8faec7..ec40fe7c 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -19,165 +19,191 @@ vim.opt.rtp:prepend(lazypath)
 -- local use = require('packer').use
 
 return require('lazy').setup({
-        'ellisonleao/glow.nvim',
-        'samoshkin/vim-mergetool',
+    { "ellisonleao/glow.nvim",         config = true, cmd = "Glow" },
+    'samoshkin/vim-mergetool',
+    'mhartington/formatter.nvim',
+    -- 'christianrondeau/vim-base64',
 
-        'mhartington/formatter.nvim',
-        'christianrondeau/vim-base64',
-
-        'tpope/vim-commentary',
-        'tpope/vim-fugitive',
-        'tpope/vim-repeat',
-        'tpope/vim-speeddating',
-        'tpope/vim-surround',
-        'tpope/vim-vinegar',
-        'tpope/vim-abolish',
-
-        'yuttie/comfortable-motion.vim',
-        'ruanyl/vim-gh-line',
-        'rest-nvim/rest.nvim',
-        'b0o/SchemaStore.nvim',
-        'rcarriga/nvim-notify',
-        'folke/todo-comments.nvim',
-        'github/copilot.vim',
-        'ggandor/leap.nvim',
-        { 'shortcuts/no-neck-pain.nvim', version = "*" },
-        { 'folke/zen-mode.nvim',         config = function() require('zen-mode').setup() end },
-        { 'folke/twilight.nvim',         config = function() require('twilight').setup() end },
-        { 'pwntester/octo.nvim',         config = function() require('octo').setup() end },
-
-        {
-            'utilyre/barbecue.nvim',
-            version = "*",
-            config = function() require('barbecue').setup() end,
-            dependencies = {
-                'neovim/nvim-lspconfig',
-                'SmiteshP/nvim-navic',
-                'nvim-tree/nvim-web-devicons'
-            },
+    'tpope/vim-commentary',
+    'tpope/vim-fugitive',
+    'tpope/vim-repeat',
+    'tpope/vim-speeddating',
+    'tpope/vim-surround',
+    'tpope/vim-vinegar',
+    'tpope/vim-abolish',
+    { 'yuttie/comfortable-motion.vim', lazy = false },
+    -- 'ruanyl/vim-gh-line',
+    'rest-nvim/rest.nvim',
+    -- 'b0o/SchemaStore.nvim',
+    -- 'rcarriga/nvim-notify',
+    'folke/todo-comments.nvim',
+    { 'github/copilot.vim',          event = "LspAttach" },
+    -- 'ggandor/leap.nvim',
+    { 'shortcuts/no-neck-pain.nvim', version = "*" },
+    -- { 'folke/zen-mode.nvim',         config = function() require('zen-mode').setup() end },
+    -- { 'folke/twilight.nvim',         config = function() require('twilight').setup() end },
+    {
+        'pwntester/octo.nvim', cmd = "Octo",
+        config = function()
+            require(
+                'octo').setup()
+        end
+    },
+    {
+        'sainnhe/sonokai',
+        lazy = false,
+        config = function()
+            require(
+                'colorscheme')
+        end
+    },
+    { 'folke/which-key.nvim',        config = function() require("which-key").setup() end },
+    { 'nvim-telescope/telescope.nvim',
+        cmd = "Telescope",
+        dependencies = { 'nvim-lua/plenary.nvim', 'nvim-telescope/telescope-ui-select.nvim', 'nvim-telescope/telescope-fzf-native.nvim' }
+    },
+    {
+        'utilyre/barbecue.nvim',
+        version = "*",
+        config = function() require('barbecue').setup() end,
+        dependencies = {
+            'neovim/nvim-lspconfig',
+            'SmiteshP/nvim-navic',
+            'nvim-tree/nvim-web-devicons'
         },
-
-        { 'akinsho/git-conflict.nvim',
-            version = "*",
-            config = function()
-                require('git-conflict').setup()
-            end
-        },
-
-        { 'williamboman/mason.nvim',
-            config = function()
-                require("mason").setup({
-                    ui = {
-                        icons = {
-                            package_installed = "✓",
-                            package_pending = "➜",
-                            package_uninstalled = "✗"
-                        }
-                    }
-                })
-            end
-        },
-        {
-            "williamboman/mason-lspconfig.nvim",
-            config = function()
-                require("mason-lspconfig").setup({
-                    ensure_installed = { "lua_ls", "rust_analyzer" },
-                    automatic_installation = true,
-                })
-            end
-        },
-
-        {
-            'NTBBloodbath/galaxyline.nvim', branch = 'main',
-            config = function() require('statusline') end,
-            dependencies = { 'nvim-tree/nvim-web-devicons' }
-        },
-        { 'sainnhe/sonokai',               config = function() require('colorscheme') end },
-        { 'folke/which-key.nvim',          config = function() require("which-key").setup() end },
-        { 'nvim-telescope/telescope.nvim', dependencies = { 'nvim-lua/plenary.nvim' } },
-        {
-            'nvim-telescope/telescope-fzf-native.nvim',
-            -- build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build',
-            build = 'make',
-            config = function()
-                require('telescope').setup {
-                    defaults = {
-                        initial_mode = 'insert',
-                    },
-                    extensions = {
-                        fzf = {
-                            fuzzy = true, -- false will only do exact matching
-                            override_generic_sorter = true, -- override the generic sorter
-                            override_file_sorter = true, -- override the file sorter
-                            case_mode = "smart_case", -- or "ignore_case" or "respect_case"
-                        }
+    },
+    {
+        'akinsho/git-conflict.nvim',
+        version = "*",
+        config = function()
+            require('git-conflict').setup()
+        end
+    },
+    {
+        'williamboman/mason.nvim',
+        cmd = { "Mason", "MasonInstall", "MasonUpdate", "MasonUninstall" },
+        config = function()
+            require("mason").setup({
+                ui = {
+                    icons = {
+                        package_installed = "✓",
+                        package_pending = "➜",
+                        package_uninstalled = "✗"
                     }
                 }
-                require('telescope').load_extension('fzf')
-            end,
-        },
-
-        { 'nvim-telescope/telescope-ui-select.nvim',
-            config = function()
-                require("telescope").load_extension("ui-select")
-            end
-        },
-
-
-        { 'norcalli/nvim-colorizer.lua', config = function() require 'colorizer'.setup() end, },
-
-        -- lsp
-        -- use { 'onsails/lspkind-nvim', config = function() require'lspkind'.init() end, }
-        {
-            'folke/trouble.nvim',
-            config = function()
-                -- local actions = require("telescope.actions")
-                require("trouble").setup()
-                local trouble = require("trouble.providers.telescope")
-                local telescope = require("telescope")
-                telescope.setup {
-                    defaults = {
-                        mappings = {
-                            i = { ["<c-t>"] = trouble.open_with_trouble },
-                            n = { ["<c-t>"] = trouble.open_with_trouble },
-                        },
-                    },
-                }
-            end,
-        },
-
-        { 'neovim/nvim-lspconfig',       config = function() require("lsp") end, },
-        { 'nvim-lua/lsp-status.nvim' },
-        { 'ray-x/lsp_signature.nvim' },
-        { 'terrastruct/d2-vim' },
-        {
-            'andweeb/presence.nvim',
-            config = function()
-                require "presence".setup({
-                    auto_update = true,
-                    main_image = "file",
-                })
-            end },
-
-        { 'ms-jpq/coq_nvim', dependencies = { 'ms-jpq/coq.artifacts' }, build = ':COQdeps',
-            config = function()
-                -- require("coq")
-                vim.g.coq_settings.keymap = { jump_to_mark = "<c-j>" }
-            end
-        },
-        { 'jose-elias-alvarez/null-ls.nvim', config = function()
-            local null_ls = require("null-ls")
-            null_ls.setup({
-                sources = {
-                    null_ls.builtins.formatting.stylua,
-                    null_ls.builtins.diagnostics.eslint,
-                    null_ls.builtins.completion.spell,
+            })
+        end
+    },
+    {
+        "williamboman/mason-lspconfig.nvim",
+        config = function()
+            require("mason-lspconfig").setup({
+                ensure_installed = { "lua_ls", "rust_analyzer" },
+                automatic_installation = true,
+            })
+        end
+    },
+    {
+        'NTBBloodbath/galaxyline.nvim', branch = 'main',
+        lazy = false,
+        config = function() require('statusline') end,
+        dependencies = { 'nvim-tree/nvim-web-devicons' }
+    },
+    {
+        'nvim-telescope/telescope-fzf-native.nvim',
+        -- build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build',
+        build = 'make',
+        config = function()
+            require('telescope').setup {
+                defaults = {
+                    initial_mode = 'insert',
                 },
+                extensions = {
+                    fzf = {
+                        fuzzy = true, -- false will only do exact matching
+                        override_generic_sorter = true, -- override the generic sorter
+                        override_file_sorter = true, -- override the file sorter
+                        case_mode = "smart_case", -- or "ignore_case" or "respect_case"
+                    }
+                }
+            }
+            require('telescope').load_extension('fzf')
+        end,
+    },
+    { 'nvim-telescope/telescope-ui-select.nvim',
+        config = function()
+            require("telescope").load_extension("ui-select")
+        end
+    },
+    { 'norcalli/nvim-colorizer.lua', config = function() require 'colorizer'.setup() end, },
+    -- lsp
+    -- use { 'onsails/lspkind-nvim', config = function() require'lspkind'.init() end, }
+    {
+        'folke/trouble.nvim',
+        cmd = {
+            "Trouble",
+            "TroubleClose",
+            "TroubleToggle",
+            "TroubleRefresh",
+        },
+        config = function()
+            -- local actions = require("telescope.actions")
+            require("trouble").setup()
+            local trouble = require("trouble.providers.telescope")
+            local telescope = require("telescope")
+            telescope.setup {
+                defaults = {
+                    mappings = {
+                        i = { ["<c-t>"] = trouble.open_with_trouble },
+                        n = { ["<c-t>"] = trouble.open_with_trouble },
+                    },
+                },
+            }
+        end,
+    },
+    { 'neovim/nvim-lspconfig',
+        ft = { "rust", "toml", "lua" },
+        config = function()
+            require(
+                "lsp")
+        end, },
+    {
+        'nvim-lua/lsp-status.nvim',
+        event = "LspAttach"
+    },
+    {
+        'ray-x/lsp_signature.nvim',
+        event = "LspAttach",
+        config = function()
+            require("lsp_signature").setup({
+                floating_window_above_cur_line = true,
+            })
+        end,
+    },
+    {
+        'terrastruct/d2-vim',
+        ft = "d2",
+    },
+    {
+        'andweeb/presence.nvim',
+        config = function()
+            require "presence".setup({
+                auto_update = true,
+                main_image = "file",
             })
         end },
-
-        { 'ms-jpq/chadtree',        build = ':CHADdeps' },
-        { 'ms-jpq/coq.thirdparty', config = function()
+    {
+        'ms-jpq/coq_nvim',
+        ft = { "rust", "toml", "lua" },
+        dependencies = { 'ms-jpq/coq.artifacts', 'ms-jpq/coq.thirdparty' },
+        build = ':COQdeps',
+        config = function()
+            vim.g.coq_settings.keymap = { jump_to_mark = "<c-j>" }
+        end
+    },
+    -- { 'ms-jpq/chadtree',   build = ':CHADdeps' },
+    { 'ms-jpq/coq.thirdparty',
+        config = function()
             require("coq_3p")({
                 {
                     src = "repl",
@@ -192,81 +218,101 @@ return require('lazy').setup({
                 { src = "dap" }
             })
         end
-        },
+    },
+    -- use 'airblade/vim-rooter'
+    -- use({
+    --     "https://git.sr.ht/~whynothugo/lsp_lines.nvim",
+    --     config = function()
+    --         require("lsp_lines").setup()
+    --     end,
+    -- })
 
-        -- use 'airblade/vim-rooter'
-        -- use({
-        --     "https://git.sr.ht/~whynothugo/lsp_lines.nvim",
-        --     config = function()
-        --         require("lsp_lines").setup()
-        --     end,
-        -- })
+    {
+        'lukas-reineke/indent-blankline.nvim',
+        config = function()
+            require("indent_blankline").setup {
+                show_end_of_line = true,
+            }
+        end
+    },
+    { 'sindrets/diffview.nvim', cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewToggleFiles", "DiffviewFocusFiles", "DiffviewRefresh" }, dependencies = 'nvim-lua/plenary.nvim' },
+    {
+        'akinsho/toggleterm.nvim',
+        cmd = "ToggleTerm",
+        config = function() require 'setup.toggleterm' end,
+    },
+    -- {
+    --     'glepnir/dashboard-nvim',
+    --     config = function() require 'setup.dashboard' end,
+    -- },
 
-        {
-            'lukas-reineke/indent-blankline.nvim',
-            config = function()
-                require("indent_blankline").setup {
-                    show_end_of_line = true,
-                }
-            end
-        },
-
-        { 'sindrets/diffview.nvim', dependencies = 'nvim-lua/plenary.nvim' },
-        {
-            'akinsho/toggleterm.nvim',
-            config = function() require 'setup.toggleterm' end,
-        },
-
-        -- {
-        --     'glepnir/dashboard-nvim',
-        --     config = function() require 'setup.dashboard' end,
-        -- },
-
-        {
-            'nvim-treesitter/nvim-treesitter',
-            build = ':TSUpdate'
-        },
-        {
-            'LhKipp/nvim-nu',
-            dependencies = { 'jose-elias-alvarez/null-ls.nvim' },
-            config = function() require('nu').setup {} end,
-        },
-
-        {
-            'nvim-treesitter/nvim-treesitter-context',
-            dependencies = { 'nvim-treesitter/nvim-treesitter' }
-        },
-
-        -- {
-        --     'saecki/crates.nvim',
-        --     tag = 'v0.2.1',
-        --     dependencies = { 'nvim-lua/plenary.nvim' },
-        --     config = function()
-        --         require('crates').setup {
-        --             src = {
-        --                 coq = {
-        --                     enabled = true,
-        --                     name = "crates.nvim",
-        --                 },
-        --             },
-        --         }
-        --     end,
-        -- },
-        { 'simrat39/rust-tools.nvim', config = function() require 'setup.rust-tools' end },
-
-
-        {
-            "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap" },
-            config = function() require("dapui").setup() end
-        },
-
-        {
-            'phaazon/hop.nvim',
-            branch = 'v2', -- optional but strongly recommended
-            config = function()
-                -- you can configure Hop the way you like here; see :h hop-config
-                require 'hop'.setup { keys = 'etovxqpdygfblzhckisuran' }
-            end
-        },
-
-    });
+    {
+        'nvim-treesitter/nvim-treesitter',
+        build = ':TSUpdate'
+    },
+    {
+        'nvim-treesitter/nvim-treesitter-context',
+        dependencies = { 'nvim-treesitter/nvim-treesitter' }
+    },
+    -- {
+    --     'saecki/crates.nvim',
+    --     tag = 'v0.2.1',
+    --     dependencies = { 'nvim-lua/plenary.nvim' },
+    --     config = function()
+    --         require('crates').setup {
+    --             src = {
+    --                 coq = {
+    --                     enabled = true,
+    --                     name = "crates.nvim",
+    --                 },
+    --             },
+    --         }
+    --     end,
+    -- },
+    { 'simrat39/rust-tools.nvim', ft = 'rust', config = function()
+        require 'setup.rust-tools'
+    end, dependencies = "ms-jpq/coq_nvim" },
+    {
+        "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap" },
+        config = function() require("dapui").setup() end
+    },
+    -- {
+    --     'phaazon/hop.nvim',
+    --     branch = 'v2', -- optional but strongly recommended
+    --     config = function()
+    --         -- you can configure Hop the way you like here; see :h hop-config
+    --         require 'hop'.setup { keys = 'etovxqpdygfblzhckisuran' }
+    --     end
+    -- },
+    -- https://github.com/simrat39/symbols-outline.nvim
+    {
+        'simrat39/symbols-outline.nvim',
+        cmd = "SymbolsOutline",
+        config = function()
+            require('symbols-outline').setup()
+        end
+    },
+    {
+        "glepnir/lspsaga.nvim",
+        event = "LspAttach",
+        config = function()
+            require("lspsaga").setup({})
+        end,
+        dependencies = {
+            { "nvim-tree/nvim-web-devicons" },
+            --Please make sure you install markdown and markdown_inline parser
+            { "nvim-treesitter/nvim-treesitter" }
+        }
+    },
+    {
+        'j-hui/fidget.nvim',
+        event = "LspAttach",
+        config = function()
+            require("fidget").setup({})
+        end
+    }
+}, {
+    defaults = {
+        lazy = true,
+    }
+});