diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..9a6cc75
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,3 @@
+[*.lua]
+indent_style = space
+indent_size = 2
diff --git a/Hello.java b/Hello.java
deleted file mode 100644
index e69de29..0000000
diff --git a/ftplugin/java.lua b/ftplugin/java.lua
index 302423c..d0576f8 100644
--- a/ftplugin/java.lua
+++ b/ftplugin/java.lua
@@ -4,9 +4,8 @@ vim.bo.tabstop = 4
 
 local home = os.getenv("HOME") or os.getenv("USERPROFILE")
 local config = {
-	cmd = { home .. '/.local/share/java/jdtls/bin/jdtls'},
-	root_dir = vim.fs.dirname(vim.fs.find({'gradlew', '.git', 'mvnw'}, { upward = true })[1]),
+  cmd = { home .. '/.local/share/java/jdtls/bin/jdtls' },
+  root_dir = vim.fs.dirname(vim.fs.find({ 'gradlew', '.git', 'mvnw' }, { upward = true })[1]),
 }
 
 require('jdtls').start_or_attach(config)
-
diff --git a/init.lua b/init.lua
index d6421c7..663bbe6 100644
--- a/init.lua
+++ b/init.lua
@@ -3,6 +3,5 @@ require("config.set")
 require("config.remap")
 
 vim.cmd("set completeopt+=noselect")
