diff --git a/lazy-lock.json b/lazy-lock.json
index 0e75732..dde226e 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -18,7 +18,7 @@
   "lazy.nvim": { "branch": "main", "commit": "0d0d5870a3265f1c92a89dccef4a592c44e70179" },
   "live-server": { "branch": "main", "commit": "ecd7c1418823b65dd2bca710587c80afe42c973e" },
   "lualine.nvim": { "branch": "master", "commit": "a52f078026b27694d2290e34efa61a6e4a690621" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "43c7f402cb9822b61b5dc05bf0b385928df256a6" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "610f5919fe633ac872239a0ab786572059f0d91d" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "c17051e61c41c569e5088185889cde537535b465" },
   "mason.nvim": { "branch": "main", "commit": "c2002d7a6b5a72ba02388548cfaf420b864fbc12" },
   "mini.ai": { "branch": "main", "commit": "14a1382372195573c6c7f494ab8bb298b03e6f04" },
@@ -40,7 +40,7 @@
   "nvim-treesitter": { "branch": "master", "commit": "8e763332b7bf7b3a426fd8707b7f5aa85823a5ac" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "a8c86f48c1030acee22b9e071e3c531de77bf253" },
   "nvim-ts-autotag": { "branch": "main", "commit": "fdefe46c6807441460f11f11a167a2baf8e4534b" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "4a42b30376c1bd625ab5016c2079631d531d797a" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "a0f89563ba36b3bacd62cf967b46beb4c2c29e52" },
   "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" },
   "nvim-web-devicons": { "branch": "master", "commit": "563f3635c2d8a7be7933b9e547f7c178ba0d4352" },
   "plenary.nvim": { "branch": "master", "commit": "4b7e52044bbb84242158d977a50c4cbcd85070c7" },
diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua
index 39b6a93..c525e26 100644
--- a/lua/plugins/coding.lua
+++ b/lua/plugins/coding.lua
@@ -1,17 +1,17 @@
 return {
-    -- snippets
-    {
-      "L3MON4D3/LuaSnip",
-      dependencies = {
-        "rafamadriz/friendly-snippets",
-        config = function()
-          require("luasnip.loaders.from_vscode").lazy_load()
-        end,
-      },
-      opts = {
-        history = true,
-        delete_check_events = "TextChanged",
-      },
+	-- snippets
+	{
+		"L3MON4D3/LuaSnip",
+		dependencies = {
+			"rafamadriz/friendly-snippets",
+			config = function()
+				require("luasnip.loaders.from_vscode").lazy_load()
+			end,
+		},
+		opts = {
+			history = true,
+			delete_check_events = "TextChanged",
+		},
       -- stylua: ignore
       keys = {
         {
@@ -24,100 +24,100 @@ return {
         { "<tab>", function() require("luasnip").jump(1) end, mode = "s" },
         { "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" } },
       },
-    },
-  
-    -- auto completion
-    {
-      "hrsh7th/nvim-cmp",
-      event = "InsertEnter",
-      dependencies = {
-        "hrsh7th/cmp-nvim-lsp",
-        "hrsh7th/cmp-buffer",
-        "hrsh7th/cmp-path",
-        "saadparwaiz1/cmp_luasnip",
-      },
-    },
-  
-    -- auto pairs
-    {
-      "echasnovski/mini.pairs",
-      event = "VeryLazy",
-      config = function(_, opts)
-        require("mini.pairs").setup(opts)
-      end,
-    },
-  
-    -- surround
-    {
-      "echasnovski/mini.surround",
-      keys = { "gz" },
-      opts = {
-        mappings = {
-          add = "gza", -- Add surrounding in Normal and Visual modes
-          delete = "gzd", -- Delete surrounding
-          find = "gzf", -- Find surrounding (to the right)
-          find_left = "gzF", -- Find surrounding (to the left)
-          highlight = "gzh", -- Highlight surrounding
-          replace = "gzr", -- Replace surrounding
-          update_n_lines = "gzn", -- Update `n_lines`
-        },
-      },
-      config = function(_, opts)
-        -- use gz mappings instead of s to prevent conflict with leap
-        require("mini.surround").setup(opts)
-      end,
-    },
-  
-    -- comments
-    { "JoosepAlviste/nvim-ts-context-commentstring" },
-    {
-      "echasnovski/mini.comment",
-      event = "VeryLazy",
-      opts = {
-        hooks = {
-          pre = function()
-            require("ts_context_commentstring.internal").update_commentstring({})
-          end,
-        },
-      },
-      config = function(_, opts)
-        require("mini.comment").setup(opts)
-      end,
-    },
-  
-    -- better text-objects
-    {
-      "echasnovski/mini.ai",
-      keys = {
-        { "a", mode = { "x", "o" } },
-        { "i", mode = { "x", "o" } },
-      },
-      dependencies = {
-        {
-          "nvim-treesitter/nvim-treesitter-textobjects",
-          init = function()
-            -- no need to load the plugin, since we only need its queries
-            require("lazy.core.loader").disable_rtp_plugin("nvim-treesitter-textobjects")
-          end,
-        },
-      },
-      opts = function()
-        local ai = require("mini.ai")
-        return {
-          n_lines = 500,
-          custom_textobjects = {
-            o = ai.gen_spec.treesitter({
-              a = { "@block.outer", "@conditional.outer", "@loop.outer" },
-              i = { "@block.inner", "@conditional.inner", "@loop.inner" },
-            }, {}),
-            f = ai.gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }, {}),
-            c = ai.gen_spec.treesitter({ a = "@class.outer", i = "@class.inner" }, {}),
-          },
-        }
-      end,
-      config = function(_, opts)
-        local ai = require("mini.ai")
-        ai.setup(opts)
-      end,
-    },
-  }
\ No newline at end of file
+	},
+
+	-- auto completion
+	{
+		"hrsh7th/nvim-cmp",
+		event = "InsertEnter",
+		dependencies = {
+			"hrsh7th/cmp-nvim-lsp",
+			"hrsh7th/cmp-buffer",
+			"hrsh7th/cmp-path",
+			"saadparwaiz1/cmp_luasnip",
+		},
+	},
+
+	-- auto pairs
+	{
+		"echasnovski/mini.pairs",
+		event = "VeryLazy",
+		config = function(_, opts)
+			require("mini.pairs").setup(opts)
+		end,
+	},
+
+	-- surround
+	{
+		"echasnovski/mini.surround",
+		keys = { "gz" },
+		opts = {
+			mappings = {
+				add = "gza", -- Add surrounding in Normal and Visual modes
+				delete = "gzd", -- Delete surrounding
+				find = "gzf", -- Find surrounding (to the right)
+				find_left = "gzF", -- Find surrounding (to the left)
+				highlight = "gzh", -- Highlight surrounding
+				replace = "gzr", -- Replace surrounding
+				update_n_lines = "gzn", -- Update `n_lines`
+			},
+		},
+		config = function(_, opts)
+			-- use gz mappings instead of s to prevent conflict with leap
+			require("mini.surround").setup(opts)
+		end,
+	},
+
+	-- comments
+	{ "JoosepAlviste/nvim-ts-context-commentstring" },
+	{
+		"echasnovski/mini.comment",
+		event = "VeryLazy",
+		opts = {
+			hooks = {
+				pre = function()
+					require("ts_context_commentstring.internal").update_commentstring({})
+				end,
+			},
+		},
+		config = function(_, opts)
+			require("mini.comment").setup(opts)
+		end,
+	},
+
+	-- better text-objects
+	{
+		"echasnovski/mini.ai",
+		keys = {
+			{ "a", mode = { "x", "o" } },
+			{ "i", mode = { "x", "o" } },
+		},
+		dependencies = {
+			{
+				"nvim-treesitter/nvim-treesitter-textobjects",
+				init = function()
+					-- no need to load the plugin, since we only need its queries
+					require("lazy.core.loader").disable_rtp_plugin("nvim-treesitter-textobjects")
+				end,
+			},
+		},
+		opts = function()
+			local ai = require("mini.ai")
+			return {
+				n_lines = 500,
+				custom_textobjects = {
+					o = ai.gen_spec.treesitter({
+						a = { "@block.outer", "@conditional.outer", "@loop.outer" },
+						i = { "@block.inner", "@conditional.inner", "@loop.inner" },
+					}, {}),
+					f = ai.gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }, {}),
+					c = ai.gen_spec.treesitter({ a = "@class.outer", i = "@class.inner" }, {}),
+				},
+			}
+		end,
+		config = function(_, opts)
+			local ai = require("mini.ai")
+			ai.setup(opts)
+		end,
+	},
+}
diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua
index 675ec7d..2a9056a 100644
--- a/lua/user/lsp/null-ls.lua
+++ b/lua/user/lsp/null-ls.lua
@@ -19,7 +19,7 @@ null_ls.setup({
 		formatting.black.with({ extra_args = { "--fast" } }),
 		formatting.stylua,
 		-- formatting.eslint_d,
-		formatting.google_java_format,
+		-- formatting.google_java_format,
 		-- formatting.phpcbf,
 		-- formatting.clang_format,
 		-- diagnostics.flake8