From 52753d56186f32b2714d37c51d2720b1861657ff Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@onec.me>
Date: Mon, 24 Feb 2020 21:48:31 -0500
Subject: [PATCH] Add lsp mode back in, plus smog

---
 emacs/.config/doom/config.el   |  4 ++++
 emacs/.config/doom/init.el     | 22 +++++++++++-----------
 emacs/.config/doom/packages.el |  4 +---
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/emacs/.config/doom/config.el b/emacs/.config/doom/config.el
index 431f413..82cd6db 100644
--- a/emacs/.config/doom/config.el
+++ b/emacs/.config/doom/config.el
@@ -85,6 +85,10 @@
 (after! org-alert-mode
   (setq alert-default-style 'libnotify))
 
+;; enable smog writing analysis
+(use-package smog
+  :config (setq smog-command "style -L en"))
+
 ;;
 ;; Modules
 
diff --git a/emacs/.config/doom/init.el b/emacs/.config/doom/init.el
index 0726d6f..8ef5bc6 100644
--- a/emacs/.config/doom/init.el
+++ b/emacs/.config/doom/init.el
@@ -82,7 +82,7 @@
        gist              ; interacting with github gists
        (lookup           ; helps you navigate your code and documentation
         +docsets)        ; ...or in Dash docsets locally
-       ;;lsp
+       lsp
        ;;macos             ; MacOS-specific commands
        magit             ; a git porcelain for Emacs
        make              ; run make tasks from Emacs
@@ -99,28 +99,28 @@
        ;;agda              ; types of types of types of types...
        ;;assembly          ; assembly for fun or debugging
        ;;cc                ; C/C++/Obj-C madness
-       clojure             ; java with a lisp
+       ;;clojure             ; java with a lisp
        ;;common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
        crystal             ; ruby at the speed of c
        ;;csharp            ; unity, .NET, and mono shenanigans
        data                ; config/data formats
        ;;erlang            ; an elegant language for a more civilized age
-       elixir              ; erlang done right
+       (elixir +lsp)       ; erlang done right
        elm                 ; care for a cup of TEA?
        emacs-lisp          ; drown in parentheses
        ;;ess               ; emacs speaks statistics
        ;;fsharp            ; ML stands for Microsoft's Language
-       go                  ; the hipster dialect
+       (go +lsp)           ; the hipster dialect
        ;;(haskell +intero) ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
        ;;idris             ;
        ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
-       javascript          ; all(hope(abandon(ye(who(enter(here))))))
+       (javascript +lsp)   ; all(hope(abandon(ye(who(enter(here))))))
        julia               ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        ;;latex             ; writing papers in Emacs has never been so fun
-       ledger            ; an accounting system in Emacs
+       ledger              ; an accounting system in Emacs
        ;;lua               ; one-based indices? one-based indices
        markdown            ; writing docs for people to ignore
        nim                 ; python + lisp at the speed of c
@@ -140,13 +140,13 @@
        ;;php               ; perl's insecure younger brother
        plantuml            ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-       python              ; beautiful is better than ugly
+       (python +lsp)       ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
        racket              ; a DSL for DSLs
        rest                ; Emacs as a REST client
-       ruby                ; 1.step do {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       rust                ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
-       scala               ; java, but good
+       (ruby +lsp)         ; 1.step do {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+       (rust +lsp)         ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       (scala +lsp)        ; java, but good
        scheme              ; a fully conniving family of lisps
        (sh +fish)          ; she sells (ba|z|fi)sh shells on the C xor
        ;;solidity          ; do you need a blockchain? No.
@@ -165,7 +165,7 @@
        ;; should be loaded late.
        :app
        ;;calendar
-       ;;irc               ; how neckbeards socialize
+       irc               ; how neckbeards socialize
        (rss +org)        ; emacs as an RSS reader
        ;;twitter           ; twitter client https://twitter.com/vnought
 
diff --git a/emacs/.config/doom/packages.el b/emacs/.config/doom/packages.el
index fb9f220..e465b97 100644
--- a/emacs/.config/doom/packages.el
+++ b/emacs/.config/doom/packages.el
@@ -20,9 +20,6 @@
   :recipe (:host github
            :repo "Fuco1/justify-kp"))
 
-;; eglot instead of lsp
-(package! eglot)
-
 ;; python stuffs
 (package! w3m)
 (package! blacken)
@@ -63,6 +60,7 @@
 (package! kaolin-themes)
 (package! magit-circleci)
 (package! nyan-mode)
+(package! smog)
 
 ; provides typographical replacements
 (package! typo)