Refactor magit

init.el

@@ -68,7 +68,7 @@
   (defun ccr/reload-emacs ()
     (interactive)
     (load-file "~/.config/emacs/init.el"))
-  (load-theme 'modus-operandi 't)
+  (load-theme 'dracula 't)
   (defun ccr/nixos-rebuild ()
     (interactive)
     (let* ((operation (completing-read "nixos-rebuild " '("switch" "boot" "test" "dry-activate")))
@@ -87,13 +87,6 @@
   (tramp-use-ssh-controlmaster-options nil) ;; makes tramp use ~/.ssh/config
   )
 
-;; (use-package dracula-theme
-;;   :config
-;;   (add-hook 'after-make-frame-functions (defun ccr/theme-init (_)
-;; 					  (load-theme 'dracula 't)
-;; 					  (meow--prepare-face)
-;; 					  (remove-hook 'after-make-frame-functions 'ccr/theme-init))))
-
 (use-package ligature
   :config
   (ligature-set-ligatures 't '("www"))
@@ -416,18 +409,21 @@
   (which-key-setup-side-window-right))
 
 (use-package magit
-  :hook ((magit-mode . magit-delta-mode))
-  :custom
-  (magit-todos-keyword-suffix "([^)]+):")
-  :config
-  (magit-todos-mode +1)
   :bind (("C-c o g" . magit)))
 
+(use-package magit-delta
+  :hook (magit-mode . magit-delta-mode))
+
+(use-package magit-todos
+  :after magit
+  :custom (magit-todos-keyword-suffix "\\(?:([^)]+)\\)?:?")
+  :config (magit-todos-mode 1))
+
 (use-package difftastic
   :demand t
   :bind (:map magit-blame-read-only-mode-map
-         ("D" . difftastic-magit-show)
-         ("S" . difftastic-magit-show))
+              ("D" . difftastic-magit-show)
+              ("S" . difftastic-magit-show))
   :config
   (eval-after-load 'magit-diff
     '(transient-append-suffix 'magit-diff '(-1 -1)