From 53d2f38fb04a0c19ce3d7454bee89d856f8960cc Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely.polonkai@ericsson.com>
Date: Mon, 10 Oct 2016 15:47:55 +0200
Subject: [PATCH] Move company configuration to use-package

---
 init.el | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/init.el b/init.el
index 4235b16..052b918 100644
--- a/init.el
+++ b/init.el
@@ -279,6 +279,15 @@
   :config
   (sml/setup))
 
+(use-package company
+  :bind
+  (:map company-mode-map
+   ("C-:" . helm-company)
+   :map company-active-map
+   ("C-:" . helm-company))
+  :config
+  (global-company-mode t))
+
 ;; Load my own functions
 (load "gnu-c-header.el")
 (load "toggle-window-split.el")
@@ -307,10 +316,6 @@
      (define-key helm-gtags-mode-map (kbd "C-c >") 'helm-gtags-next-history)
      (define-key helm-gtags-mode-map (kbd "M-,") 'helm-gtags-pop-stack)))
 (helm-mode 1)
-(eval-after-load 'company
-  '(progn
-     (define-key company-mode-map (kbd "C-:") 'helm-company)
-     (define-key company-active-map (kbd "C-:") 'helm-company)))
 
 ;; Waka-waka
 (add-hook 'after-init-hook 'global-wakatime-mode)
@@ -394,7 +399,6 @@
 (define-key origami-mode-map (kbd "x") 'origami-reset)
 
 ;; Set up some global minor modes
-(add-hook 'after-init-hook 'global-company-mode)
 (global-origami-mode t)
 (show-paren-mode t)
 (projectile-global-mode)