From 2104e82401c67a3cc66c0b5731ff5633266ffbf4 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sun, 28 Apr 2024 15:07:53 -0500 Subject: [PATCH 1/2] Fully fixes projectile-grep disable from doom --- user/app/doom-emacs/config.el | 2 +- user/app/doom-emacs/doom.org | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index 1fd12f1..0d231ff 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -1447,7 +1447,7 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." (map! :leader :desc "Projectile grep" "/" #'projectile-grep) -(put 'projectile-grep 'disabled nil) +(after! projectile (put 'projectile-grep 'disabled nil)) ;;;-- projectile wrapper commands ;;;-- (require 'sudo-edit) diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index a55c388..feff4da 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -1680,7 +1680,7 @@ I don't have this active right now since it's kinda weird with pgtk... (map! :leader :desc "Projectile grep" "/" #'projectile-grep) -(put 'projectile-grep 'disabled nil) +(after! projectile (put 'projectile-grep 'disabled nil)) #+END_SRC ** sudo-edit From 67ec14a8ab354e4f9facc8a519018b645ee86d2d Mon Sep 17 00:00:00 2001 From: Emmet Date: Sun, 28 Apr 2024 15:12:13 -0500 Subject: [PATCH 2/2] Removed x's from magit-todos-keywords --- user/app/doom-emacs/config.el | 1 + user/app/doom-emacs/doom.org | 1 + 2 files changed, 2 insertions(+) diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index 0d231ff..bedb509 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -1226,6 +1226,7 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." :filter-return #'~/magit-process-environment) (require 'magit-todos) +(setq magit-todos-keywords-list '("TODO" "FIXME" "HACK" "REVIEW" "DEPRECATED" "BUG")) (magit-todos-mode 1) (evil-set-initial-state 'ibuffer-mode 'motion) diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index feff4da..afe88e7 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -1411,6 +1411,7 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." :filter-return #'~/magit-process-environment) (require 'magit-todos) +(setq magit-todos-keywords-list '("TODO" "FIXME" "HACK" "REVIEW" "DEPRECATED" "BUG")) (magit-todos-mode 1) #+END_SRC