 	      (set (make-local-variable 'company-backends) '(company-go))
 	      (company-mode))))
 
-(setq aim/prefer-ac-complete t)
-
-;; (if aim/prefer-ac-complete
-;;     (aim/setup-ac-complete)
-;;   (aim/setup-company-complete))
+(setq aim/prefer-ac-complete nil)
+
+(if aim/prefer-ac-complete
+    (aim/setup-ac-complete)
+  (aim/setup-company-complete))
 
 (use-package smartparens
   :ensure t

	company-echo-delay 0
	company-require-match nil
	company-auto-complete nil)
  (global-company-mode 1))

(with-eval-after-load 'company
  (define-key company-active-map (kbd "M-n") nil)


(use-package go-add-tags
  :ensure go-add-tags)

(use-package ibuffer
  :config
