Merge branch 'master' of git.awful.club:jowj/chd

.emacs.d/init.el

@@ -41,11 +41,11 @@
  '(epg-gpg-program "/usr/local/bin/gpg")
  '(global-hl-line-mode t)
  '(package-selected-packages
-   '(edit-indirect poetry yasnippet company-lsp ob-restclient virtualenvwrapper flymake-python-pyflakes lsp-ui lsp-mode jedi znc yaml-mode which-key use-package twittering-mode try smex racer python-mode pylint py-autopep8 powershell pdf-tools outline-magic org2blog multiple-cursors magit helm flycheck-rust eyebrowse exec-path-from-shell emojify elpy ein doom-themes dockerfile-mode docker csharp-mode ansible anaconda-mode ace-window))
+    (lsp poetry yasnippet company-lsp ob-restclient virtualenvwrapper flymake-python-pyflakes lsp-ui lsp-mode jedi znc yaml-mode which-key use-package twittering-mode try smex racer python-mode pylint py-autopep8 powershell pdf-tools outline-magic org2blog multiple-cursors magit helm flycheck-rust eyebrowse exec-path-from-shell emojify elpy ein doom-themes dockerfile-mode docker csharp-mode ansible anaconda-mode ace-window)))
  '(znc-servers
    `(("bouncer.awful.club" 5000 t
       ((freenode "blindidiotgod/freenode" ,znc-password)
-       (OFTC "blindidiotgod/OFTC" ,znc-password))))))
+       (OFTC "blindidiotgod/OFTC" ,znc-password)))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

.emacs.d/jlj-golang.el

@@ -1,6 +1,6 @@
-(use-package eglot
+(use-package lsp-mode
   :ensure t
   :config
-  (add-hook 'go-mode-hook 'eglot-ensure)
+  (add-hook 'go-mode-hook 'lsp-ensure)
   (local-set-key "\C-x\C-m" 'compile)
   (setq compile-command "go test -v && go vet && golint"))