diff --git a/ha-aux-apps.org b/ha-aux-apps.org index bc528a6..73ebc21 100644 --- a/ha-aux-apps.org +++ b/ha-aux-apps.org @@ -43,10 +43,11 @@ Glad to see the 2FA feature is working on the [[https://codeberg.org/martianh/ma (use-package mastodon :straight (:repo "https://codeberg.org/martianh/mastodon.el") :init - (setq mastodon-instance-url "https://mastodon.xyz" - mastodon-active-user "howard") ; Find me at @howard@mastodon.xyz + (setq mastodon-instance-url "https://emacs.ch" + mastodon-active-user "howard") :config - (mastodon-discover)) + (mastodon-discover) + (ha-leader "a m" 'mastodon)) #+end_src Now I need to make a function to paste the same message to both while we make a transition. * Telega diff --git a/ha-config.org b/ha-config.org index 4b56c75..e606d70 100644 --- a/ha-config.org +++ b/ha-config.org @@ -1744,8 +1744,7 @@ Can not live without [[https://magit.vc/][Magit]], a Git porcelain for Emacs. I "g C" '("Magit clone" . magit-clone) "g F" '("Magit fetch" . magit-fetch) "g L" '("Magit buffer log" . magit-log-buffer-file) - "g r" '("Revert file" . magit-file-checkout) - "g R" '("Revert file" . vc-revert) + "g R" '("Revert file" . magit-file-checkout) "g S" '("Git stage file" . magit-stage-file) "g U" '("Git unstage file" . magit-unstage-file) @@ -1767,6 +1766,20 @@ Can not live without [[https://magit.vc/][Magit]], a Git porcelain for Emacs. I "g c f" '("Fixup" . magit-commit-fixup) "g c b" '("Branch" . magit-branch-and-checkout))) #+end_src +*** Git Gutter +The [[https://github.com/syohex/emacs-git-gutter-fringe][git-gutter-fringe]] project displays markings in the fringe (extreme left margin) to show modified and uncommitted lines. This project builds on [[https://github.com/emacsorphanage/git-gutter][git-gutter]] project to provide movement between /hunks/: +#+begin_src emacs-lisp + (use-package git-gutter-fringe + :config + (global-git-gutter-mode) + + (ha-leader + "g n" '("next hunk" . git-gutter:next-hunk) + "g p" '("previous hunk" . git-gutter:previous-hunk) + "g e" '("end of hunk" . git-gutter:end-of-hunk) + "g r" '("revert hunk" . git-gutter:revert-hunk) + "g s" '("stage hunk" . git-gutter:stage-hunk))) +#+end_src *** Git Delta The [[https://scripter.co/using-git-delta-with-magit][magit-delta]] project uses [[https://github.com/dandavison/delta][git-delta]] for colorized diffs. #+begin_src emacs-lisp