diff --git a/lua/custom/plugins/none-ls.lua b/lua/custom/plugins/none-ls.lua
index 746c4092..21b0588e 100644
--- a/lua/custom/plugins/none-ls.lua
+++ b/lua/custom/plugins/none-ls.lua
@@ -1,79 +1,78 @@
 return {
-	"nvimtools/none-ls.nvim",            -- configure formatters & linters
-	lazy = true,
-	event = { "BufReadPre", "BufNewFile" }, -- to enable uncomment this
-	dependencies = {
-		"jay-babu/mason-null-ls.nvim",
-	},
-	config = function()
-		local mason_null_ls = require("mason-null-ls")
+  'nvimtools/none-ls.nvim', -- configure formatters & linters
+  lazy = true,
+  event = { 'BufReadPre', 'BufNewFile' }, -- to enable uncomment this
+  dependencies = {
+    'jay-babu/mason-null-ls.nvim',
+  },
+  config = function()
+    local mason_null_ls = require 'mason-null-ls'
 
-		local null_ls = require("null-ls")
+    local null_ls = require 'null-ls'
 
-		local null_ls_utils = require("null-ls.utils")
+    local null_ls_utils = require 'null-ls.utils'
 
-		mason_null_ls.setup({
-			ensure_installed = {
-				"prettier", -- prettier formatter
-				"stylua", -- lua formatter
-				"eslint-lsp", -- js linter
-				"golangci-lint",
-				"gofumpt",
-				"goimports",
-				"goimports-reviser",
-				"golines",
-				"gomodifytags",
-				"jsonls"
-			},
-		})
+    mason_null_ls.setup {
+      ensure_installed = {
+        'prettier', -- prettier formatter
+        'stylua', -- lua formatter
+        'eslint-lsp', -- js linter
+        'golangci-lint',
+        'gofumpt',
+        'goimports',
+        'goimports-reviser',
+        'golines',
+        'gomodifytags',
+        'jsonls',
+      },
+    }
 
-		-- for conciseness
-		local formatting = null_ls.builtins.formatting -- to setup formatters
-		local diagnostics = null_ls.builtins.diagnostics -- to setup linters
+    -- for conciseness
+    local formatting = null_ls.builtins.formatting -- to setup formatters
+    local diagnostics = null_ls.builtins.diagnostics -- to setup linters
 
-		-- to setup format on save
-		local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
+    -- to setup format on save
+    local augroup = vim.api.nvim_create_augroup('LspFormatting', {})
 
-		-- configure null_ls
-		null_ls.setup({
-			-- add package.json as identifier for root (for typescript monorepos)
-			root_dir = null_ls_utils.root_pattern(".null-ls-root", "Makefile", ".git", "package.json"),
-			-- setup formatters & linters
-			sources = {
-				--  to disable file types use
-				--  "formatting.prettier.with({disabled_filetypes: {}})" (see null-ls docs)
-				formatting.prettier.with({
-					extra_filetypes = { "svelte" },
-				}),    -- js/ts formatter
-				formatting.stylua, -- lua formatter
-				formatting.isort,
-				formatting.black,
-				diagnostics.pylint,
-				diagnostics.eslint_d.with({                           -- js/ts linter
-					condition = function(utils)
-						return utils.root_has_file({ ".eslintrc.js", ".eslintrc.cjs" }) -- only enable if root has .eslintrc.js or .eslintrc.cjs
-					end,
-				}),
-			},
-			-- configure format on save
-			on_attach = function(current_client, bufnr)
-				if current_client.supports_method("textDocument/formatting") then
-					vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
-					vim.api.nvim_create_autocmd("BufWritePre", {
-						group = augroup,
-						buffer = bufnr,
-						callback = function()
-							vim.lsp.buf.format({
-								filter = function(client)
-									--  only use null-ls for formatting instead of lsp server
-									return client.name == "null-ls"
-								end,
-								bufnr = bufnr,
-							})
-						end,
-					})
-				end
-			end,
-		})
-	end,
+    -- configure null_ls
+    null_ls.setup {
+      -- add package.json as identifier for root (for typescript monorepos)
+      root_dir = null_ls_utils.root_pattern('.null-ls-root', 'Makefile', '.git', 'package.json'),
+      -- setup formatters & linters
+      sources = {
+        --  to disable file types use
+        --  "formatting.prettier.with({disabled_filetypes: {}})" (see null-ls docs)
+        formatting.prettier.with {
+          extra_filetypes = { 'svelte' },
+        }, -- js/ts formatter
+        formatting.stylua, -- lua formatter
+        formatting.isort,
+        diagnostics.golangci_lint,
+        formatting.gofumpt,
+        formatting.goimports,
+        formatting.goimports_reviser,
+        formatting.golines,
+        null_ls.builtins.code_actions.gomodifytags
+      },
+      -- configure format on save
+      on_attach = function(current_client, bufnr)
+        if current_client.supports_method 'textDocument/formatting' then
+          vim.api.nvim_clear_autocmds { group = augroup, buffer = bufnr }
+          vim.api.nvim_create_autocmd('BufWritePre', {
+            group = augroup,
+            buffer = bufnr,
+            callback = function()
+              vim.lsp.buf.format {
+                filter = function(client)
+                  --  only use null-ls for formatting instead of lsp server
+                  return client.name == 'null-ls'
+                end,
+                bufnr = bufnr,
+              }
+            end,
+          })
+        end
+      end,
+    }
+  end,
 }