diff options
Diffstat (limited to 'emacs/.config/emacs-kj/init.el')
| -rw-r--r-- | emacs/.config/emacs-kj/init.el | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el index 98a9f11..fb29820 100644 --- a/emacs/.config/emacs-kj/init.el +++ b/emacs/.config/emacs-kj/init.el @@ -234,7 +234,7 @@ ;; Optionally configure a different project root function. ;; There are multiple reasonable alternatives to chose from. ;;;; 1. project.el (the default) - (setq consult-project-function #'consult--default-project--function) + (setq consult-project-function #'consult--default-project-function) ;;;; 2. projectile.el (projectile-project-root) ;; (autoload 'projectile-project-root "projectile") ;; (setq consult-project-function (lambda (_) (projectile-project-root))) @@ -257,6 +257,12 @@ (use-package magit) (use-package org) +(use-package ediff + :init + (setq ediff-diff-options "-w" ; turn off whitespace checking + ediff-split-window-function #'split-window-horizontally + ediff-window-setup-function #'ediff-setup-windows-plain)) + (defun meow-setup () (setq meow-cheatsheet-layout meow-cheatsheet-layout-dvorak) (meow-leader-define-key @@ -371,3 +377,7 @@ (use-package diredfl :hook (dired-mode . diredfl-mode)) + +;; Tramp settings +(setq tramp-use-ssh-controlmaster-options nil + tramp-default-method "ssh") |