2 files changed, 18 insertions, 4 deletions
diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el
index 9eaa5391482b..9cd71fda5a90 100644
--- a/users/glittershark/emacs.d/config.el
+++ b/users/glittershark/emacs.d/config.el
@@ -611,7 +611,9 @@
         lsp-ui-doc-header nil
         lsp-ui-doc-position 'top
         lsp-ui-doc-alignment 'window
-        lsp-ui-doc-frame-hook '+grfn/lsp-ui-doc-frame-hook)
+        lsp-ui-doc-frame-hook '+grfn/lsp-ui-doc-frame-hook
+        lsp-ui-doc-max-width 150
+        lsp-ui-doc-max-height 13)
   (setq imenu-auto-rescan t)
   (set-face-background 'lsp-ui-doc-background +solarized-s-base2)
   (set-face-background 'lsp-face-highlight-read +solarized-s-base2)
diff --git a/users/glittershark/emacs.d/rust.el b/users/glittershark/emacs.d/rust.el
index 1976ed7c9e4a..35d2151d30ca 100644
--- a/users/glittershark/emacs.d/rust.el
+++ b/users/glittershark/emacs.d/rust.el
@@ -1,16 +1,19 @@
 ;;; ../code/depot/users/glittershark/emacs.d/rust.el -*- lexical-binding: t; -*-
 
-; (setq lsp-rust-analyzer-cargo-watch-command "clippy")
-
 (add-to-list 'auto-mode-alist '("\\.rs$" . rust-mode))
 
 (defun grfn/rust-setup ()
   (interactive)
+
+  (push '(?> . ("<" . ">")) evil-surround-pairs-alist)
+
   (setq lsp-rust-server 'rust-analyzer)
   (setq-local whitespace-line-column 100
               fill-column 100)
-  (setq-local rustic-format-trigger 'on-save)
   (setq rust-format-show-buffer nil)
+  (setq lsp-rust-analyzer-import-merge-behaviour "last"
+        lsp-rust-analyzer-cargo-watch-command "clippy"
+        lsp-ui-doc-enable t)
   (rust-enable-format-on-save)
   (lsp))
 
@@ -22,3 +25,12 @@
   :n "g R" #'lsp-find-references
   (:localleader
    "m" #'lsp-rust-analyzer-expand-macro)))
+
+(comment
+ (flycheck-get-next-checkers 'lsp)
+ (flycheck-add-next-checker)
+ (flycheck-get-next-checkers 'lsp)
+ )
+
+(set-company-backend! 'rust-mode
+  '(:separate company-capf company-yasnippet))