5 files changed, 27 insertions, 19 deletions
diff --git a/bard-emacs-modules/bard-emacs-completion.el b/bard-emacs-modules/bard-emacs-completion.el
index 059ff76..32f6637 100644
--- a/bard-emacs-modules/bard-emacs-completion.el
+++ b/bard-emacs-modules/bard-emacs-completion.el
@@ -84,6 +84,7 @@
   :ensure t
   :defer 2
   :bind*
+  ("C-x r b" . consult-bookmark)
   ("M-g M-g" . consult-goto-line)
   ("C-x b" . consult-buffer)
   ("M-s M-f" . consult-find)
diff --git a/bard-emacs-modules/bard-emacs-email.el b/bard-emacs-modules/bard-emacs-email.el
index e898fa3..0d14f20 100644
--- a/bard-emacs-modules/bard-emacs-email.el
+++ b/bard-emacs-modules/bard-emacs-email.el
@@ -53,7 +53,7 @@
 
 (setq notmuch-show-empty-saved-searches t)
 (setq notmuch-saved-searches
-      `(( :name "📥 inbox"
+      `(( :name "📥 inbox (all-mail)"
           :query "tag:inbox"
           :sort-order newest-first
           :key ,(kbd "i"))
@@ -61,15 +61,19 @@
           :query "tag:unread and tag:inbox"
           :sort-order newest-first
           :key ,(kbd "u"))
-        ( :name "🐃 contrib"
+        ( :name "🚩 flagged"
+          :query "tag:flag"
+          :sort-order newest-first
+          :key ,(kbd "f"))
+        ( :name "🐃 contributions"
           :query "tag:unread and tag:contrib"
           :sort-order newest-first
           :key ,(kbd "c"))
-        ( :name "🐧 linux"
+        ( :name "🐧 linux-related"
           :query "tag:unread and tag:linux"
           :sort-order newest-first
           :key ,(kbd "l"))
-        ( :name "🚂 emacs devel"
+        ( :name "🚂 emacs developement"
           :query "tag:unread and tag:contrib"
           :sort-order newest-first
           :key ,(kbd "ed"))
@@ -77,7 +81,7 @@
           :query "tag:unread and tag:emacs-humanities"
           :sort-order newest-first
           :key ,(kbd "eh"))
-        ( :name "🦄 emacs org"
+        ( :name "🦄 emacs org-mode"
           :query "tag:unread and tag:emacs-org"
           :sort-order newest-first
           :key ,(kbd "eo"))))
diff --git a/bard-emacs-modules/bard-emacs-emms.el b/bard-emacs-modules/bard-emacs-emms.el
index c0e2413..0a7d249 100644
--- a/bard-emacs-modules/bard-emacs-emms.el
+++ b/bard-emacs-modules/bard-emacs-emms.el
@@ -28,15 +28,20 @@
 (emms-playing-time-disable-display)
 
 ;; Keymaps
-(define-key global-map (kbd "<f8>") #'emms)
-(define-key global-map (kbd "M-<f8>") #'emms-browser)
-(define-key emms-playlist-mode-map (kbd "A") #'emms-add-directory)
-(define-key emms-playlist-mode-map (kbd "T") #'emms-add-directory-tree)
-(define-key emms-playlist-mode-map (kbd "F") #'emms-add-file)
-(define-key emms-playlist-mode-map (kbd "U") #'emms-add-url)
-(define-key emms-playlist-mode-map (kbd "L") #'emms-toggle-repeat-track)
-(define-key emms-playlist-mode-map (kbd "<mouse-3>") #'emms-pause)
-(define-key emms-playlist-mode-map (kbd "<SPC>") #'emms-pause)
-(define-key emms-playlist-mode-map (kbd "c") #'bard/emms-recenter)
+(use-package emms
+  :bind
+  (:map emms-playlist-mode-map
+   ("M-<f8>" . emms-browser)
+   ("A" . emms-add-directory)
+   ("T" . emms-add-directory-tree)
+   ("F" . emms-add-file)
+   ("U" . emms-add-url)
+   ("L" . emms-toggle-repeat-track)
+   ("<mouse-3>" . emms-pause)
+   ("<SPC>" . emms-pause)
+   ("c" . bard/emms-recenter))
+  :bind ("<f8>" . emms)
+  :hook
+  (emms-playlist-mode . hl-line-mode))
 
 (provide 'bard-emacs-emms)
diff --git a/bard-emacs-modules/bard-emacs-prog.el b/bard-emacs-modules/bard-emacs-prog.el
index f783eb0..3a57156 100644
--- a/bard-emacs-modules/bard-emacs-prog.el
+++ b/bard-emacs-modules/bard-emacs-prog.el
@@ -121,8 +121,8 @@
 ;; Version control
 (use-package magit
   :ensure t
-  :config
-  (define-key global-map (kbd "C-c g") #'magit))
+  :bind
+  ("C-c g" . magit))
 
 (use-package ada-mode
   :after dired
diff --git a/bard-emacs-modules/bard-emacs-theme.el b/bard-emacs-modules/bard-emacs-theme.el
index 9d23846..2535d9f 100644
--- a/bard-emacs-modules/bard-emacs-theme.el
+++ b/bard-emacs-modules/bard-emacs-theme.el
@@ -221,8 +221,6 @@ The exact color values are taken from the active Modus theme."
 
   (define-key global-map (kbd "C-c f") #'fontaine-set-preset))
 
-
-
 ;;; Cursor appearance (cursory)
 ;; Read the manual: <https://protesilaos.com/emacs/cursory>.
 (use-package cursory