Replace Auto-complete with Company-Mode

This commit is contained in:
madmaurice 2017-10-11 23:33:07 +02:00
parent fd17b02d35
commit 2bbf482aee

View file

@ -64,7 +64,7 @@
'(menu-bar-mode nil) '(menu-bar-mode nil)
'(package-selected-packages '(package-selected-packages
(quote (quote
(evil-org org-bullets counsel powerline-evil powerline origami projectile terminal-here shell-pop swiper neotree centered-cursor-mode ivy heroku-theme auto-complete use-package yasnippet evil-surround org evil-magit magit makefile-runner evil))) (company delight evil-org org-bullets counsel powerline-evil powerline origami projectile terminal-here shell-pop swiper neotree centered-cursor-mode ivy heroku-theme auto-complete use-package yasnippet evil-surround org evil-magit magit makefile-runner evil)))
'(scroll-bar-mode nil) '(scroll-bar-mode nil)
'(shell-pop-shell-type '(shell-pop-shell-type
(quote (quote
@ -81,6 +81,16 @@
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(company-preview ((t (:foreground "black"))))
'(company-preview-common ((t (:inherit company-preview))))
'(company-preview-search ((t (:inherit company-preview))))
'(company-scrollbar-bg ((t (:background "dim gray"))))
'(company-scrollbar-fg ((t (:background "gray"))))
'(company-template-field ((t (:foreground "dark orange"))))
'(company-tooltip ((t (:background "dim gray" :foreground "black"))))
'(company-tooltip-annotation ((t (:foreground "gray19"))))
'(company-tooltip-common ((t (:inherit company-preview))))
'(company-tooltip-selection ((t (:background "dark gray"))))
'(ivy-current-match ((t (:foreground "gold")))) '(ivy-current-match ((t (:foreground "gold"))))
'(minibuffer-prompt ((t (:foreground "dark orange" :weight bold)))) '(minibuffer-prompt ((t (:foreground "dark orange" :weight bold))))
'(neo-dir-link-face ((t (:foreground "#fce94f")))) '(neo-dir-link-face ((t (:foreground "#fce94f"))))
@ -245,22 +255,30 @@
(projectile-global-mode t) (projectile-global-mode t)
(setq projectile-completion-system 'ivy)) (setq projectile-completion-system 'ivy))
;; Auto-Complete ;; Company mode
(use-package auto-complete (use-package company
:ensure t :ensure t
:demand t :demand t
:delight
:config :config
(require 'auto-complete-config) (global-company-mode))
(setq ac-sources '(ac-source-filename
ac-source-functions ;; Auto-Complete
ac-source-yasnippet ;;(use-package auto-complete
ac-source-variables ;; :ensure t
ac-source-symbols ;; :demand t
ac-source-features ;; :delight
ac-source-words-in-all-buffer ;; :disabled
ac-source-dictionary)) ;; :config
(global-auto-complete-mode)) ;; (require 'auto-complete-config)
;; (setq ac-sources '(ac-source-filename
;; ac-source-functions
;; ac-source-yasnippet
;; ac-source-variables
;; ac-source-symbols
;; ac-source-features
;; ac-source-words-in-all-buffer
;; ac-source-dictionary))
;; (global-auto-complete-mode))
;; folding ;; folding
(use-package origami (use-package origami