@@ -418,9 +418,9 @@ "C-<tab>" #'evil-switch-to-windows-last-buffer)
   (:states 'normal
            ";" #'evil-ex)
   (:states '(normal)
-           "g ." #'my/ls-code-actions
+           "g ." #'eglot-code-actions
            "g s" #'consult-imenu
-           "g S" #'my/ls-consult-symbol))
+           "g S" #'consult-eglot-symbols))
 
 (add-hook 'c-mode-common-hook ; make b/w/e include underscore as *part* of a word
           (lambda () (modify-syntax-entry ?_ "w")))
@@ -1163,69 +1163,6 @@ (use-package consult-eglot
   :commands (consult-eglot-symbols)
   :after eglot)
 
-(use-package lsp-mode
-  :defer 3
-  :ghook ('(go-mode-hook)
-          #'lsp-deferred)
-  ('lsp-mode-hook #'lsp-enable-which-key-integration)
-  ('lsp-completion-mode-hook #'my/lsp-mode-setup-completion)
-  :general (:states 'normal :keymaps 'lsp-mode-map
-                    "gr" #'xref-find-references
-                    "C-t" #'xref-go-back)
-  :config (progn
-            (setq lsp-auto-guess-root t
-                  lsp-auto-execute-action nil
-                  lsp-headerline-breadcrumb-enable nil
-                  lsp-enable-suggest-server-download nil
-                  lsp-modeline-diagnostics-enable nil
-                  lsp-completion-provider :none ; value `:capf' is actually for company :(
-                  lsp-diagnostics-provider t     ; this means prefer flymake over flycheck, why‽
-                  )
-
-            (defun my/lsp-mode-setup-completion ()
-              (setf (alist-get 'styles (alist-get 'lsp-capf completion-category-defaults))
-                    '(flex)))
-
-            (lsp-register-custom-settings
-             '(("golangci-lint.command"
-                ["golangci-lint" "run" "--output.json.path" "/dev/stdout"])))
-
-            (lsp-register-client
-             (make-lsp-client :new-connection (lsp-stdio-connection
-                                               '("golangci-lint-langserver"))
-                              :activation-fn (lsp-activate-on "go")
-                              :language-id "go"
-                              :priority 0
-                              :server-id 'golangci-lint
-                              :add-on? t
-                              :library-folders-fn #'lsp-go--library-default-directories
-                              :initialization-options (lambda ()
-                                                        (gethash "golangci-lint"
-                                                                 (lsp-configuration-section "golangci-lint")))))))
-
-(use-package yasnippet
-  :after lsp-mode
-  :ghook ('lsp-completion-mode-hook #'yas-minor-mode))
-
-(defun my/ls-rename ()
-  (interactive)
-  (if lsp-mode
-      (call-interactively #'lsp-rename)
-    (call-interactively #'eglot-rename)))
-
-(defun my/ls-consult-symbol ()
-  (interactive)
-  (if lsp-mode
-      (call-interactively #'consult-lsp-symbols)
-    (call-interactively #'consult-eglot-symbols)))
-
-(defun my/ls-code-actions ()
-  (interactive)
-  (call-interactively
-   (if lsp-mode
-       #'lsp-execute-code-action
-     #'eglot-code-actions)))
-
 ;;;; Reformat on save
 
 (use-package apheleia
@@ -1255,16 +1192,16 @@ "h" '(:keymap ehelp-map :package ehelp)
   "w" '(:keymap evil-window-map :package evil)
   "x" '(:keymap ctl-x-map)
   "c" (general-simulate-key "C-c")
-  "j" #'my/ls-consult-symbol
+  "j" #'consult-eglot-symbols
   "m" #'magit-status
-  "r" #'my/ls-rename
+  "r" #'eglot-rename
   "q" #'evil-delete-buffer
   "p" '(:keymap project-prefix-map :package project)
   "v" #'split-window-right
   "o" #'other-window
   "u" #'universal-argument
   ";" #'execute-extended-command
-  "a" #'my/ls-code-actions
+  "a" #'eglot-code-actions
   "bb" #'consult-buffer
   "bx" #'kill-current-buffer
   "br" #'revert-buffer