diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index e5a7978..6f3169b 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -4,17 +4,18 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
-  "formatter.nvim": { "branch": "master", "commit": "ed949c13e1a942db29ababa35e8c7864ced90eb6" },
-  "gruvbox.nvim": { "branch": "main", "commit": "1a8ba635e511148801b55a1128aef933c296a301" },
+  "gruvbox.nvim": { "branch": "main", "commit": "53bfb95b1ed1d87f6a276abdd322b267be0b5adf" },
   "kanagawa.nvim": { "branch": "master", "commit": "5c4037432f0ae2d0b75d3a7b7cfa3022d7054e4d" },
   "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
   "lualine.nvim": { "branch": "master", "commit": "c28a7427c3fb29322db136f0564ec58807b26747" },
+  "mason.nvim": { "branch": "main", "commit": "b54d4e3171cc9735de915dbb97e987fb1f05dad9" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "2b2f74828eeb02cf29d6b21aa32eedadadc94ca7" },
   "nordic.nvim": { "branch": "main", "commit": "fc7ea160bb441f9c0245c2719a3c7b8c22468178" },
   "nui.nvim": { "branch": "main", "commit": "1f43b13d133eb4b4f53a4485379d9afa58808389" },
+  "null-ls.nvim": { "branch": "main", "commit": "5855128178fa78293acdfb5b4e41ef046779240b" },
   "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
   "nvim-lspconfig": { "branch": "master", "commit": "7d5af779acbc8a6ff9dfd7f2d39ae898fb67480f" },
-  "nvim-treesitter": { "branch": "master", "commit": "411e771d511442ab81670701f5c830f6c74aadd7" },
+  "nvim-treesitter": { "branch": "master", "commit": "c85d059c462ae7de0aa2a6ed0589f0b223e0e6a9" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "b55fe6175f0001347a433c9df358c8cbf8a4e90f" },
   "nvim-web-devicons": { "branch": "master", "commit": "0568104bf8d0c3ab16395433fcc5c1638efc25d4" },
   "onedark.nvim": { "branch": "master", "commit": "dd640f6cfb0e370cfd3db389f04b172508848bd3" },
diff --git a/config/nvim/lua/config/plugins/formatter.lua b/config/nvim/lua/config/plugins/formatter.lua
deleted file mode 100644
index a43cad5..0000000
--- a/config/nvim/lua/config/plugins/formatter.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-return function()
-  require("formatter").setup({
-    logging = true,
-    log_level = vim.log.levels.WARN,
-    filetype = {
-      lua = {
-        require("formatter.filetypes.lua").stylua,
-      },
-
-      ruby = {
-        require("formatter.filetypes.ruby").standardrb,
-      },
-
-      ["*"] = {
-        require("formatter.filetypes.any").remove_trailing_whitespace,
-      },
-    },
-  })
-end
diff --git a/config/nvim/lua/config/plugins/null-ls.lua b/config/nvim/lua/config/plugins/null-ls.lua
new file mode 100644
index 0000000..d15429c
--- /dev/null
+++ b/config/nvim/lua/config/plugins/null-ls.lua
@@ -0,0 +1,19 @@
+return function()
+  local null_ls = require("null-ls")
+
+  null_ls.setup({
+    sources = {
+      null_ls.builtins.formatting.crystal_format,
+      null_ls.builtins.formatting.eslint,
+      null_ls.builtins.formatting.prettier,
+      null_ls.builtins.formatting.rustfmt,
+      null_ls.builtins.formatting.standardrb,
+      null_ls.builtins.formatting.stylua,
+    },
+  })
+
+  -- Format on save
+  vim.api.nvim_create_autocmd("BufWritePre", {
+    command = "lua vim.lsp.buf.format()",
+  })
+end
diff --git a/config/nvim/lua/plugins/formatter.lua b/config/nvim/lua/plugins/formatter.lua
deleted file mode 100644
index 47acbdd..0000000
--- a/config/nvim/lua/plugins/formatter.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-  "mhartington/formatter.nvim",
-
-  config = require("config.plugins.formatter"),
-}
diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua
index 86f4670..1451970 100644
--- a/config/nvim/lua/plugins/init.lua
+++ b/config/nvim/lua/plugins/init.lua
@@ -5,10 +5,45 @@ return {
   "hrsh7th/cmp-cmdline",
   "hrsh7th/cmp-vsnip",
   "hrsh7th/vim-vsnip",
+  {
+    "hrsh7th/nvim-cmp",
+    config = require("config.plugins.nvim-cmp"),
+  },
   {
     "williamboman/mason.nvim",
     config = function()
       require("mason").setup()
     end,
   },
+  {
+    "neovim/nvim-lspconfig",
+    config = require("config.plugins.lspconfig"),
+  },
+  {
+    "nvim-lualine/lualine.nvim",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    config = require("config.plugins.lualine"),
+  },
+  {
+    "nvim-neo-tree/neo-tree.nvim",
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+      "nvim-tree/nvim-web-devicons",
+      "MunifTanjim/nui.nvim",
+    },
+    config = require("config.plugins.neo-tree"),
+  },
+  {
+    "nvim-telescope/telescope.nvim",
+    dependencies = { "nvim-lua/plenary.nvim" },
+  },
+  {
+    "folke/which-key.nvim",
+    config = require("config.plugins.which-key"),
+  },
+  {
+    "jose-elias-alvarez/null-ls.nvim",
+    dependencies = { "nvim-lua/plenary.nvim" },
+    config = require("config.plugins.null-ls"),
+  },
 }
