Move company config, always disable auto-complete

This commit is contained in:
Ivan Malison 2016-08-15 14:32:35 -07:00
parent 414a841c20
commit 36850a3ff2
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8

View File

@ -1810,7 +1810,7 @@ Sets environment variables by starting a shell
:config :config
(company-auctex-init)) (company-auctex-init))
#+END_SRC #+END_SRC
** Navigation/Completion ** Navigation
*** zop-to-char *** zop-to-char
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package zop-to-char (use-package zop-to-char
@ -2017,6 +2017,46 @@ This was stolen from https://github.com/jwiegley/dot-emacs
(require 'helm) (require 'helm)
(helm-other-buffer 'helm-c-source-zsh-history "*helm zsh history*")) (helm-other-buffer 'helm-c-source-zsh-history "*helm zsh history*"))
#+END_SRC #+END_SRC
** Completion
*** company
#+BEGIN_SRC emacs-lisp
(use-package company
:commands company-mode imalison:company
:bind (("C-\\" . imalison:company))
:config
(progn
(imalison:prefix-alternatives imalison:company
company-complete
company-yasnippet)
(setq company-idle-delay .25)
(global-company-mode)
(diminish 'company-mode))
:init
(add-hook 'prog-mode-hook (lambda () (company-mode t))))
#+END_SRC
**** company-flx
#+BEGIN_SRC emacs-lisp
(use-package company-flx
:disabled t
:after company
:config
(company-flx-mode +1))
#+END_SRC
*** auto-complete
I don't use auto-complete at all, so I have set up a hook to automatically disable it whenever it is enabled to avoid creating conflicting popups when company is activated.
#+BEGIN_SRC emacs-lisp
(use-package auto-complete
:preface
(progn
(defun imalison:auto-complete-hook ()
(warn "auto-complete-mode was activated, but is being automatically disabled.")
(let ((auto-complete-mode-hook nil))
(auto-complete-mode -1))))
:config
(progn
(add-hook 'auto-complete-mode-hook 'imalison:auto-complete-hook)))
#+END_SRC
** Text Manipulation ** Text Manipulation
*** smartparens *** smartparens
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@ -2973,32 +3013,6 @@ I had to disable this mode because something that it does messes with coding set
(progn (progn
(add-hook 'prog-mode-hook (lambda () (rainbow-delimiters-mode t))))) (add-hook 'prog-mode-hook (lambda () (rainbow-delimiters-mode t)))))
#+END_SRC #+END_SRC
*** company
#+BEGIN_SRC emacs-lisp
(use-package company
:commands company-mode imalison:company
:bind (("C-\\" . imalison:company))
:config
(progn
(imalison:prefix-alternatives imalison:company
company-complete
company-yasnippet)
(setq company-idle-delay .25)
(global-company-mode)
(diminish 'company-mode))
:init
(add-hook 'prog-mode-hook (lambda () (company-mode t))))
#+END_SRC
**** company-flx
#+BEGIN_SRC emacs-lisp
(use-package company-flx
:disabled t
:after company
:config
(company-flx-mode +1))
#+END_SRC
*** undo-tree *** undo-tree
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package undo-tree (use-package undo-tree