General cleanup + refactor
This commit is contained in:
parent
0e78cde69d
commit
10ea06b661
10 changed files with 33 additions and 37 deletions
|
@ -26,7 +26,6 @@
|
||||||
company-complete-common company-manual-begin company-grab-line)
|
company-complete-common company-manual-begin company-grab-line)
|
||||||
:config
|
:config
|
||||||
(setq company-idle-delay nil
|
(setq company-idle-delay nil
|
||||||
company-minimum-prefix-length 2
|
|
||||||
company-tooltip-limit 10
|
company-tooltip-limit 10
|
||||||
company-dabbrev-downcase nil
|
company-dabbrev-downcase nil
|
||||||
company-dabbrev-ignore-case nil
|
company-dabbrev-ignore-case nil
|
||||||
|
|
|
@ -114,6 +114,7 @@
|
||||||
|
|
||||||
(def-package! irony
|
(def-package! irony
|
||||||
:after cc-mode
|
:after cc-mode
|
||||||
|
:commands irony-install-server
|
||||||
:init
|
:init
|
||||||
(add-hook! 'c-mode-common-hook
|
(add-hook! 'c-mode-common-hook
|
||||||
(when (memq major-mode '(c-mode c++-mode objc-mode))
|
(when (memq major-mode '(c-mode c++-mode objc-mode))
|
||||||
|
|
|
@ -1,19 +1,18 @@
|
||||||
;;; module-csharp.el
|
;;; module-csharp.el
|
||||||
|
|
||||||
(def-package! csharp-mode
|
(def-package! csharp-mode :mode "\\.cs$")
|
||||||
:mode "\\.cs$"
|
|
||||||
:init (add-hook 'csharp-mode-hook #'flycheck-mode))
|
|
||||||
|
|
||||||
|
|
||||||
(def-package! omnisharp
|
(def-package! omnisharp
|
||||||
:commands omnisharp-mode
|
:after csharp-mode
|
||||||
:preface
|
:preface
|
||||||
(setq omnisharp-auto-complete-want-documentation nil
|
(setq omnisharp-auto-complete-want-documentation nil
|
||||||
omnisharp-server-executable-path (concat doom-local-dir "OmniSharp.exe"))
|
omnisharp-server-executable-path (concat doom-local-dir "OmniSharp.exe"))
|
||||||
:when (file-exists-p omnisharp-server-executable-path)
|
|
||||||
:init
|
|
||||||
(add-hook! csharp-mode #'(eldoc-mode omnisharp-mode))
|
|
||||||
:config
|
:config
|
||||||
|
(if (file-exists-p omnisharp-server-executable-path)
|
||||||
|
(add-hook! csharp-mode #'(eldoc-mode flycheck-mode omnisharp-mode))
|
||||||
|
(warn "csharp-mode: omnisharp server isn't installed, completion won't work"))
|
||||||
|
|
||||||
(set! :company-backend 'csharp-mode '(company-omnisharp))
|
(set! :company-backend 'csharp-mode '(company-omnisharp))
|
||||||
|
|
||||||
(map! :map omnisharp-mode-map
|
(map! :map omnisharp-mode-map
|
||||||
|
|
|
@ -2,17 +2,14 @@
|
||||||
|
|
||||||
(def-package! elm-mode
|
(def-package! elm-mode
|
||||||
:mode "\\.elm$"
|
:mode "\\.elm$"
|
||||||
:init
|
|
||||||
(add-hook 'elm-mode-hook #'flycheck-mode)
|
|
||||||
(add-hook 'elm-mode-hook #'rainbow-delimiters-mode)
|
|
||||||
:config
|
:config
|
||||||
|
(add-hook! 'elm-mode-hook #'(flycheck-mode rainbow-delimiters-mode))
|
||||||
(set! :company-backend 'elm-mode '(company-elm))
|
(set! :company-backend 'elm-mode '(company-elm))
|
||||||
(setq elm-format-on-save t)
|
(setq elm-format-on-save t))
|
||||||
)
|
|
||||||
|
|
||||||
(def-package! flycheck-elm
|
(def-package! flycheck-elm
|
||||||
:after elm-mode
|
:after elm-mode
|
||||||
:config
|
:config
|
||||||
(add-hook! 'flycheck-mode-hook #'flycheck-elm-setup)
|
(add-hook 'flycheck-mode-hook #'flycheck-elm-setup))
|
||||||
)
|
|
||||||
|
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
(def-package! go-mode
|
(def-package! go-mode
|
||||||
:mode "\\.go$"
|
:mode "\\.go$"
|
||||||
:interpreter "go"
|
:interpreter "go"
|
||||||
:init
|
:config
|
||||||
(add-hook 'go-mode-hook #'flycheck-mode)
|
(add-hook 'go-mode-hook #'flycheck-mode)
|
||||||
(add-hook! go-mode (add-hook 'before-save-hook #'gofmt-before-save nil t))
|
(add-hook! go-mode (add-hook 'before-save-hook #'gofmt-before-save nil t))
|
||||||
:config
|
|
||||||
(set! :build 'go-build 'go-mode #'+go/build)
|
(set! :build 'go-build 'go-mode #'+go/build)
|
||||||
(set! :repl 'go-mode #'gorepl-run)
|
(set! :repl 'go-mode #'gorepl-run)
|
||||||
|
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
|
|
||||||
(def-package! meghanada
|
(def-package! meghanada
|
||||||
:commands meghanada-mode
|
:commands meghanada-mode
|
||||||
:init
|
|
||||||
(add-hook! 'java-mode-hook #'(meghanada-mode flycheck-mode))
|
|
||||||
:config
|
:config
|
||||||
|
(add-hook! 'java-mode-hook #'(meghanada-mode flycheck-mode))
|
||||||
|
|
||||||
(set! :build 'compile-file 'java-mode #'meghanada-compile-file)
|
(set! :build 'compile-file 'java-mode #'meghanada-compile-file)
|
||||||
(set! :build 'compile-project 'java-mode #'meghanada-compile-project)
|
(set! :build 'compile-project 'java-mode #'meghanada-compile-project)
|
||||||
|
|
||||||
|
|
|
@ -264,28 +264,28 @@
|
||||||
"C-k" nil)
|
"C-k" nil)
|
||||||
|
|
||||||
(:map evil-org-mode-map
|
(:map evil-org-mode-map
|
||||||
:n "RET" #'+org/dwim-at-point
|
:n "RET" #'+org/dwim-at-point
|
||||||
;;
|
;;
|
||||||
:ni "A-L" #'org-shiftmetaright
|
:ni "A-L" #'org-shiftmetaright
|
||||||
:ni "A-H" #'org-shiftmetaleft
|
:ni "A-H" #'org-shiftmetaleft
|
||||||
:ni "A-K" #'org-shiftmetaup
|
:ni "A-K" #'org-shiftmetaup
|
||||||
:ni "A-J" #'org-shiftmetadown
|
:ni "A-J" #'org-shiftmetadown
|
||||||
;; Expand tables (or shiftmeta move)
|
;; Expand tables (or shiftmeta move)
|
||||||
:ni "C-S-l" #'+org/table-append-field-or-shift-right
|
:ni "C-S-l" #'+org/table-append-field-or-shift-right
|
||||||
:ni "C-S-h" #'+org/table-prepend-field-or-shift-left
|
:ni "C-S-h" #'+org/table-prepend-field-or-shift-left
|
||||||
:ni "C-S-k" #'+org/table-prepend-row-or-shift-up
|
:ni "C-S-k" #'+org/table-prepend-row-or-shift-up
|
||||||
:ni "C-S-j" #'+org/table-append-row-or-shift-down
|
:ni "C-S-j" #'+org/table-append-row-or-shift-down
|
||||||
;; Navigate table cells
|
;; Navigate table cells
|
||||||
:i "C-L" #'+org/table-next-field
|
:i "C-L" #'+org/table-next-field
|
||||||
:i "C-H" #'+org/table-previous-field
|
:i "C-H" #'+org/table-previous-field
|
||||||
:i "C-K" #'+org/table-previous-row
|
:i "C-K" #'+org/table-previous-row
|
||||||
:i "C-J" #'+org/table-next-row
|
:i "C-J" #'+org/table-next-row
|
||||||
|
|
||||||
:i "C-e" #'org-end-of-line
|
:i "C-e" #'org-end-of-line
|
||||||
:i "C-a" #'org-beginning-of-line
|
:i "C-a" #'org-beginning-of-line
|
||||||
|
|
||||||
:i [tab] #'+org/indent-or-next-field-or-yas-expand
|
:i [tab] #'+org/indent-or-next-field-or-yas-expand
|
||||||
:i [backtab] #'+org/dedent-or-prev-field
|
:i [backtab] #'+org/dedent-or-prev-field
|
||||||
|
|
||||||
:n [tab] #'+org/toggle-fold
|
:n [tab] #'+org/toggle-fold
|
||||||
:v [backtab] #'+snippets/expand-on-region
|
:v [backtab] #'+snippets/expand-on-region
|
||||||
|
@ -336,8 +336,8 @@
|
||||||
:n "zO" #'outline-show-all
|
:n "zO" #'outline-show-all
|
||||||
:n "zr" #'outline-show-all
|
:n "zr" #'outline-show-all
|
||||||
|
|
||||||
:m "]]" (λ! (call-interactively #'org-forward-heading-same-level) (org-beginning-of-line))
|
:m "]]" (λ! (org-forward-heading-same-level nil) (org-beginning-of-line))
|
||||||
:m "[[" (λ! (call-interactively #'org-backward-heading-same-level) (org-beginning-of-line))
|
:m "[[" (λ! (org-backward-heading-same-level nil) (org-beginning-of-line))
|
||||||
:m "]l" #'org-next-link
|
:m "]l" #'org-next-link
|
||||||
:m "[l" #'org-previous-link
|
:m "[l" #'org-previous-link
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
;; NOTE This is an insecure source, but unavoidable if we want org 9.0+.
|
;; NOTE This is an insecure source, but unavoidable if we want org 9.0+.
|
||||||
;; orgmode.org offers no secure access to this repo. If this bothers you,
|
;; orgmode.org offers no secure access to this repo. If this bothers you,
|
||||||
;; comment out this package! block and download org-plus-contrib from
|
;; comment out this `package!' block and download org-plus-contrib from
|
||||||
;; orgmode.org.
|
;; orgmode.org.
|
||||||
(package! org-plus-contrib :recipe (:fetcher git :url "http://orgmode.org/org-mode.git"))
|
(package! org-plus-contrib :recipe (:fetcher git :url "http://orgmode.org/org-mode.git"))
|
||||||
|
|
||||||
|
|
|
@ -269,7 +269,7 @@
|
||||||
:i "C-l" #'+company/whole-lines
|
:i "C-l" #'+company/whole-lines
|
||||||
:i "C-k" #'+company/dict-or-keywords
|
:i "C-k" #'+company/dict-or-keywords
|
||||||
:i "C-f" #'company-files
|
:i "C-f" #'company-files
|
||||||
:i "C-]" #'company-tags
|
:i "C-]" #'company-etags
|
||||||
:i "s" #'company-ispell
|
:i "s" #'company-ispell
|
||||||
:i "C-s" #'company-yasnippet
|
:i "C-s" #'company-yasnippet
|
||||||
:i "C-o" #'company-capf
|
:i "C-o" #'company-capf
|
||||||
|
|
|
@ -52,7 +52,7 @@
|
||||||
(add-hook! :append '(isearch-mode-end-hook +evil-esc-hook)
|
(add-hook! :append '(isearch-mode-end-hook +evil-esc-hook)
|
||||||
#'anzu--reset-status)
|
#'anzu--reset-status)
|
||||||
(after! iedit
|
(after! iedit
|
||||||
(add-hook 'iedit-mode-end-hook #'+doom-modeline|reset-anzu)))
|
(add-hook 'iedit-mode-end-hook #'anzu--reset-status)))
|
||||||
|
|
||||||
|
|
||||||
;;; Flash the mode-line on error
|
;;; Flash the mode-line on error
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue