Merge branch 'master' of github.com:vu3rdd/.emacs.d

[.emacs.d.git] / init.el

diff --git a/init.el b/init.el
index 0e9c17ff72b1ee5c4a132cf129cec70ec2fd6af4..1a7ba84a923528be168272fe1c1edcb16fcd8ec8 100644 (file)
--- a/init.el
+++ b/init.el
@@ -40,8 +40,8 @@
 (require 'package)
 (add-to-list 'package-archives
              '("melpa" . "http://melpa.milkbox.net/packages/") t)
-(add-to-list 'package-archives
-             '("marmalade" . "http://marmalade-repo.org/packages/") t)
+;; (add-to-list 'package-archives
+;;              '("marmalade" . "http://marmalade-repo.org/packages/") t)
 (package-initialize)
 
 ; fetch the list of packages available
@@ -61,7 +61,9 @@
                      notmuch
                      railscasts-theme
                      racket-mode
-                     auto-complete
+                     company-mode
+                     flycheck
+                     flycheck-haskell
                      magit
                      ledger-mode))
 
@@ -220,9 +222,8 @@
  ;; If there is more than one, they won't work right.
  )
 
-;; auto complete
-(ac-config-default)
-(ac-linum-workaround)
+;; company mode for auto completion
+(add-hook 'after-init-hook 'global-company-mode)
 
 ;; highlight todo
 ;; (add-hook 'prog-mode-hook 'highlight-todos)