Compare commits

..

5 Commits

Author SHA1 Message Date
2912d3842a add dynamic window margin support to window hydra 2026-11-05 22:49:08 +01:00
30fd644ad4 add smerge init 2026-11-05 22:48:58 +01:00
72c6f3f145 enhance smerge hydra 2026-11-05 22:48:44 +01:00
43fcb0d790 disable embark 2026-11-05 22:48:28 +01:00
e1277ecb89 add word wrap in magit diff view 2026-11-05 22:48:02 +01:00
5 changed files with 90 additions and 68 deletions

View File

@@ -156,6 +156,7 @@
(require 'init-magit)
(require 'init-dired)
(require 'init-ediff)
(require 'init-smerge)
(require 'init-projectile)
(require 'init-occur)
;; (require 'init-audio) nope, I'm just not using it anymore

View File

@@ -111,6 +111,9 @@ Reach this hydra with <C-x B>, magit-blame mode must be active
;; FIXME: still needed?
(add-hook 'after-init-hook 'tvd-ignore-magit-warnings-if-any t)
;; long lines are practically invisible in diffs, so wrap them
(add-hook 'magit-diff-mode-hook #'visual-line-mode)
;; now, THIS is the pure genius me: hit "ls in magit-status buffer
;; and end up in a dired buffer of current repository. The default
;; binding for this is C-M-i, which is not memorizable, while "ls"

View File

@@ -131,68 +131,68 @@ a remote file anytime and from everywhere I am by just entering :"
completion-ignore-case t))
(use-package embark
:ensure t
;; (use-package embark
;; :ensure t
:bind
(("C-." . embark-act) ;; pick some comfortable binding
("C-," . embark-dwim)) ;; good alternative: M-.
;; :bind
;; (("C-." . embark-act) ;; pick some comfortable binding
;; ("C-," . embark-dwim)) ;; good alternative: M-.
:init
;; Optionally replace the key help with a completing-read interface
(setq prefix-help-command #'embark-prefix-help-command)
;; :init
;; ;; Optionally replace the key help with a completing-read interface
;; (setq prefix-help-command #'embark-prefix-help-command)
;; Show the Embark target at point via Eldoc. You may adjust the Eldoc
;; strategy, if you want to see the documentation from multiple providers.
(add-hook 'eldoc-documentation-functions #'embark-eldoc-first-target)
;; (setq eldoc-documentation-strategy #'eldoc-documentation-compose-eagerly)
;; ;; Show the Embark target at point via Eldoc. You may adjust the Eldoc
;; ;; strategy, if you want to see the documentation from multiple providers.
;; (add-hook 'eldoc-documentation-functions #'embark-eldoc-first-target)
;; ;; (setq eldoc-documentation-strategy #'eldoc-documentation-compose-eagerly)
:config
;; Hide the mode line of the Embark live/completions buffers
(add-to-list 'display-buffer-alist
'("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
nil
(window-parameters (mode-line-format . none))))
;; :config
;; ;; Hide the mode line of the Embark live/completions buffers
;; (add-to-list 'display-buffer-alist
;; '("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
;; nil
;; (window-parameters (mode-line-format . none))))
(defun embark-which-key-indicator ()
"An embark indicator that displays keymaps using which-key.
The which-key help message will show the type and value of the
current target followed by an ellipsis if there are further
targets."
(lambda (&optional keymap targets prefix)
(if (null keymap)
(which-key--hide-popup-ignore-command)
(which-key--show-keymap
(if (eq (plist-get (car targets) :type) 'embark-become)
"Become"
(format "Act on %s '%s'%s"
(plist-get (car targets) :type)
(embark--truncate-target (plist-get (car targets) :target))
(if (cdr targets) "…" "")))
(if prefix
(pcase (lookup-key keymap prefix 'accept-default)
((and (pred keymapp) km) km)
(_ (key-binding prefix 'accept-default)))
keymap)
nil nil t (lambda (binding)
(not (string-suffix-p "-argument" (cdr binding))))))))
;; (defun embark-which-key-indicator ()
;; "An embark indicator that displays keymaps using which-key.
;; The which-key help message will show the type and value of the
;; current target followed by an ellipsis if there are further
;; targets."
;; (lambda (&optional keymap targets prefix)
;; (if (null keymap)
;; (which-key--hide-popup-ignore-command)
;; (which-key--show-keymap
;; (if (eq (plist-get (car targets) :type) 'embark-become)
;; "Become"
;; (format "Act on %s '%s'%s"
;; (plist-get (car targets) :type)
;; (embark--truncate-target (plist-get (car targets) :target))
;; (if (cdr targets) "…" "")))
;; (if prefix
;; (pcase (lookup-key keymap prefix 'accept-default)
;; ((and (pred keymapp) km) km)
;; (_ (key-binding prefix 'accept-default)))
;; keymap)
;; nil nil t (lambda (binding)
;; (not (string-suffix-p "-argument" (cdr binding))))))))
(setq embark-indicators
'(embark-which-key-indicator
embark-highlight-indicator
embark-isearch-highlight-indicator))
;; (setq embark-indicators
;; '(embark-which-key-indicator
;; embark-highlight-indicator
;; embark-isearch-highlight-indicator))
(defun embark-hide-which-key-indicator (fn &rest args)
"Hide the which-key indicator immediately when using the completing-read prompter."
(which-key--hide-popup-ignore-command)
(let ((embark-indicators
(remq #'embark-which-key-indicator embark-indicators)))
(apply fn args)))
;; (defun embark-hide-which-key-indicator (fn &rest args)
;; "Hide the which-key indicator immediately when using the completing-read prompter."
;; (which-key--hide-popup-ignore-command)
;; (let ((embark-indicators
;; (remq #'embark-which-key-indicator embark-indicators)))
;; (apply fn args)))
(advice-add #'embark-completing-read-prompter
:around #'embark-hide-which-key-indicator))
;; (advice-add #'embark-completing-read-prompter
;; :around #'embark-hide-which-key-indicator))
(use-package consult
;; Replace bindings. Lazily loaded due by `use-package'.

View File

@@ -12,8 +12,8 @@
"
^Smerge Mode^
^^--------------------------------------------------------------
_n_: next conflict _u_: keep upper _s_: swap
_p_: prev conflict _l_: keep lower _h_: highlight
_n_: next conflict _t_: keep theirs _s_: swap
_p_: prev conflict _o_: keep ours _h_: highlight
_e_: Ediff _b_: keep base _r_: resolve
_q_: quit _RET_: keep hunk@point _R_: revert
@@ -23,18 +23,18 @@ Reach this hydra with <C-x m>
"
("n" smerge-next nil)
("p" smerge-prev nil)
("u" smerge-keep-upper nil)
("l" smerge-keep-lower nil)
("b" smerge-keep-base nil)
("RET" smerge-keep-current nil)
("h" smerge-refine nil)
("s" smerge-swap nil)
("r" smerge-resolve nil)
("R" undo-tree-undo nil)
("e" smerge-ediff nil :color blue)
("q" nil nil :color blue))
("n" smerge-next nil)
("p" smerge-prev nil)
("t" smerge-keep-upper nil)
("o" smerge-keep-lower nil)
("b" smerge-keep-base nil)
("RET" smerge-keep-current nil)
("h" smerge-refine nil)
("s" smerge-swap nil)
("r" smerge-resolve nil)
("R" undo-tree-undo nil)
("e" smerge-ediff nil :color blue)
("q" nil nil :color blue))
(global-set-key (kbd "C-x m") 'hydra-smerge/body)
(defalias 'merge 'hydra-smerge/body))

View File

@@ -176,12 +176,28 @@ _a_ || _d_ |---| _w_ --- _s_ ="
("s" enlarge-window nil)
("q" nil nil :color red))
;; (set-window-margins nil novel--cur-margin novel--cur-margin)
(setq current-window-margin 0)
(setq current-window-margin-step 10)
(defun tvd-window-margin-add()
(interactive)
(setq current-window-margin (+ current-window-margin current-window-margin-step))
(set-window-margins nil current-window-margin current-window-margin))
(defun tvd-window-margin-sub()
(interactive)
(setq current-window-margin (- current-window-margin current-window-margin-step))
(if (< current-window-margin 0)
(setq current-window-margin 0))
(set-window-margins nil current-window-margin current-window-margin))
(defhydra hydra-windows (:color blue)
"
^Window Management^
^^------------------------------------------------------------------------
_+_ Increase Font | _-_ Decrease Font Resize ^ ^ _w_ ^ ^
_+_: Increase Font | _-_: Decrease Font Resize ^ ^ _w_ ^ ^
_f_: Flip Windows <M-O> ^^ Current _a_ ^ ^ _d_
_4_: Quarter Windows <C-x 4> ^^ Window: ^ ^ _s_ ^ ^
_u_: Windows Undo <C-c left>
@@ -189,7 +205,7 @@ _r_: Windows Redo <C-c right> ^^ _l_: Adjust Background brighter
_i_: Invert Colors <C-c C-i> ^^ _b_: Adjust Background darker
_h_: Toggle Highlight Line Mode ^^ _e_: Eyebrowse Workspaces (C-x C-x)
_n_: Toogle Line Number Mode
_n_: Toogle Line Number Mode ^^ _m_: increase | _M_: decrease margin
^^------------------------------------------------------------------------
Reach this hydra with <C-x w>
@@ -212,6 +228,8 @@ Reach this hydra with <C-x w>
("e" hydra-eyebrowse/body nil)
("h" hl-line-mode nil)
("n" linum-mode nil)
("m" tvd-window-margin-add nil :color pink)
("M" tvd-window-margin-sub nil :color pink)
("q" nil nil :color red))
(global-set-key (kbd "C-x w") 'hydra-windows/body))