diff options
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/jao-custom-mac.el | 3 | ||||
| -rw-r--r-- | custom/jao-custom-programming.el | 15 |
2 files changed, 10 insertions, 8 deletions
diff --git a/custom/jao-custom-mac.el b/custom/jao-custom-mac.el index a4d44a1..94879c6 100644 --- a/custom/jao-custom-mac.el +++ b/custom/jao-custom-mac.el @@ -21,5 +21,8 @@ (add-to-list 'Info-directory-list "/opt/homebrew/share/info") +(setenv "CC" "clang") +(setenv "CXX" "clang++") + (provide 'jao-custom-mac) ;;; jao-custom-mac.el ends here diff --git a/custom/jao-custom-programming.el b/custom/jao-custom-programming.el index 6106e9a..cbc7d4f 100644 --- a/custom/jao-custom-programming.el +++ b/custom/jao-custom-programming.el @@ -308,11 +308,9 @@ (use-package rust-mode :ensure t - :demand t :hook (rust-mode . jao-rust-mode-hook) - :init - (setq rust-mode-treesitter-derive nil) :config + (setq rust-mode-treesitter-derive t) (use-package smartparens-rust :demand t) (defun jao-rust-mode-hook () @@ -329,21 +327,22 @@ (use-package rustic :ensure t - :demand t - :init + :after (rust-mode) + :config (setq rustic-format-on-save nil rustic-lsp-client 'eglot) ;; 'lsp-mode 'eglot nil - :config (jao-define-attached-buffer '(major-mode . rustic-compilation-mode) 25) :custom (rustic-cargo-use-last-stored-arguments nil) (rustic-analyzer-command '("rust-analyzer")) (rustic-cargo-test-runner 'nextest) (rustic-cargo-nextest-exec-command '("nextest" "run" "--color=never" "--show-progress=none")) - :bind (:map rustic-mode-map (("C-c d" . rustic-cargo-build-doc) + :bind (:map rustic-mode-map (("C-c d" . jao-rust-build-doc) + ("C-c t g" . jao-rust-goto-tests) ("C-c t w" . jao-rust-test-workspace) ("C-c t m" . jao-rust-test-module) - ("C-c t t" . rustic-cargo-current-test)))) + ("C-c t r" . jao-rust-retest) + ("C-c t t" . jao-rust-test-current)))) (use-package rust-playground :ensure t) |