Hopefully final changes to Jetbrains/Emacs

This commit is contained in:
Joseph Ferano 2022-12-18 13:17:02 +07:00
parent 40eb32f619
commit 5763a09a04
2 changed files with 15 additions and 9 deletions

View File

@ -558,6 +558,7 @@ The theme of `C-x 4` bindings is that they operate on other windows, so this fun
"^\\*Flymake.*" flymake-mode "^\\*Flymake.*" flymake-mode
"^\\*Flycheck.*" flycheck-error-list-mode "^\\*Flycheck.*" flycheck-error-list-mode
"^\\*lsp-help\\*" lsp-help-mode "^\\*lsp-help\\*" lsp-help-mode
"^\\*cargo-test\\*" cargo-test-mode
;; "^\\*ansi-term\\*$" term-mode ;; "^\\*ansi-term\\*$" term-mode
("^\\*Warnings\\*$" . hide) ("^\\*Warnings\\*$" . hide)
help-mode 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 "C-p") nil)
(define-key company-active-map (kbd "<return>") nil) (define-key company-active-map (kbd "<return>") nil)
(define-key company-active-map (kbd "RET") 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 (kbd "C-f") #'company-complete-selection)
(define-key company-active-map [tab] #'company-complete-common-or-cycle) (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))) (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 *** Rust
#+begin_src emacs-lisp #+begin_src emacs-lisp
(straight-use-package 'rustic) (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 ;; (straight-use-package
'(evcxr ;; '(evcxr
:type git ;; :type git
:host github ;; :host github
:repo "serialdev/evcxr-mode")) ;; :repo "serialdev/evcxr-mode"))
(add-hook 'rust-mode-hook (lambda () (electric-pair-local-mode)))
(add-hook 'rust-mode-hook (add-hook 'rust-mode-hook
(lambda () (lambda ()

View File

@ -44,7 +44,6 @@ vnoremap > >gv
map gt <Action>(GotoTypeDeclaration) map gt <Action>(GotoTypeDeclaration)
map <Leader>f <Action>(FindInPath) map <Leader>f <Action>(FindInPath)
map <C-A-d> <Action>(ToggleDistractionFreeMode)
map <C-=> <Action>(EditorIncreaseFontSize) map <C-=> <Action>(EditorIncreaseFontSize)
map <C--> <Action>(EditorDecreaseFontSize) map <C--> <Action>(EditorDecreaseFontSize)
map <C-0> <Action>(EditorResetFontSize) map <C-0> <Action>(EditorResetFontSize)
@ -75,8 +74,8 @@ noremap <C-y> 2<C-y>
map <Leader>h <Action>(HideAllWindows) map <Leader>h <Action>(HideAllWindows)
map <Leader>q <Action>(CloseContent) map <Leader>q <Action>(CloseContent)
map <Leader>d <Action>(QuickImplementations) " map <Leader>t <Action>(QuickImplementations)
map <Leader>t <Action>(QuickJavaDoc) map <Leader>d <Action>(QuickJavaDoc)
map <Leader>e <Action>(ShowErrorDescription) map <Leader>e <Action>(ShowErrorDescription)
map <Leader>u <Action>(FindUsages) map <Leader>u <Action>(FindUsages)
map <Leader>rn <Action>(RenameElement) map <Leader>rn <Action>(RenameElement)
@ -87,6 +86,8 @@ map <Leader>bc <Action>(RunClass)
map <Leader>bd <Action>(Debug) map <Leader>bd <Action>(Debug)
map <Leader>bs <Action>(BuildSolutionAction) map <Leader>bs <Action>(BuildSolutionAction)
map <Leader>; :actionlist<Space> map <Leader>; :actionlist<Space>
map <Leader>th <Action>(ToggleInlayHintsGloballyAction)
map <Leader>td <Action>(ToggleDistractionFreeMode)
map <Leader>w <Action>(SaveDocument) map <Leader>w <Action>(SaveDocument)
map <Leader>or <Action>(ManageRecentProjects) map <Leader>or <Action>(ManageRecentProjects)