diff --git a/flake.lock b/flake.lock
index 5b34b85..6e7efbc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1692799911,
-        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692986144,
-        "narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=",
+        "lastModified": 1695559356,
+        "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf",
+        "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0",
         "type": "github"
       },
       "original": {
diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua
index d151343..74632c2 100644
--- a/nvim/lua/config/lazy.lua
+++ b/nvim/lua/config/lazy.lua
@@ -22,6 +22,11 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.lang.yaml" },
     { import = "lazyvim.plugins.extras.formatting.prettier" },
     { import = "plugins.tokyonight" },
+    { import = "plugins.telescope" },
+    { import = "plugins.mason" },
+    { import = "plugins.null-ls" },
+    { import = "plugins.nvim-lspconfig" },
+    { import = "plugins.nvim-treesitter" },
   },
   defaults = {
     -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
diff --git a/nvim/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua
index edd912c..37ea0fb 100644
--- a/nvim/lua/plugins/mason.lua
+++ b/nvim/lua/plugins/mason.lua
@@ -1,6 +1,8 @@
 return {
+  "williamboman/mason.nvim",
   opts = function(_, opts)
-    table.insert(opts.ensure_installed, {
+    opts.ensure_installed = opts.ensure_installed or {}
+    vim.list_extend(opts.ensure_installed, {
       "marksman",
       "mdformat",
     })
diff --git a/nvim/lua/plugins/null-ls.lua b/nvim/lua/plugins/null-ls.lua
index c4f8786..10e1b91 100644
--- a/nvim/lua/plugins/null-ls.lua
+++ b/nvim/lua/plugins/null-ls.lua
@@ -1,11 +1,10 @@
 return {
   "jose-elias-alvarez/null-ls.nvim",
   opts = function(_, opts)
-    if type(opts.sources) == "table" then
-      local null_ls = require("null-ls")
-      vim.list_extend(opts.sources, {
-        null_ls.builtins.formatting.mdformat,
-      })
-    end
+    local nls = require("null-ls")
+    opts.sources = opts.sources or {}
+    vim.list_extend(opts.sources, {
+      nls.builtins.formatting.mdformat,
+    })
   end,
 }
diff --git a/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/lua/plugins/nvim-lspconfig.lua
index 9409c26..5f2441d 100644
--- a/nvim/lua/plugins/nvim-lspconfig.lua
+++ b/nvim/lua/plugins/nvim-lspconfig.lua
@@ -1,10 +1,8 @@
 return {
   "neovim/nvim-lspconfig",
-  opts = function(_, opts)
-    if type(opts.servers) == "table" then
-      vim.list_extend(opts.servers, {
-        "marksman",
-      })
-    end
-  end,
+  opts = {
+    servers = {
+      marksman = {},
+    },
+  },
 }
diff --git a/nvim/lua/plugins/nvim-treesitter.lua b/nvim/lua/plugins/nvim-treesitter.lua
index 5b60ab4..c11471d 100644
--- a/nvim/lua/plugins/nvim-treesitter.lua
+++ b/nvim/lua/plugins/nvim-treesitter.lua
@@ -4,6 +4,7 @@ return {
     if type(opts.ensure_installed) == "table" then
       vim.list_extend(opts.ensure_installed, {
         "markdown",
+        "markdown_inline",
       })
     end
   end,