From 5763a09a040221c887d8910ee8dc8542c237c10a Mon Sep 17 00:00:00 2001
From: Joseph Ferano <joseph@ferano.io>
Date: Sun, 18 Dec 2022 13:17:02 +0700
Subject: [PATCH] Hopefully final changes to Jetbrains/Emacs

---
 .config/emacs/init.org | 17 +++++++++++------
 .ideavimrc             |  7 ++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.config/emacs/init.org b/.config/emacs/init.org
index 968e71f..309e6e8 100644
--- a/.config/emacs/init.org
+++ b/.config/emacs/init.org
@@ -558,6 +558,7 @@ The theme of `C-x 4` bindings is that they operate on other windows, so this fun
         "^\\*Flymake.*" flymake-mode
         "^\\*Flycheck.*" flycheck-error-list-mode
         "^\\*lsp-help\\*" lsp-help-mode
+        "^\\*cargo-test\\*" cargo-test-mode
         ;; "^\\*ansi-term\\*$" term-mode
         ("^\\*Warnings\\*$" . hide)
         help-mode
@@ -1025,6 +1026,7 @@ startup. Reason we have to call this is so the vterm fucntion can call `vterm--i
   (define-key company-active-map (kbd "C-p") nil)
   (define-key company-active-map (kbd "<return>") nil)
   (define-key company-active-map (kbd "RET") nil)
+  (define-key company-active-map (kbd "M-d") #'company-show-doc-buffer)
   (define-key company-active-map (kbd "C-f") #'company-complete-selection)
   (define-key company-active-map [tab] #'company-complete-common-or-cycle)
   (define-key company-active-map (kbd "<backtab>") (lambda () (interactive) (company-complete-common-or-cycle -1)))
@@ -1105,13 +1107,16 @@ startup. Reason we have to call this is so the vterm fucntion can call `vterm--i
 *** Rust
 #+begin_src emacs-lisp
 (straight-use-package 'rustic)
-(straight-use-package 'parsec) ;; Required by evcxr-mode
+;; Disabling until we figure out how to get it working
+;; (straight-use-package 'parsec) ;; Required by evcxr-mode
 
-(straight-use-package
- '(evcxr
-   :type git
-   :host github
-   :repo "serialdev/evcxr-mode"))
+;; (straight-use-package
+;;  '(evcxr
+;;    :type git
+;;    :host github
+;;    :repo "serialdev/evcxr-mode"))
+
+(add-hook 'rust-mode-hook (lambda () (electric-pair-local-mode)))
 
 (add-hook 'rust-mode-hook
           (lambda ()
diff --git a/.ideavimrc b/.ideavimrc
index 3af7940..7678b5a 100755
--- a/.ideavimrc
+++ b/.ideavimrc
@@ -44,7 +44,6 @@ vnoremap > >gv
 map gt <Action>(GotoTypeDeclaration)
 
 map <Leader>f <Action>(FindInPath)
-map <C-A-d> <Action>(ToggleDistractionFreeMode)
 map <C-=> <Action>(EditorIncreaseFontSize)
 map <C--> <Action>(EditorDecreaseFontSize)
 map <C-0> <Action>(EditorResetFontSize)
@@ -75,8 +74,8 @@ noremap <C-y> 2<C-y>
 
 map <Leader>h  <Action>(HideAllWindows)
 map <Leader>q  <Action>(CloseContent)
-map <Leader>d  <Action>(QuickImplementations)
-map <Leader>t  <Action>(QuickJavaDoc)
+" map <Leader>t  <Action>(QuickImplementations)
+map <Leader>d  <Action>(QuickJavaDoc)
 map <Leader>e  <Action>(ShowErrorDescription)
 map <Leader>u  <Action>(FindUsages)
 map <Leader>rn <Action>(RenameElement)
@@ -87,6 +86,8 @@ map <Leader>bc <Action>(RunClass)
 map <Leader>bd <Action>(Debug)
 map <Leader>bs <Action>(BuildSolutionAction)
 map <Leader>; :actionlist<Space>
+map <Leader>th <Action>(ToggleInlayHintsGloballyAction)
+map <Leader>td <Action>(ToggleDistractionFreeMode)
 
 map <Leader>w <Action>(SaveDocument)
 map <Leader>or <Action>(ManageRecentProjects)