diff --git a/config/nvim/lua/plugins/lspconfig.lua b/config/nvim/lua/plugins/lspconfig.lua
deleted file mode 100644
index 3415261..0000000
--- a/config/nvim/lua/plugins/lspconfig.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-  "neovim/nvim-lspconfig",
-
-  config = require("config.plugins.lspconfig")
-}
diff --git a/config/nvim/lua/plugins/lualine.lua b/config/nvim/lua/plugins/lualine.lua
deleted file mode 100644
index fb96354..0000000
--- a/config/nvim/lua/plugins/lualine.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
-  "nvim-lualine/lualine.nvim",
-
-  dependencies = {
-    "nvim-tree/nvim-web-devicons",
-  },
-
-  config = require("config.plugins.lualine"),
-}
diff --git a/config/nvim/lua/plugins/neo-tree.lua b/config/nvim/lua/plugins/neo-tree.lua
deleted file mode 100644
index 8000f45..0000000
--- a/config/nvim/lua/plugins/neo-tree.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-  "nvim-neo-tree/neo-tree.nvim",
-
-  dependencies = {
-    "nvim-lua/plenary.nvim",
-    "nvim-tree/nvim-web-devicons",
-    "MunifTanjim/nui.nvim",
-  },
-
-  config = require("config.plugins.neo-tree"),
-}
diff --git a/config/nvim/lua/plugins/nvim-cmp.lua b/config/nvim/lua/plugins/nvim-cmp.lua
deleted file mode 100644
index ba436ce..0000000
--- a/config/nvim/lua/plugins/nvim-cmp.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-  "hrsh7th/nvim-cmp",
-
-  config = require("config.plugins.nvim-cmp"),
-}
diff --git a/config/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua
deleted file mode 100644
index 458e0c2..0000000
--- a/config/nvim/lua/plugins/telescope.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-  "nvim-telescope/telescope.nvim",
-
-  dependencies = { "nvim-lua/plenary.nvim" },
-}
diff --git a/config/nvim/lua/plugins/which-key.lua b/config/nvim/lua/plugins/which-key.lua
deleted file mode 100644
index 095cca7..0000000
--- a/config/nvim/lua/plugins/which-key.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-  "folke/which-key.nvim",
-
-  config = require("config.plugins.which-key"),
-}
diff --git a/config/zed/settings.json b/config/zed/settings.json
index f9b50da..e5866a4 100644
--- a/config/zed/settings.json
+++ b/config/zed/settings.json
@@ -7,9 +7,12 @@
 // custom settings, run the `open default settings` command
 // from the command palette or from `Zed` application menu.
 {
-    "theme": "One Dark",
-    "buffer_font_family": "SauceCodePro Nerd Font Mono",
-    "buffer_font_size": 15,
-    "vim_mode": true,
-    "shell": "system"
+  "theme": "One Dark",
+  "vim_mode": true,
+  "shell": "system",
+  "tab_size": 2,
+  "terminal": {
+    "font_family": "SauceCodePro Nerd Font Mono",
+    "font_size": 15
+  }
 }