diff --git a/init.vim b/init.vim
index 81b2a9c..f990bca 100644
--- a/init.vim
+++ b/init.vim
@@ -82,7 +82,7 @@ if has('nvim')
 	lua require("config.isort")
 	lua require("config.prettier")
 	lua require("config.lsp")
-	lua require("config.c")
+	lua require("config.clang-format")
 endif
 
 " EOF
diff --git a/lua/config/c.lua b/lua/config/c.lua
deleted file mode 100644
index 36f6ec8..0000000
--- a/lua/config/c.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-vim.api.nvim_create_autocmd( { "BufWritePost" }, {
-	pattern = { "*.c", "*.h" },
-	command = [[ :silent! !/usr/bin/clang-format -i % ]],
-})
diff --git a/lua/config/clang-format.lua b/lua/config/clang-format.lua
new file mode 100644
index 0000000..c42addb
--- /dev/null
+++ b/lua/config/clang-format.lua
@@ -0,0 +1,8 @@
+vim.api.nvim_create_autocmd( { "BufWritePre" }, {
+  pattern = { "*.c", "*.h" },
+  callback = function(ev)
+    local cursor = vim.api.nvim_win_get_cursor(0)
+    vim.api.nvim_command([[ :silent! %!/usr/bin/env clang-format ]])
+    vim.api.nvim_win_set_cursor(0, cursor)
+  end
+})