mirror of
https://github.com/fscotto/infra.git
synced 2026-09-27 19:03:47 +00:00
Refactor Emacs for authoring workflows
This commit is contained in:
@@ -1,41 +1,6 @@
|
||||
(use-package magit
|
||||
:ensure t
|
||||
:commands (magit-status magit-log)
|
||||
:init
|
||||
;; Entry point principale
|
||||
(setq magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
|
||||
:config
|
||||
;; Performance & UX
|
||||
(setq magit-refresh-status-buffer nil)
|
||||
(setq magit-repository-directories
|
||||
'(("~/Projects" . 2)
|
||||
("~/Work" . 2))))
|
||||
;;; vcs.el --- Optional Git interface -*- lexical-binding: t; -*-
|
||||
|
||||
(use-package vdiff
|
||||
:ensure t
|
||||
:commands (vdiff-current-file vdiff-files vdiff-merge-conflict)
|
||||
:custom
|
||||
(vdiff-lock-scrolling t)
|
||||
(vdiff-auto-refine t))
|
||||
(autoload 'magit-status "magit" nil t)
|
||||
(global-set-key (kbd "C-x g") #'magit-status)
|
||||
|
||||
(use-package vdiff-magit
|
||||
:ensure t
|
||||
:after (magit vdiff)
|
||||
:commands (vdiff-magit vdiff-magit-dwim)
|
||||
:custom
|
||||
(vdiff-magit-use-ediff-for-merges nil)
|
||||
:config
|
||||
(define-key magit-mode-map "e" #'vdiff-magit-dwim)
|
||||
(define-key magit-mode-map "E" #'vdiff-magit)
|
||||
(transient-suffix-put 'magit-dispatch "e" :description "vdiff (dwim)")
|
||||
(transient-suffix-put 'magit-dispatch "e" :command #'vdiff-magit-dwim)
|
||||
(transient-suffix-put 'magit-dispatch "E" :description "vdiff")
|
||||
(transient-suffix-put 'magit-dispatch "E" :command #'vdiff-magit))
|
||||
|
||||
(use-package ztree
|
||||
:ensure t
|
||||
:commands (ztree-diff ztree-dir))
|
||||
|
||||
(provide 'vcs)
|
||||
|
||||
;;; vcs.el ends here
|
||||
(provide 'misc/vcs)
|
||||
|
||||
Reference in New Issue
Block a user