-vim.lsp.enable({'basedpyright', 'lua_ls', 'yamlls', 'gopls', 'htmx', 'jsonls' })
-vim.o.winborder='rounded'
-
+vim.lsp.enable({ 'basedpyright', 'lua_ls', 'yamlls', 'gopls', 'htmx', 'jsonls' })
+vim.o.winborder = 'rounded'
diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index 11eda4a..ef0bcbf 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -6,7 +6,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
   if vim.v.shell_error ~= 0 then
     vim.api.nvim_echo({
       { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-      { out, "WarningMsg" },
+      { out,                            "WarningMsg" },
       { "\nPress any key to exit..." },
     }, true, {})
     vim.fn.getchar()
@@ -31,4 +31,3 @@ require("lazy").setup({
   -- automatically check for plugin updates
   checker = { enabled = true },
 })
-
diff --git a/lua/config/remap.lua b/lua/config/remap.lua
index cb8a0cf..525fd22 100644
--- a/lua/config/remap.lua
+++ b/lua/config/remap.lua
@@ -1,2 +1 @@
 vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
-
diff --git a/lua/config/set.lua b/lua/config/set.lua
index 4a50355..ac18020 100644
--- a/lua/config/set.lua
+++ b/lua/config/set.lua
@@ -33,4 +33,3 @@ vim.g.c_syntax_for_h = 1
 vim.cmd.colorscheme("moonfly")
 
 vim.keymap.set('n', '<leader>d', vim.diagnostic.open_float, { noremap = true, silent = true })
-
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 1741606..358db89 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -1,11 +1,28 @@
 return {
-	{
-		"neovim/nvim-lspconfig",
-		dependencies = {
-			"saghen/blink.cmp"
-		}
-	},
-	{ "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
-	{ "mfussenegger/nvim-jdtls" } -- jdtls bindings for neovim
+  {
+    "neovim/nvim-lspconfig",
+    dependencies = {
+      "saghen/blink.cmp"
+    },
+    config = function()
+      vim.api.nvim_create_autocmd('LspAttach', {
+        group = vim.api.nvim_create_augroup('my.lsp', {}),
+        callback = function(args)
+          local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
+          if not client then return end
+          if client:supports_method('textDocument/formatting') then
+            vim.api.nvim_create_autocmd('BufWritePre', {
+              group = vim.api.nvim_create_augroup('my.lsp', { clear = false }),
+              buffer = args.buf,
+              callback = function()
+                vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 })
+              end,
+            })
+          end
+        end,
+      })
+    end
+  },
+  { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" },
+  { "mfussenegger/nvim-jdtls" } -- jdtls bindings for neovim
 }
-
diff --git a/lua/plugins/util.lua b/lua/plugins/util.lua
index 01549d1..bcdf584 100644
--- a/lua/plugins/util.lua
+++ b/lua/plugins/util.lua
@@ -1,42 +1,41 @@
 return {
-	{
-		"mbbill/undotree",
-		config = function()
-			vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
-		end,
-  	},
-	{
-		"tpope/vim-fugitive",
-		config = function()
-			vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
-		end,
-	},
-	{
-		"nvim-telescope/telescope.nvim",
-		dependencies = {"nvim-lua/plenary.nvim"},
-		config = function()
-			local builtin = require('telescope.builtin')
-			vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
-			vim.keymap.set('n', '<C-p>', builtin.git_files, {})
-			vim.keymap.set('n', '<leader>ps', function()
-				builtin.grep_string({ search = vim.fn.input("Grep > ") });
-			end)
-		end,
-	},
-	{
-		"theprimeagen/harpoon",
-		config = function()
-		local mark = require("harpoon.mark")
-		local ui = require("harpoon.ui")
+  {
+    "mbbill/undotree",
+    config = function()
+      vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
+    end,
+  },
+  {
+    "tpope/vim-fugitive",
+    config = function()
+      vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
+    end,
+  },
+  {
+    "nvim-telescope/telescope.nvim",
+    dependencies = { "nvim-lua/plenary.nvim" },
+    config = function()
+      local builtin = require('telescope.builtin')
+      vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
+      vim.keymap.set('n', '<C-p>', builtin.git_files, {})
+      vim.keymap.set('n', '<leader>ps', function()
+        builtin.grep_string({ search = vim.fn.input("Grep > ") });
+      end)
+    end,
+  },
+  {
+    "theprimeagen/harpoon",
+    config = function()
+      local mark = require("harpoon.mark")
+      local ui = require("harpoon.ui")
 
-		vim.keymap.set("n", "<leader>a", mark.add_file)
-		vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
+      vim.keymap.set("n", "<leader>a", mark.add_file)
+      vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
 
-		vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
-		vim.keymap.set("n", "<C-t>", function() ui.nav_file(2) end)
-		vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
-		vim.keymap.set("n", "<C-s>", function() ui.nav_file(4) end)
-		end
-	}
+      vim.keymap.set("n", "<C-h>", function() ui.nav_file(1) end)
+      vim.keymap.set("n", "<C-t>", function() ui.nav_file(2) end)
+      vim.keymap.set("n", "<C-n>", function() ui.nav_file(3) end)
+      vim.keymap.set("n", "<C-s>", function() ui.nav_file(4) end)
+    end
+  }
 }
-
diff --git a/lua/plugins/visual.lua b/lua/plugins/visual.lua
index 2fa3ea5..a395d58 100644
--- a/lua/plugins/visual.lua
+++ b/lua/plugins/visual.lua
@@ -1,20 +1,19 @@
 return {
-	{
-		"nvim-lualine/lualine.nvim",
-		dependencies = { "nvim-tree/nvim-web-devicons" },
-		lazy = false,
-		config = function()
-			require("lualine").setup()
-		end,
-	},
-	{
-		"bluz71/vim-moonfly-colors",
-		lazy = false,
-		config = function()
-			vim.g.moonflyTransparent = true
-		end,
-	},
-	{ "EdenEast/nightfox.nvim", lazy = false },
-	{ "oxfist/night-owl.nvim", lazy = false },
+  {
+    "nvim-lualine/lualine.nvim",
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    lazy = false,
+    config = function()
+      require("lualine").setup()
+    end,
+  },
+  {
+    "bluz71/vim-moonfly-colors",
+    lazy = false,
+    config = function()
+      vim.g.moonflyTransparent = true
+    end,
+  },
+  { "EdenEast/nightfox.nvim", lazy = false },
+  { "oxfist/night-owl.nvim",  lazy = false },
 }
-