diff --git a/lua/taken/plugins/lsp/null-ls.lua b/lua/taken/plugins/lsp/null-ls.lua
index 1993a80..27b7292 100644
--- a/lua/taken/plugins/lsp/null-ls.lua
+++ b/lua/taken/plugins/lsp/null-ls.lua
@@ -29,6 +29,15 @@ return {
                             vim.lsp.buf.format({ async = false })
                         end,
                     })
+                elseif client.server_capabilities.documentFormattingProvider 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({ async = false })
+                        end,
+                    })
                 else
                     vim.notify("Formatting not supported")
                 end
diff --git a/lua/taken/plugins/wakatime.lua b/lua/taken/plugins/wakatime.lua
new file mode 100644
index 0000000..57a5f0c
--- /dev/null
+++ b/lua/taken/plugins/wakatime.lua
@@ -0,0 +1,5 @@
+return {
+    "wakatime/vim-wakatime",
+    name = "Wakatime",
+    lazy = false,
+}