   (setenv "GOPATH" (shell-command-to-string "$SHELL --login -i -c 'echo -n $GOPATH'")) ; set the $GOPATH
   (setq gofmt-command "goimports")
   (add-hook 'go-mode-hook #'go-awesome-mode-hook))
-
 
 (defun go-awesome-mode-hook ()
   "Run all of the configuration settings for Golang when this hook is called."
   (setq tab-width 4)
   (setq indent-tabs-mode 1)
-  ; Call Gofmt before saving
+										; Call Gofmt before saving
   (add-hook 'before-save-hook 'gofmt-before-save)
-  ; Godef jump key binding
+										; Godef jump key binding
   (local-set-key (kbd "C-g j") 'godef-jump))
 
-;; Go Autocomplete
-(use-package go-autocomplete
-  :load-path "go")
+;; Go Company
+(use-package company-go
+  :ensure t
+  :init
+  (with-eval-after-load 'company
+    (add-to-list 'company-backends 'company-go)))
+
 
 ;; Flycheck
 (use-package flycheck

(setq gc-cons-threshold 20000000) ; Set emacs to run GC every 20MB allocated (default is .76MB)

;; Set default font
(add-to-list 'default-frame-alist '(font . "Anonymous Pro-12"))

;; Inhibit startup message
(setq inhibit-startup-message t)

      kept-old-versions 2
      version-control t)

;; Smooth-er Scrolling
(setq mouse-wheel-progressive-speed nil) ;; don't accelerate scrolling
(setq mouse-wheel-scroll-amount '(1 ((shift) . 1))) ;; one line at a time
(setq mouse-wheel-follow-mouse 't) ;; scroll window under mouse
(setq scroll-step 1) ;; keyboard scroll one line at a time

;; Material theme
(use-package material-theme
  :load-path "themes"
