   :if (memq window-system '(mac ns x))
   :config
   (exec-path-from-shell-initialize)
-  (exec-path-from-shell-copy-env "GOPATH"))
+  (exec-path-from-shell-copy-env "GOPATH")
+  (exec-path-from-shell-copy-env "JAVA_HOME"))
 
 ;; Replace the major mode name with its icon and move the buffer name from the
 ;; mode line to the header line
 (use-package all-the-icons
-  :if (window-system)
+  :if (display-graphic-p)
   :init
   (defun move-buffer-id-to-header-line ()
     (when (window-header-line-height)

    (with-eval-after-load 'linum
      (set-face-attribute 'linum nil :weight 'thin))))

(set-terminal-coding-system 'utf-8)
(set-keyboard-coding-system 'utf-8)
(prefer-coding-system 'utf-8)

;; Enable initially disabled keys

  (bind-keys :map yas-minor-mode-map
             ("TAB"   . nil)
             ("<tab>" . nil)
             ("C-c i" . yas-maybe-expand)))

;; Auto-completion
(use-package company
