From 6ddf714c78b8392ca5bdaadfcaba822f7f9b0a43 Mon Sep 17 00:00:00 2001 From: Quentin Aristote Date: Tue, 9 Nov 2021 13:55:58 +0100 Subject: map SPC f e D to ediff this file instead of trying to ediff the link created by homemanager --- home/config/dotfiles/spacemacs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/home/config/dotfiles/spacemacs b/home/config/dotfiles/spacemacs index 8393fa9..320fb56 100644 --- a/home/config/dotfiles/spacemacs +++ b/home/config/dotfiles/spacemacs @@ -79,7 +79,7 @@ This function should only modify configuration layer settings." ;; `dotspacemacs/user-config'. To use a local version of a package, use the ;; `:location' property: '(your-package :location "~/path/to/your-package/") ;; Also include the dependencies as they will not be resolved automatically. - dotspacemacs-additional-packages '(request-deferred) + dotspacemacs-additional-packages '(request-deferred csv) ;; A list of packages that cannot be updated. dotspacemacs-frozen-packages '() @@ -541,7 +541,12 @@ before packages are loaded." '(merlin-command "ocamlmerlin")) (global-company-mode t) ;; Key bindings - (spacemacs/set-leader-keys-for-major-mode 'nix-mode "=" 'nix-format-buffer)) + (spacemacs/set-leader-keys-for-major-mode 'nix-mode "=" 'nix-format-buffer) + (defun my-ediff-dotfile-and-template () + (interactive) + (ediff-files "~/code/nix/latitude-7490/home/config/dotfiles/spacemacs" + (concat dotspacemacs-template-directory ".spacemacs.template"))) + (spacemacs/set-leader-keys "feD" 'my-ediff-dotfile-and-template)) ;; Do not write anything past this comment. This is where Emacs will ;; auto-generate custom variable definitions. -- cgit v1.2.3