diff --git a/home/emacs/init.el b/home/emacs/init.el index 4812d83c..4bf51c5b 100644 --- a/home/emacs/init.el +++ b/home/emacs/init.el @@ -174,6 +174,14 @@ :config (winner-mode)) +(use-package ediff + :bind (("C-c d f" . ediff-files) + ("C-c d b" . ediff-buffers) + ("C-c d 3 f" . ediff-files3) + ("C-c d 3 b" . ediff-buffers3)) + :custom + (ediff-window-setup-function #'ediff-setup-windows-plain)) + (use-package ligature :ensure t :config @@ -265,7 +273,7 @@ (use-package darkroom :ensure t - :bind (("C-c d" . darkroom-mode))) + :defer t) (use-package zone :ensure t diff --git a/home/emacs/init.org b/home/emacs/init.org index 879d1ddd..84722f20 100644 --- a/home/emacs/init.org +++ b/home/emacs/init.org @@ -213,6 +213,16 @@ (winner-mode)) #+end_src +*** ediff +#+begin_src emacs-lisp :tangle yes + (use-package ediff + :bind (("C-c d f" . ediff-files) + ("C-c d b" . ediff-buffers) + ("C-c d 3 f" . ediff-files3) + ("C-c d 3 b" . ediff-buffers3)) + :custom + (ediff-window-setup-function #'ediff-setup-windows-plain)) +#+end_src ** Font ligatures #+begin_src emacs-lisp (use-package ligature @@ -315,7 +325,7 @@ #+begin_src emacs-lisp (use-package darkroom :ensure t - :bind (("C-c d" . darkroom-mode))) + :defer t) #+end_src ** Zone