General clean up
This commit is contained in:
parent
6d2f7d9011
commit
c3197fdd9e
6 changed files with 70 additions and 59 deletions
|
@ -4,7 +4,7 @@
|
|||
(eval-when-compile (require 'core))
|
||||
|
||||
(use-package company
|
||||
:diminish (company-mode . "=")
|
||||
:diminish "="
|
||||
:commands (global-company-mode company-complete-common company-dict
|
||||
company-files company-tags company-ispell company-yasnippet
|
||||
company-semantic company-dabbrev-code)
|
||||
|
@ -18,45 +18,40 @@
|
|||
company-dabbrev-ignore-case nil
|
||||
company-tooltip-align-annotations t
|
||||
company-require-match 'never
|
||||
company-global-modes '(not eshell-mode comint-mode org-mode erc-mode
|
||||
message-mode help-mode)
|
||||
company-frontends '(company-pseudo-tooltip-unless-just-one-frontend
|
||||
company-echo-metadata-frontend
|
||||
company-preview-if-just-one-frontend)
|
||||
company-global-modes '(not eshell-mode comint-mode erc-mode message-mode help-mode)
|
||||
company-frontends '(company-pseudo-tooltip-frontend
|
||||
company-echo-metadata-frontend)
|
||||
company-backends '((company-capf
|
||||
company-yasnippet
|
||||
company-dabbrev-code
|
||||
company-files
|
||||
company-keywords)
|
||||
company-dabbrev)
|
||||
company-statistics-file (concat narf-temp-dir "company-stats-cache.el")
|
||||
company-dict-dir (concat narf-private-dir "dict/"))
|
||||
|
||||
:config
|
||||
(require 'company-statistics)
|
||||
(require 'company-quickhelp)
|
||||
(setq company-quickhelp-delay nil
|
||||
;; Rewrite evil-complete to use company-dabbrev
|
||||
company-dabbrev-code-other-buffers t
|
||||
evil-complete-next-func 'narf/company-evil-complete-next
|
||||
evil-complete-previous-func 'narf/company-evil-complete-previous)
|
||||
|
||||
;; TODO Restore company-dict
|
||||
;; (use-package company-dict :defer t)
|
||||
|
||||
(add-to-list 'company-transformers 'company-sort-by-occurrence)
|
||||
(setq-default company-backends (append '(company-keywords) company-backends))
|
||||
(after! yasnippet
|
||||
(setq-default company-backends
|
||||
(append '(company-capf company-yasnippet) company-backends)))
|
||||
|
||||
(define-company-backend! nxml-mode (nxml yasnippet))
|
||||
(define-company-backend! emacs-lisp-mode (elisp yasnippet))
|
||||
|
||||
;; (use-package company-dict :defer t)
|
||||
;; (setq-default company-backends
|
||||
;; (append '(company-dict company-keywords) company-backends))
|
||||
(define-key company-active-map "\C-w" nil)
|
||||
|
||||
;; Rewrite evil-complete to use company-dabbrev
|
||||
(setq company-dabbrev-code-other-buffers t
|
||||
evil-complete-next-func 'narf/company-evil-complete-next
|
||||
evil-complete-previous-func 'narf/company-evil-complete-previous)
|
||||
|
||||
(define-key company-active-map (kbd "C-w") nil)
|
||||
|
||||
(shut-up!
|
||||
(setq company-statistics-file (concat narf-temp-dir "company-stats-cache.el"))
|
||||
(require 'company-statistics)
|
||||
(company-statistics-mode))
|
||||
|
||||
(global-company-mode +1))
|
||||
(global-company-mode +1)
|
||||
(company-statistics-mode +1)
|
||||
(company-quickhelp-mode 1))
|
||||
|
||||
(provide 'core-company)
|
||||
;;; core-company.el ends here
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue