diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index a90a333e..7c985983 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -114,3 +114,5 @@ require 'nvim-treesitter.configs'.setup {
         additional_vim_regex_highlighting = false,
     },
 }
+
+vim.notify = require 'notify'
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index 50dfdbad..00d59cee 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -1,37 +1,44 @@
 {
-  "chadtree": { "branch": "chad", "commit": "3419e7614e69be6107b6a6f4a0c4c4bff0da33e2" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "69eacd9df20b14174b3209d74128bffbe711ed85" },
+  "barbecue.nvim": { "branch": "main", "commit": "dce6e9c47fd4f78a989471c2c3858b4c1ee42991" },
+  "chadtree": { "branch": "chad", "commit": "ed78c1968dfd3b9aa2a3444fce0482c06ee65a17" },
   "comfortable-motion.vim": { "branch": "master", "commit": "e20aeafb07c6184727b29f7674530150f7ab2036" },
   "copilot.vim": { "branch": "release", "commit": "8c8416488ef21483dd5d2922ea194c05e9a3baaf" },
-  "coq.artifacts": { "branch": "artifacts", "commit": "e8fedcb9fbedc60c8d0f30accdd72b53e998d8af" },
-  "coq.thirdparty": { "branch": "3p", "commit": "c3cc8cfe780449d8773392a741d5b15e7e9fc83c" },
-  "coq_nvim": { "branch": "coq", "commit": "929adacab097dd2c36c797c8f9323886b4439a9c" },
+  "coq.artifacts": { "branch": "artifacts", "commit": "a28e3f5ca0652d48456129ffe5003ad6aaabcf0a" },
+  "coq.thirdparty": { "branch": "3p", "commit": "d48f1315617092a8c0db29c2fd2d81d5e244c555" },
+  "coq_nvim": { "branch": "coq", "commit": "bd310c6ecb703cf63957f4eb435f585d9d4b6f95" },
   "crates.nvim": { "branch": "main", "commit": "e02eadc598b03d618c22200b0e7979048f6f96b1" },
-  "dashboard-nvim": { "branch": "master", "commit": "f7d623457d6621b25a1292b24e366fae40cb79ab" },
-  "diffview.nvim": { "branch": "main", "commit": "5bbcf162d03287296fe393f88da6065db3cf9fd0" },
+  "dashboard-nvim": { "branch": "master", "commit": "1b1d6ed690cbd33a50470190f633d4afbb9e8607" },
+  "diffview.nvim": { "branch": "main", "commit": "7de7334ef61a3f3806b1616c2d785b8bbf080060" },
   "formatter.nvim": { "branch": "master", "commit": "8a4c961330cc4688087f23d18fa7d2f1af9a4902" },
   "galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" },
-  "glow.nvim": { "branch": "main", "commit": "c88184a0bbd3e32e0274ad8c3782aba718f1053c" },
+  "git-conflict.nvim": { "branch": "main", "commit": "80bc8931d4ed8c8c4d289a08e1838fcf4741408d" },
+  "glow.nvim": { "branch": "main", "commit": "77b5cb1235c3a7d9be9d8cf6e0454d2528414911" },
   "hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" },
   "indent-blankline.nvim": { "branch": "master", "commit": "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7" },
-  "lazy.nvim": { "branch": "main", "commit": "75dcd5741d76e09b1a41c771fbc8b010a109b5cb" },
+  "lazy.nvim": { "branch": "main", "commit": "b64ebb71d4e573a34b0b83801eee60cc6d86a06e" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "5b388c0de30f1605671ebfb9a20a620cda50ffce" },
-  "mason.nvim": { "branch": "main", "commit": "41d6a88c9d08380f7e1e33d8471ffe36c0900347" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "c29f9a9f9b01528ca6a44cd14814f5af20778f7a" },
+  "mason.nvim": { "branch": "main", "commit": "e7303a1632c004ebd2dcd0be1aaa4354586c030b" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
   "nvim-dap": { "branch": "master", "commit": "c64a6627bb01eb151da96b28091797beaac09536" },
-  "nvim-dap-ui": { "branch": "master", "commit": "b80227ea56a48177786904f6322abc8b2dc0bc36" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d228bcf7cd94611929482a09e114a42c41fe81a8" },
-  "nvim-treesitter": { "branch": "master", "commit": "c9615952e71397cec4cf89a9a0db0fb9c491a5e1" },
-  "nvim-web-devicons": { "branch": "master", "commit": "6c38926351372ea87034dec26182b62c835ff3bc" },
+  "nvim-dap-ui": { "branch": "master", "commit": "6b6081ad244ae5aa1358775cc3c08502b04368f9" },
+  "nvim-lspconfig": { "branch": "master", "commit": "582842c158968a59ed5acf9439bc6eaf637f1839" },
+  "nvim-navic": { "branch": "master", "commit": "7a2b823152fe4de65ee7925b0e32d26ed73bc57c" },
+  "nvim-notify": { "branch": "master", "commit": "bdd647f61a05c9b8a57c83b78341a0690e9c29d7" },
+  "nvim-treesitter": { "branch": "master", "commit": "ce6390393aaf250a6b0f513023899a342883d0df" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3548363849878ef895ce54edda02421279b419d8" },
   "plenary.nvim": { "branch": "master", "commit": "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826" },
-  "rest.nvim": { "branch": "main", "commit": "090e253c114b6d5448bac5869a28a6623c195e3a" },
+  "rest.nvim": { "branch": "main", "commit": "0fdb69f328529b34a2279c14be63b3325dc52740" },
   "rust-tools.nvim": { "branch": "master", "commit": "df584e84393ef255f5b8cbd709677d6a3a5bf42f" },
-  "sonokai": { "branch": "master", "commit": "e2e89497f178bec568a0a43cda651f0429ec8ec1" },
+  "sonokai": { "branch": "master", "commit": "c55985d5df53751a44fc532a53bed3be9f3b0d14" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "fab3e2212e206f4f8b3bbaa656e129443c9b802e" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
-  "telescope.nvim": { "branch": "master", "commit": "2f32775405f6706348b71d0bb8a15a22852a61e4" },
+  "telescope.nvim": { "branch": "master", "commit": "dce1156ca103b8222e4abbfc63f9c6887abf5ec6" },
+  "todo-comments.nvim": { "branch": "main", "commit": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1" },
   "toggleterm.nvim": { "branch": "main", "commit": "a54e6c471ce1cd8ef8357e34598a28a955297131" },
-  "trouble.nvim": { "branch": "main", "commit": "b2a0afac2c319a481f0f0318963a74d672ba5766" },
+  "trouble.nvim": { "branch": "main", "commit": "490f7fe6d227f4f7a64f00be8c7dcd7a508ed271" },
+  "twilight.nvim": { "branch": "main", "commit": "9410252bed96887ca5a86bf16435a3a51a0e6ce5" },
   "vim-abolish": { "branch": "master", "commit": "aa3428b734ddbd0105615832843f619774a6871e" },
   "vim-base64": { "branch": "master", "commit": "d15253105f6a329cd0632bf9dcbf2591fb5944b8" },
   "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
@@ -42,5 +49,6 @@
   "vim-speeddating": { "branch": "master", "commit": "5a36fd29df63ea3f65562bd2bb837be48a5ec90b" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" },
-  "which-key.nvim": { "branch": "main", "commit": "e4fa445065a2bb0bbc3cca85346b67817f28e83e" }
+  "which-key.nvim": { "branch": "main", "commit": "684e96c5e8477f1ee9b3f2e9a12d802fd12c5531" },
+  "zen-mode.nvim": { "branch": "main", "commit": "2c8f9f3758a4c430ff867e547741424ac16208bb" }
 }
\ No newline at end of file
diff --git a/config/nvim/lua/lsp/init.lua b/config/nvim/lua/lsp/init.lua
index e932ea60..3097b21d 100644
--- a/config/nvim/lua/lsp/init.lua
+++ b/config/nvim/lua/lsp/init.lua
@@ -1,15 +1,20 @@
 -- local lspstatus = require('lsp-status')
 -- lspstatus.register_progress()
 
-require("lsp.lua-language-server")
-require("lsp.clangd")
--- require("lsp.tsserver")
--- require("lsp.pyright")
--- require("lsp.rust-analyzer")
--- require 'lspconfig'.clangd.setup {}
+require 'lsp.lua-language-server'
+require 'lsp.clangd'
+
 require 'lspconfig'.tsserver.setup {}
 require 'lspconfig'.pyright.setup {}
-require 'lspconfig'.sqls.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"
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 12244443..6ec62ecb 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -36,6 +36,30 @@ return require('lazy').setup({
     'yuttie/comfortable-motion.vim',
     'ruanyl/vim-gh-line',
     'rest-nvim/rest.nvim',
+    'b0o/SchemaStore.nvim',
+    'rcarriga/nvim-notify',
+    'folke/todo-comments.nvim',
+
+    { 'folke/zen-mode.nvim', config = function() require('zen-mode').setup() end },
+    { 'folke/twilight.nvim', config = function() require('twilight').setup() end },
+
+    {
+        '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()
@@ -63,7 +87,7 @@ return require('lazy').setup({
     {
         'NTBBloodbath/galaxyline.nvim', branch = 'main',
         config = function() require('statusline') end,
-        dependencies = { 'kyazdani42/nvim-web-devicons' }
+        dependencies = { 'nvim-tree/nvim-web-devicons' }
     },
     { 'sainnhe/sonokai', config = function() require('colorscheme') end },
     { 'folke/which-key.nvim', config = function() require("which-key").setup() end },
diff --git a/config/nvim/lua/setup/rust-tools.lua b/config/nvim/lua/setup/rust-tools.lua
index d9fb4597..dd24c369 100644
--- a/config/nvim/lua/setup/rust-tools.lua
+++ b/config/nvim/lua/setup/rust-tools.lua
@@ -191,7 +191,7 @@ local opts = {
                     importPrefix = "self",
                     prefer = {
                         no = {
-                            std = false
+                            std = true
                         },
                     }
                 },