From 6d8fd8d83056a73d600392b01efc599159ca7e0e Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@unbl.ink>
Date: Wed, 17 Jun 2020 15:01:43 -0400
Subject: [PATCH] [emacs] Move back to eglot, lsp sucks

---
 emacs/.config/doom/config.org  |  5 ++++-
 emacs/.config/doom/init.el     | 12 +++++-----
 emacs/.config/doom/packages.el | 40 ++++++++++++++--------------------
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/emacs/.config/doom/config.org b/emacs/.config/doom/config.org
index e4e6560..3f2e915 100644
--- a/emacs/.config/doom/config.org
+++ b/emacs/.config/doom/config.org
@@ -7,6 +7,8 @@ My identity. Used in a handful of places in Emacs to prepopulate authorship and
 #+BEGIN_SRC emacs-lisp
 (setq user-full-name "Colin Powell"
       user-mail-address "colin@unbl.ink")
+
+(add-hook 'python-mode-hook 'eglot-ensure)
 #+END_SRC
 * User interface
 ** Fonts and themes
@@ -180,7 +182,6 @@ A handful of mods here clean up org mode. Line numbers don’t mean much when yo
                       ob-eval
                       ob-exp
                       ob-http
-                      org-drill
                       org-id)))
 
 ;; Don’t display git gutter in org mode
@@ -439,4 +440,6 @@ Here we are trying to auto-translate Word and PDF files to be viewed in Emacs.
         magithub-clone-default-directory "~/src" ;; I want my stuff to clone to ~/projects
         magithub-preferred-remote-method 'ssh_url)) ;; HTTPS cloning is awful, i authenticate with ssh keys.
 
+
+(setq lsp-enable-links nil)
 #+END_SRC
diff --git a/emacs/.config/doom/init.el b/emacs/.config/doom/init.el
index f87cc44..4d2c98d 100644
--- a/emacs/.config/doom/init.el
+++ b/emacs/.config/doom/init.el
@@ -33,7 +33,7 @@
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;hydra
        ;;indent-guides     ; highlighted indent columns
-       minimap           ; show a map of the code on the side
+       ;minimap           ; show a map of the code on the side
        modeline          ; snazzy, Atom-inspired modeline, plus API
        nav-flash         ; blink cursor line after big motions
        ;;neotree           ; a project drawer, like NERDTree for vim
@@ -41,7 +41,7 @@
        (popup +defaults)   ; tame sudden yet inevitable temporary windows
        ;;pretty-code       ; ligatures or substitute text with pretty symbols
        ;;tabs              ; an tab bar for Emacs
-       treemacs          ; a project drawer, like neotree but cooler
+       ;treemacs          ; a project drawer, like neotree but cooler
        unicode           ; extended unicode support for various languages
        vc-gutter         ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
@@ -53,7 +53,7 @@
        (evil +everywhere); come to the dark side, we have cookies
        file-templates    ; auto-snippets for empty files
        fold              ; (nigh) universal code folding
-       (format +onsave)  ; automated prettiness
+       format ; +onsave)  ; automated prettiness
        ;;god               ; run Emacs commands without modifier keys
        ;;lispy             ; vim for lisp, for people who don't like vim
        multiple-cursors  ; editing in many places at once
@@ -91,7 +91,7 @@
        (eval +overlay)     ; run code, run (also, repls)
        gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
-       lsp
+       ;lsp
        ;;macos             ; MacOS-specific commands
        magit             ; a git porcelain for Emacs
        make              ; run make tasks from Emacs
@@ -152,9 +152,9 @@
         +present)          ; using Emacs for presentations
        ;;perl              ; write code no one else can comprehend
        ;;php               ; perl's insecure younger brother
-       plantuml          ; diagrams for confusing people more
+       plantuml            ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-       (python +lsp)            ; beautiful is better than ugly
+       python              ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        rest              ; Emacs as a REST client
diff --git a/emacs/.config/doom/packages.el b/emacs/.config/doom/packages.el
index ab57aff..cca9a90 100644
--- a/emacs/.config/doom/packages.el
+++ b/emacs/.config/doom/packages.el
@@ -7,45 +7,37 @@
            :repo "hlissner/emacs-snippets"
            :files ("*")))
 
-(package! declutter
-  :recipe (:host github
-           :repo "sanel/declutter"))
-
-(package! evil-matchit
-  :recipe (:host github
-           :repo "redguardtoo/evil-matchit"))
+;(package! evil-matchit
+;  :recipe (:host github
+;           :repo "redguardtoo/evil-matchit"))
 
+; For making Nov.el look nice
 (package! justify-kp
   :recipe (:host github
            :repo "Fuco1/justify-kp"))
 
-;;(package! eglot)
+(package! eglot)
 
 ;; python stuffs
-(package! w3m)
 (package! blacken)
-(package! pylint)
-(package! py-isort)
-(package! importmagic)
+;;(package! pylint)
+;;(package! py-isort)
+;;(package! importmagic)
 
-;; slack ... okay one more time
-(package! slack)
 
 ;; org stuffs
 (package! ob-http)
 (package! org-web-tools)
-(package! org-vcard)
 (package! org-snooze)
 (package! org-alert)
-(package! org-drill)
-(package! org-superstar)
+;;(package! org-vcard)
+;;(package! org-drill)
+;;(package! org-superstar)
 
 ;; handy tools
+(package! w3m)
 (package! nov)
 (package! git-link)
-(package! auth-source-pass)
-(package! ivy-todo)
-(package! ivy-explorer)
 (package! ivy-lobsters)
 (package! web-search)
 (package! mpdel)
@@ -55,6 +47,9 @@
 (package! mastodon)
 (package! magit-circleci)
 (package! smog)
+(package! wordgen)
+;; slack ... okay one more time
+(package! slack)
 
 ;; pretty tings up
 (package! srcery-theme)
@@ -62,8 +57,5 @@
 (package! nyan-mode)
 (package! emojify)
 
-; provides typographical replacements
-(package! typo)
-
 ;; TODO Remove when nose shows up on github again
-(disable-packages! nose)
+;(disable-packages! nose)