rust -> rustic

5 files changed, 15 insertions, 9 deletions

diff --git a/custom.el b/custom.el
index c7910f3..59c5541 100644
--- a/custom.el
+++ b/custom.el
@@ -11,7 +11,7 @@
    '("8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" default))
  '(flycheck-display-errors-function #'flycheck-pos-tip-error-messages)
  '(package-selected-packages
-   '(elixir-mode add-node-modules-path prettier-js prettier hasklig-mode jq-mode uuidgen restclient erlang rust-mode flymake-go go-mode gradle-mode treemacs-projectile treemacs protobuf-mode yaml-mode web-mode visual-regexp-steroids systemd solarized-theme smart-mode-line slime purescript-mode projectile-ripgrep play-routes-mode paredit org-bullets multiple-cursors modern-cpp-font-lock magit lsp-ui ido-vertical-mode highlight-escape-sequences flycheck-pos-tip flycheck-haskell flycheck-clojure flycheck-clangcheck flx-ido ensime ember-mode elm-mode dockerfile-mode cquery company-lsp company-glsl company-c-headers cmake-mode clojure-snippets clojure-mode-extra-font-locking ace-window))
+   '(rustic elixir-mode add-node-modules-path prettier-js prettier hasklig-mode jq-mode uuidgen restclient erlang flymake-go go-mode gradle-mode treemacs-projectile treemacs protobuf-mode yaml-mode web-mode visual-regexp-steroids systemd solarized-theme smart-mode-line slime purescript-mode projectile-ripgrep play-routes-mode paredit org-bullets multiple-cursors modern-cpp-font-lock magit lsp-ui ido-vertical-mode highlight-escape-sequences flycheck-pos-tip flycheck-haskell flycheck-clojure flycheck-clangcheck flx-ido ensime ember-mode elm-mode dockerfile-mode cquery company-lsp company-glsl company-c-headers cmake-mode clojure-snippets clojure-mode-extra-font-locking ace-window))
  '(safe-local-variable-values '((projectile-project-run-cmd . "./build/jmessageGtk"))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/init.el b/init.el
index 6a95fe8..1515f2f 100644
--- a/init.el
+++ b/init.el
@@ -187,7 +187,7 @@ CURRENT-NAME, if it does not already have them:
      purescript-mode
      org-bullets
      restclient
-     rust-mode
+     rustic
      rust-playground
      sbt-mode
      slime
@@ -256,7 +256,7 @@ CURRENT-NAME, if it does not already have them:
 (require 'setup-protobuf-mode)
 (require 'setup-purescript-mode)
 (require 'setup-python-mode)
-(require 'setup-rust-mode)
+(require 'setup-rustic-mode)
 (require 'setup-slime-mode)
 (require 'setup-terraform-mode)
 (require 'setup-treemacs)
diff --git a/settings/sane-defaults.el b/settings/sane-defaults.el
index a8bbd6d..3c316d1 100644
--- a/settings/sane-defaults.el
+++ b/settings/sane-defaults.el
@@ -145,6 +145,9 @@
 ;; Dired Settings
 (setq dired-omit-mode t)
 
+;; which-key everywhere
+(setq which-key-mode t)
+
 ;; Override C-x C-c to open the default ansi-term buffer
 ;; 0. check if we are in GUI or user want to override behavior
 ;; 1. check if ansi-term buffer exists
diff --git a/settings/setup-rust-mode.el b/settings/setup-rust-mode.el
deleted file mode 100644
index c56cc3d..0000000
--- a/settings/setup-rust-mode.el
+++ /dev/null
@@ -1,6 +0,0 @@
-(setq rust-format-on-save t)
-
-(add-hook 'rust-mode-hook 'cargo-minor-mode t)
-
-(provide 'setup-rust-mode)
-;;; setup-rust-mode.el ends here
diff --git a/settings/setup-rustic-mode.el b/settings/setup-rustic-mode.el
new file mode 100644
index 0000000..382b910
--- /dev/null
+++ b/settings/setup-rustic-mode.el
@@ -0,0 +1,9 @@
+(defun rk/rustic-mode-hook ()
+  ;; so that run C-c C-c C-r works without having to confirm
+  (setq-local buffer-save-without-query t))
+
+(setq rustic-format-on-save t)
+(add-hook 'rustic-mode-hook 'rk/rustic-mode-hook)
+
+(provide 'setup-rustic-mode)
+;;; setup-rust-mode.el ends here