diff --git a/user/app/emacs/default.nix b/user/app/emacs/default.nix
index 840b70c7..18a356c4 100644
--- a/user/app/emacs/default.nix
+++ b/user/app/emacs/default.nix
@@ -17,7 +17,7 @@
         yasnippet shackle
         projectile treemacs treemacs-projectile
         treesit-grammars.with-all-grammars
-        magit magit-file-icons
+        magit magit-file-icons magit-todos
         vterm sudo-edit
         gdscript-mode
         nix-mode
diff --git a/user/app/emacs/init.el b/user/app/emacs/init.el
index 083f685d..63ab3bba 100644
--- a/user/app/emacs/init.el
+++ b/user/app/emacs/init.el
@@ -299,6 +299,14 @@
   (magit-file-icons-enable-untracked-icons t)
   (magit-file-icons-enable-diffstat-icons t))
 
+(use-package magit-todos
+  :ensure t
+  :custom
+  :config
+  (setq magit-todos-keywords-list '("TODO" "FIXME" "HACK" "REVIEW" "DEPRECATED" "BUG"))
+  (setq magit-todos-keyword-suffix "\\(?:[([][^])]+[])]\\)?.")
+  (magit-todos-mode 1))
+
 ;; Theme and modeline
 (use-package doom-themes
   :ensure t
diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix
index cd66a78f..786650cf 100644
--- a/user/wm/hyprland/hyprland.nix
+++ b/user/wm/hyprland/hyprland.nix
@@ -514,7 +514,6 @@ in
       ignore_dbus_inhibit = false
     }
 
-    # FIXME memory leak fries computer inbetween dpms off and suspend
     #listener {
     #  timeout = 150 # in seconds
     #  on-timeout = hyprctl dispatch dpms off