From d6f11af7eb31304a695aa1f8458876edc578b15e Mon Sep 17 00:00:00 2001
From: Griffin Smith <grfn@gws.fyi>
Date: Mon, 14 Dec 2020 12:53:02 -0500
Subject: feat(gs/emacs): Update for latest doom changes

Change-Id: I771ada41a64961da9969d0ce805943698d2c9a31
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2253
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
---
 users/glittershark/emacs.d/config.el   | 9 ++-------
 users/glittershark/emacs.d/init.el     | 6 ++++--
 users/glittershark/emacs.d/packages.el | 2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'users')

diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el
index c4b44c00fa..6a8c41d9d9 100644
--- a/users/glittershark/emacs.d/config.el
+++ b/users/glittershark/emacs.d/config.el
@@ -392,11 +392,6 @@
   (set-fill-column 80)
   (setq evil-shift-width 2))
 
-;; (load! org-clubhouse)
-(add-hook! org-mode #'org-clubhouse-mode)
-
-(load! "slack-snippets")
-
 (auth-source-pass-enable)
 
 (require 'fill-column-indicator)
@@ -698,8 +693,8 @@
 ;;   ;; (push "build" counsel-etags-ignore-directories)
 ;;   )
 
-(use-package! evil-magit
-  :after (magit))
+;; (use-package! evil-magit
+;;   :after (magit))
 
 (use-package! writeroom-mode)
 
diff --git a/users/glittershark/emacs.d/init.el b/users/glittershark/emacs.d/init.el
index 2ee27d264d..8eaf774479 100644
--- a/users/glittershark/emacs.d/init.el
+++ b/users/glittershark/emacs.d/init.el
@@ -40,6 +40,7 @@
        ;;parinfer          ; turn lisp into python, sort of
        rotate-text       ; cycle region at point between text candidates
        snippets          ; my elves. They type so I don't have to
+       word-wrap
 
        :emacs
        (dired            ; making dired pretty [functional]
@@ -50,6 +51,7 @@
        ;;eshell            ; a consistent, cross-platform shell (WIP)
        ;;term              ; terminals in Emacs
        vc                ; version-control and Emacs, sitting in a tree
+       (undo +tree)
 
        :tools
        ;;ansible
@@ -58,7 +60,7 @@
        docker
        ;;editorconfig      ; let someone else argue about tabs vs spaces
        ;; ein               ; tame Jupyter notebooks with emacs
-       eval              ; run code, run (also, repls)
+       (eval +overlay)              ; run code, run (also, repls)
        gist              ; interacting with github gists
        (lookup           ; helps you navigate your code and documentation
         +docsets)        ; ...or in Dash docsets locally
@@ -153,7 +155,7 @@
        ;; +langtool)       ; a proofreader (grammar/style check) for Emacs
 
        :email
-       (mu4e +gmail)
+       ;; (mu4e +gmail)
        notmuch
 
        :collab
diff --git a/users/glittershark/emacs.d/packages.el b/users/glittershark/emacs.d/packages.el
index 011d8d41d1..67b3defdd7 100644
--- a/users/glittershark/emacs.d/packages.el
+++ b/users/glittershark/emacs.d/packages.el
@@ -71,7 +71,7 @@
 
 ;; Rust
 (package! rustic :disable t)
-(package! racer :disable t)
+;; (package! racer :disable t)
 (package! cargo)
 
 ;; Lisp
-- 
cgit 1.4.1