From 10ea06b661bafb5e66f62db1c05bbcdc9c2bec53 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 25 May 2017 20:11:24 +0200 Subject: [PATCH] General cleanup + refactor --- modules/completion/company/config.el | 1 - modules/lang/cc/config.el | 1 + modules/lang/csharp/config.el | 13 ++++++------ modules/lang/elm/config.el | 11 ++++------ modules/lang/go/config.el | 4 ++-- modules/lang/java/config.el | 4 ++-- modules/lang/org/config.el | 30 +++++++++++++-------------- modules/lang/org/packages.el | 2 +- modules/private/hlissner/+bindings.el | 2 +- modules/ui/doom-modeline/config.el | 2 +- 10 files changed, 33 insertions(+), 37 deletions(-) diff --git a/modules/completion/company/config.el b/modules/completion/company/config.el index 6a8020289..8e308631c 100644 --- a/modules/completion/company/config.el +++ b/modules/completion/company/config.el @@ -26,7 +26,6 @@ company-complete-common company-manual-begin company-grab-line) :config (setq company-idle-delay nil - company-minimum-prefix-length 2 company-tooltip-limit 10 company-dabbrev-downcase nil company-dabbrev-ignore-case nil diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index f628b4c8f..3f36b2cb3 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -114,6 +114,7 @@ (def-package! irony :after cc-mode + :commands irony-install-server :init (add-hook! 'c-mode-common-hook (when (memq major-mode '(c-mode c++-mode objc-mode)) diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el index 6a1bc18d6..e1c4c8593 100644 --- a/modules/lang/csharp/config.el +++ b/modules/lang/csharp/config.el @@ -1,19 +1,18 @@ ;;; module-csharp.el -(def-package! csharp-mode - :mode "\\.cs$" - :init (add-hook 'csharp-mode-hook #'flycheck-mode)) +(def-package! csharp-mode :mode "\\.cs$") (def-package! omnisharp - :commands omnisharp-mode + :after csharp-mode :preface (setq omnisharp-auto-complete-want-documentation nil 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 + (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)) (map! :map omnisharp-mode-map diff --git a/modules/lang/elm/config.el b/modules/lang/elm/config.el index 36bfe11a2..376c6c95e 100644 --- a/modules/lang/elm/config.el +++ b/modules/lang/elm/config.el @@ -2,17 +2,14 @@ (def-package! elm-mode :mode "\\.elm$" - :init - (add-hook 'elm-mode-hook #'flycheck-mode) - (add-hook 'elm-mode-hook #'rainbow-delimiters-mode) :config + (add-hook! 'elm-mode-hook #'(flycheck-mode rainbow-delimiters-mode)) (set! :company-backend 'elm-mode '(company-elm)) - (setq elm-format-on-save t) -) + (setq elm-format-on-save t)) + (def-package! flycheck-elm :after elm-mode :config - (add-hook! 'flycheck-mode-hook #'flycheck-elm-setup) -) + (add-hook 'flycheck-mode-hook #'flycheck-elm-setup)) diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el index 88e059e18..299b94b05 100644 --- a/modules/lang/go/config.el +++ b/modules/lang/go/config.el @@ -3,10 +3,10 @@ (def-package! go-mode :mode "\\.go$" :interpreter "go" - :init + :config (add-hook 'go-mode-hook #'flycheck-mode) (add-hook! go-mode (add-hook 'before-save-hook #'gofmt-before-save nil t)) - :config + (set! :build 'go-build 'go-mode #'+go/build) (set! :repl 'go-mode #'gorepl-run) diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el index 1763a4ba5..d42bd829f 100644 --- a/modules/lang/java/config.el +++ b/modules/lang/java/config.el @@ -2,9 +2,9 @@ (def-package! meghanada :commands meghanada-mode - :init - (add-hook! 'java-mode-hook #'(meghanada-mode flycheck-mode)) :config + (add-hook! 'java-mode-hook #'(meghanada-mode flycheck-mode)) + (set! :build 'compile-file 'java-mode #'meghanada-compile-file) (set! :build 'compile-project 'java-mode #'meghanada-compile-project) diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index b2343a005..35182f79a 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -264,28 +264,28 @@ "C-k" nil) (:map evil-org-mode-map - :n "RET" #'+org/dwim-at-point + :n "RET" #'+org/dwim-at-point ;; - :ni "A-L" #'org-shiftmetaright - :ni "A-H" #'org-shiftmetaleft - :ni "A-K" #'org-shiftmetaup - :ni "A-J" #'org-shiftmetadown + :ni "A-L" #'org-shiftmetaright + :ni "A-H" #'org-shiftmetaleft + :ni "A-K" #'org-shiftmetaup + :ni "A-J" #'org-shiftmetadown ;; Expand tables (or shiftmeta move) :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-k" #'+org/table-prepend-row-or-shift-up :ni "C-S-j" #'+org/table-append-row-or-shift-down ;; Navigate table cells - :i "C-L" #'+org/table-next-field - :i "C-H" #'+org/table-previous-field - :i "C-K" #'+org/table-previous-row - :i "C-J" #'+org/table-next-row + :i "C-L" #'+org/table-next-field + :i "C-H" #'+org/table-previous-field + :i "C-K" #'+org/table-previous-row + :i "C-J" #'+org/table-next-row - :i "C-e" #'org-end-of-line - :i "C-a" #'org-beginning-of-line + :i "C-e" #'org-end-of-line + :i "C-a" #'org-beginning-of-line - :i [tab] #'+org/indent-or-next-field-or-yas-expand - :i [backtab] #'+org/dedent-or-prev-field + :i [tab] #'+org/indent-or-next-field-or-yas-expand + :i [backtab] #'+org/dedent-or-prev-field :n [tab] #'+org/toggle-fold :v [backtab] #'+snippets/expand-on-region @@ -336,8 +336,8 @@ :n "zO" #'outline-show-all :n "zr" #'outline-show-all - :m "]]" (λ! (call-interactively #'org-forward-heading-same-level) (org-beginning-of-line)) - :m "[[" (λ! (call-interactively #'org-backward-heading-same-level) (org-beginning-of-line)) + :m "]]" (λ! (org-forward-heading-same-level nil) (org-beginning-of-line)) + :m "[[" (λ! (org-backward-heading-same-level nil) (org-beginning-of-line)) :m "]l" #'org-next-link :m "[l" #'org-previous-link diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el index b5695cad9..d39f28ad8 100644 --- a/modules/lang/org/packages.el +++ b/modules/lang/org/packages.el @@ -3,7 +3,7 @@ ;; 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, -;; comment out this package! block and download org-plus-contrib from +;; comment out this `package!' block and download org-plus-contrib from ;; orgmode.org. (package! org-plus-contrib :recipe (:fetcher git :url "http://orgmode.org/org-mode.git")) diff --git a/modules/private/hlissner/+bindings.el b/modules/private/hlissner/+bindings.el index 26489bf24..444598144 100644 --- a/modules/private/hlissner/+bindings.el +++ b/modules/private/hlissner/+bindings.el @@ -269,7 +269,7 @@ :i "C-l" #'+company/whole-lines :i "C-k" #'+company/dict-or-keywords :i "C-f" #'company-files - :i "C-]" #'company-tags + :i "C-]" #'company-etags :i "s" #'company-ispell :i "C-s" #'company-yasnippet :i "C-o" #'company-capf diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el index 66d689014..28680680e 100644 --- a/modules/ui/doom-modeline/config.el +++ b/modules/ui/doom-modeline/config.el @@ -52,7 +52,7 @@ (add-hook! :append '(isearch-mode-end-hook +evil-esc-hook) #'anzu--reset-status) (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