summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--custom/jao-custom-completion.el1
-rw-r--r--init.el11
2 files changed, 8 insertions, 4 deletions
diff --git a/custom/jao-custom-completion.el b/custom/jao-custom-completion.el
index fdcc636..d4a0a9a 100644
--- a/custom/jao-custom-completion.el
+++ b/custom/jao-custom-completion.el
@@ -113,7 +113,6 @@
("C-c I" . consult-project-imenu)
;; ("C-c o" . consult-outline)
("C-c k" . consult-ripgrep)
- ("C-c K" . consult-git-grep)
("C-c L" . consult-locate)
("C-c s" . consult-line)
("C-x r x" . consult-register)
diff --git a/init.el b/init.el
index 8f1ae1e..70012d4 100644
--- a/init.el
+++ b/init.el
@@ -1834,6 +1834,11 @@
;;;; other git packages
(use-package git-timemachine :ensure t)
+(use-package consult-git-log-grep
+ :ensure t
+ :custom (consult-git-log-grep-open-function #'magit-show-commit)
+ :bind (("C-c K" . consult-git-grep)))
+
;; git config --local git-link.remote / git-link.branch
(use-package git-link :ensure t)
(use-package git-modes :ensure t)
@@ -2580,8 +2585,8 @@
(use-package mastodon
:ensure t
:init
- (setq mastodon-instance-url "https://mastodon.social"
- mastodon-active-user "jao@gnu.org")
+ (setq mastodon-instance-url "https://emacs.ch"
+ mastodon-active-user "mail@jao.io")
:config
:bind (:map eww-mode-map ("T" . jao-mastodon-toot-url)))
@@ -2593,7 +2598,7 @@
(defun jao-mastodon ()
(interactive)
- (jao-afio-goto-scratch)
+ (jao-afio-goto-chats)
(mastodon))
;;;; startup