From 3547a8d4a5028e61bef152a9afd50ab148e83bda Mon Sep 17 00:00:00 2001 From: Magdalena Szweda Date: Sat, 3 Oct 2026 10:07:23 +0200 Subject: vc(jj): make vc-jj included in vc-next-action --- doom/.config/doom/config.el | 6 +++--- doom/.config/doom/config.org | 6 +++--- readme.org | 36 +++++++++++++----------------------- 3 files changed, 19 insertions(+), 29 deletions(-) diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el index 483b6c7..944be5d 100644 --- a/doom/.config/doom/config.el +++ b/doom/.config/doom/config.el @@ -327,12 +327,12 @@ emms-cache-file (concat doom-cache-dir "emms-cache")) (my/vc-jj-bookmark-advance)) (advice-add 'vc-jj-push :before #'my/vc-jj--advance-before-push) (setq my/vc-jj-advance-to "@-") + (defun my/vc-jj-checkin (files comment &optional _rev) - "Describe @, start a fresh change, advance bookmarks, push." + "Describe @ and start a fresh change." (let ((default-directory (vc-jj-root (car files)))) (vc-jj-modify-change-comment nil "@" comment) - (vc-jj--command-dispatched nil 0 nil "new" "--quiet") - (vc-jj-push nil))) + (vc-jj--command-dispatched nil 0 nil "new" "--quiet"))) (advice-add 'vc-jj-checkin :override #'my/vc-jj-checkin)) (setq org-directory "~/org/") diff --git a/doom/.config/doom/config.org b/doom/.config/doom/config.org index 95e35ab..10fa070 100644 --- a/doom/.config/doom/config.org +++ b/doom/.config/doom/config.org @@ -611,12 +611,12 @@ Here we fix it! (my/vc-jj-bookmark-advance)) (advice-add 'vc-jj-push :before #'my/vc-jj--advance-before-push) (setq my/vc-jj-advance-to "@-") + (defun my/vc-jj-checkin (files comment &optional _rev) - "Describe @, start a fresh change, advance bookmarks, push." + "Describe @ and start a fresh change." (let ((default-directory (vc-jj-root (car files)))) (vc-jj-modify-change-comment nil "@" comment) - (vc-jj--command-dispatched nil 0 nil "new" "--quiet") - (vc-jj-push nil))) + (vc-jj--command-dispatched nil 0 nil "new" "--quiet"))) (advice-add 'vc-jj-checkin :override #'my/vc-jj-checkin)) #+end_src diff --git a/readme.org b/readme.org index 093f94e..4c69ade 100644 --- a/readme.org +++ b/readme.org @@ -1,29 +1,19 @@ ** my debian config files warn: xmonad is a backup, might be removed later * PREREQUISITES - - git - - dwm - - fish - - alacritty - - mpd - - mpd-discord-rpc - - mpdscribble - - nano - - ncmpcpp - - OpenSSH - - x11/xinitrc - - vim - ** xmonad - - xmonad + libs + deps - - xmobar + + git + + xmonad + + fish + + alacritty + + mpd + + nano + + OpenSSH + + x11/xinitrc + + emacs +** xmonad + + xmonad + libs + deps + + xmobar * INSTALL: - go to https://commitmono.com - install the font zip - extract to /usr/share/fonts - git clone https://tangled.org/sophies.rocks/dots/ ~/stow + git clone https://tangled.org/roughlynamed.net/dots/ ~/stow cd ~/stow/ stow */ - vim - :PlugInstall - - -- cgit v1.2.3