diff --git a/dot_doom.d/config.org b/dot_doom.d/config.org
index 5ff5c550b56a446e8833e56d1fa378a098450a4d..31a93de875f63a0cacb8f956901f0e601091072e 100644
--- a/dot_doom.d/config.org
+++ b/dot_doom.d/config.org
@@ -97,7 +97,6 @@ you have to press a few bindings. This makes that automatic.
 (global-set-key (kbd "C-x 3") 'amo/split-window-right-and-switch)
 #+END_SRC
 
-
 * Org Mode settings
 If you use ~org~ and don't want your org files in the default location below,
 change ~org-directory~. It must be set before org loads!
@@ -248,6 +247,20 @@ Look for various executables
 (add-hook 'python-mode-hook 'auto-virtualenv-set-virtualenv)
 #+END_SRC
 
+** Go settings
+#+BEGIN_SRC emacs-lisp
+(setq gofmt-before-save t)
+#+END_SRC
+
+** Editor metrics
+[[https://github.com/wakatime/wakatime-mode][wakatime-mode]] connected to self-hosted [[https://wakapi.dev/][Wakapi]] instance to get interesting stats
+about the time I spend in an editor
+
+#+BEGIN_SRC emacs-lisp
+(global-wakatime-mode)
+(setq wakatime-cli-path "/usr/bin/wakatime")
+#+END_SRC
+
 * Custom bindings
 Following established Doom conventions, bind ~SPC g p~ to
 ~magit-push-current-to-upstream~
diff --git a/dot_doom.d/packages.el b/dot_doom.d/packages.el
index 001bd42fc4b980539c15c6418820a1bdcf4e02f3..c44ba64f8f5771b1253a6c66b9b59e149647b327 100644
--- a/dot_doom.d/packages.el
+++ b/dot_doom.d/packages.el
@@ -16,6 +16,7 @@
 (package! flyspell)
 (package! markdown-mode)
 (package! auto-virtualenv)
+(package! wakatime-mode)
 
 ;; To install a package directly from a remote git repo, you must specify a
 ;; `:recipe'. You'll find documentation on what `:recipe' accepts here: