2 files changed, 16 insertions, 18 deletions
diff --git a/users/glittershark/emacs.d/config.el b/users/glittershark/emacs.d/config.el
index 60f3c167745e..c4b44c00fae2 100644
--- a/users/glittershark/emacs.d/config.el
+++ b/users/glittershark/emacs.d/config.el
@@ -37,21 +37,6 @@
 
 (require 'tvl)
 
-(after! rust
-  ;; (require 'ein)
-  (setq rust-format-on-save t)
-  (add-hook! :after rust-mode-hook #'lsp)
-  (add-hook! :after rust-mode-hook #'rust-enable-format-on-save))
-
-(add-hook! rust-mode
-  (flycheck-rust-setup)
-  (flycheck-mode)
-  (cargo-minor-mode)
-  (lsp)
-  (rust-enable-format-on-save)
-  (map! :map rust-mode-map
-        "C-c C-f" #'rust-format-buffer))
-
 (add-hook! elixir-mode
   (require 'flycheck-credo)
   (setq flycheck-elixir-credo-strict t)
@@ -63,9 +48,6 @@
 
   (flycheck-mode))
 
-(after! cargo
-  (setq cargo-process--custom-path-to-bin "/home/grfn/.cargo/bin/cargo"))
-
 (setq +solarized-s-base03    "#002b36"
       +solarized-s-base02    "#073642"
       ;; emphasized content
diff --git a/users/glittershark/emacs.d/rust.el b/users/glittershark/emacs.d/rust.el
index 540ffcd82e98..1976ed7c9e4a 100644
--- a/users/glittershark/emacs.d/rust.el
+++ b/users/glittershark/emacs.d/rust.el
@@ -1,8 +1,24 @@
 ;;; ../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)
   (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)
   (rust-enable-format-on-save)
   (lsp))
 
 (add-hook 'rust-mode-hook #'grfn/rust-setup)
+
+(map!
+ (:map rust-mode-map
+  :n "g RET" #'cargo-process-current-file-tests
+  :n "g R" #'lsp-find-references
+  (:localleader
+   "m" #'lsp-rust-analyzer-expand-macro)))