diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 451ebe4..6d1e635 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -75,6 +75,23 @@ return require('packer').startup({
 			config = load_config('lspconfig'),
 		}
 
+		--------------------
+		-- Linter/Formatter
+		--------------------
+		use { -- linter and formatter manager
+			'jose-elias-alvarez/null-ls.nvim',
+			after = {
+				'mason.nvim',
+				'plenary.nvim',
+			},
+			requires = { 'nvim-lua/plenary.nvim' },
+		}
+		use { -- compatibility layer between mason and null-ls
+			'jayp0521/mason-null-ls.nvim',
+			after = { 'null-ls.nvim' },
+			config = load_config('null-ls')
+		}
+
 		--------------------
 		-- Snippets
 		--------------------
diff --git a/config/nvim/lua/plugins/null-ls.lua b/config/nvim/lua/plugins/null-ls.lua
new file mode 100644
index 0000000..7d41884
--- /dev/null
+++ b/config/nvim/lua/plugins/null-ls.lua
@@ -0,0 +1,2 @@
+require('null-ls').setup()
+require('mason-null-ls').setup()