From 0244474e9fb6a49ec2d3d555e15e644f12479388 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Tue, 4 Sep 2018 15:01:07 -0400 Subject: Debug startup, support LSP, update KBDs Debug startup: - some packages were missing explicit use-package calls, which made this configuration incompatible with fresh computers. After crashing my MBP and trying to get this working thereafter, I learned. Support LSP: - LSP support for Haskell is good; embrace and prefer over Intero Update KBDs: - preferences change - changing to a light theme (for now) --- emacs.d/wpc/packages/wpc-keybindings.el | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'emacs.d/wpc/packages/wpc-keybindings.el') diff --git a/emacs.d/wpc/packages/wpc-keybindings.el b/emacs.d/wpc/packages/wpc-keybindings.el index 2c15b0df3a67..a20a803a433b 100644 --- a/emacs.d/wpc/packages/wpc-keybindings.el +++ b/emacs.d/wpc/packages/wpc-keybindings.el @@ -12,17 +12,6 @@ :fetcher github)) (general-evil-setup t) -(defun wpc/goto-definition () - "Support a goto-definition that dispatches off of the `major-mode'." - (interactive) - (require 'flow-minor-mode) - (cond ((eq major-mode 'rjsx-mode) - (flow-minor-jump-to-definition)) - ((eq major-mode 'haskell-mode) - (intero-goto-definition)) - (t - (evil-goto-definition)))) - ;; vim... (use-package evil :general @@ -37,7 +26,7 @@ "sj" 'wpc/evil-window-split-down "sj" 'wpc/evil-window-split-down) (n - "gd" 'wpc/goto-definition) + "gd" 'xref-find-definitions) (general-unbind m "M-." "C-p") (general-unbind n "s" "M-.") (general-unbind i "C-d" "C-a" "C-e" "C-n" "C-p" "C-k") @@ -68,7 +57,7 @@ "j" #'jump-to-register "h" #'help "a" #'wpc/toggle-terminal - "p" #'counsel-git-grep + "p" #'flycheck-previous-error "P" #'counsel-git-grep "f" #'wpc/find-file "n" #'flycheck-next-error -- cgit 1.4.1