From 78d2a552eaa9f68f531226d2a0de2f90bdb1f633 Mon Sep 17 00:00:00 2001
From: Leni Ven <leniv@stanford.edu>
Date: Wed, 1 Feb 2023 01:15:03 -0800
Subject: [PATCH] Config hotkey cleanup; Add lsp lookup keys

---
 home/doomemacs/config.el | 17 ++++++++++-------
 home/doomemacs/init.el   | 16 ++++++++--------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/home/doomemacs/config.el b/home/doomemacs/config.el
index c780624..a1411c1 100644
--- a/home/doomemacs/config.el
+++ b/home/doomemacs/config.el
@@ -8,6 +8,7 @@
 (setq user-full-name "Leni Ven"
       user-mail-address "leniv@stanford.edu")
 
+
 ;; Key bindings
 (setq doom-localleader-key ",") ; Spacemacs like comma major mode
 (map! :leader ; "SPC b 0" kills window and buffer
@@ -22,13 +23,13 @@
 (map! :leader ; "SPC :" becomes M-:
       :desc "Evaluate expression (emacs M-:)"
       ":" #'eval-expression)
-
-(map! :localleader
-	(:map git-commit-mode-map
-	"c" #'with-editor-finish)
-	(:map git-commit-mode-map
-	"q" #'with-editor-cancel))
-
+(after! magit
+	(map! :localleader
+		(:map git-commit-mode-map
+		"c" #'with-editor-finish)
+		(:map git-commit-mode-map
+		"q" #'with-editor-cancel)
+	))
 
 (setq
 	;; Doom exposes five (optional) variables for controlling fonts in Doom:
@@ -156,6 +157,7 @@
 ;; change `org-directory'. It must be set before org loads!
 (setq org-directory "~/org/")
 
+
 (after! format
 	'(not
 		emacs-lisp-mode
@@ -166,6 +168,7 @@
 (after! spell
 	(setq ispell-dictionary "english"))
 
+
 (use-package! lilypond-mode
 	:init
 	(add-to-list 'auto-mode-alist '("\\.ly\\'" . LilyPond-mode))
diff --git a/home/doomemacs/init.el b/home/doomemacs/init.el
index 6d27620..a2585d7 100644
--- a/home/doomemacs/init.el
+++ b/home/doomemacs/init.el
@@ -92,21 +92,21 @@
        docker
        editorconfig      ; let someone else argue about tabs vs spaces
        ein               ; tame Jupyter notebooks with emacs
-       (eval +overlay)     ; run code, run (also, repls)
-       ;;gist              ; interacting with github gists
-       lookup              ; navigate your code and its documentation
-       lsp               ; M-x vscode
+       (eval +overlay)   ; run code, run (also, repls)
+       ;;gist            ; interacting with github gists
+       lookup            ; navigate your code and its documentation
+       (lsp +peek)       ; M-x vscode
        magit             ; a git porcelain for Emacs
        make              ; run make tasks from Emacs
-       ;;pass              ; password manager for nerds
+       ;;pass            ; password manager for nerds
        pdf               ; pdf enhancements
-       ;;prodigy           ; FIXME managing external services & code builders
+       ;;prodigy         ; FIXME managing external services & code builders
        rgb               ; creating color strings
        taskrunner        ; taskrunner for all your projects
-       ;;terraform         ; infrastructure as code
+       ;;terraform       ; infrastructure as code
        tmux              ; an API for interacting with tmux
        tree-sitter       ; syntax and parsing, sitting in a tree...
-       ;;upload            ; map local to remote projects via ssh/ftp
+       ;;upload          ; map local to remote projects via ssh/ftp
 
        :os
        (:if IS-MAC macos)  ; improve compatibility with macOS