From 4100562febcfbfc66862c185035fd0ba67beb8ac Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Thu, 29 Sep 2022 14:21:17 -0700 Subject: Ediff config --- emacs/.config/emacs-kj/init.el | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'emacs/.config') diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el index 21095b6..b0b4a07 100644 --- a/emacs/.config/emacs-kj/init.el +++ b/emacs/.config/emacs-kj/init.el @@ -253,6 +253,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 -- cgit v1.2.3 From 046a146421b99d40659d789c533cebd8ce80c994 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Thu, 29 Sep 2022 14:23:47 -0700 Subject: Fix consult project function --- emacs/.config/emacs-kj/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'emacs/.config') diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el index b0b4a07..cec6496 100644 --- a/emacs/.config/emacs-kj/init.el +++ b/emacs/.config/emacs-kj/init.el @@ -230,7 +230,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))) -- cgit v1.2.3 From 07680453aceb132ccd899a563e86577e8bad3267 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Thu, 29 Sep 2022 14:35:44 -0700 Subject: Add tramp settings --- emacs/.config/emacs-kj/init.el | 3 +++ 1 file changed, 3 insertions(+) (limited to 'emacs/.config') diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el index cec6496..ec5a212 100644 --- a/emacs/.config/emacs-kj/init.el +++ b/emacs/.config/emacs-kj/init.el @@ -373,3 +373,6 @@ (use-package diredfl :hook (dired-mode . diredfl-mode)) + +;; Tramp settings +(setq tramp-use-ssh-controlmaster-options nil) -- cgit v1.2.3 From bd292f189e7d948d80ac605c9701942327f3a7b9 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Thu, 29 Sep 2022 15:06:19 -0700 Subject: Tramp config --- emacs/.config/emacs-kj/init.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'emacs/.config') diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el index ec5a212..f083d44 100644 --- a/emacs/.config/emacs-kj/init.el +++ b/emacs/.config/emacs-kj/init.el @@ -375,4 +375,5 @@ :hook (dired-mode . diredfl-mode)) ;; Tramp settings -(setq tramp-use-ssh-controlmaster-options nil) +(setq tramp-use-ssh-controlmaster-options nil + tramp-default-method "ssh") -- cgit v1.2.3