diff --git a/lua/dot/init.lua b/lua/dot/init.lua
index 96e4a9d..2187b31 100644
--- a/lua/dot/init.lua
+++ b/lua/dot/init.lua
@@ -94,13 +94,6 @@ vim.api.nvim_create_autocmd("TextYankPost", {
 	end,
 })
 
-vim.api.nvim_create_autocmd("BufWritePre", {
-	pattern = "*",
-	callback = function(e)
-		require("conform").format({ bufnr = e.buf })
-	end,
-})
-
 vim.api.nvim_create_autocmd("LspAttach", {
 	group = vim.api.nvim_create_augroup("dot-lsp-attach-autocmds", { clear = true }),
 	callback = function(e)
diff --git a/lua/dot/plugins.lua b/lua/dot/plugins.lua
index 6ae8881..991624c 100644
--- a/lua/dot/plugins.lua
+++ b/lua/dot/plugins.lua
@@ -239,4 +239,14 @@ lze.load({
 		lazy = not (#(vim.fs.root(0, ".git") or 0) > 0),
 	},
 
+	-- Formatting
+	{
+		"guess-indent.nvim",
+		after = function()
+			require("guess-indent").setup()
+		end,
+		cmd = "GuessIndent",
+		event = "BufEnter",
+	},
+
 })