-<<<<<<< HEAD
 ;; ;; emacs directory
 ;; (when load-file-name
   ;; (setq user-emacs-directory (file-name-directory load-file-name)))
-=======
-;; emacs directory
-(when load-file-name
-  (setq user-emacs-directory (file-name-directory load-file-name)))
->>>>>>> a89b798e19f773d59a9d9703c52b5574a1750e8e
 
 ;; package management
 (require 'package)

  (menu-bar-mode 0))

(setq inhibit-startup-message t) ;; Don't display startup message
=======
(unless (assq package package-alist)
(package-refresh-contents))
(unless (package-installed-p package)
(package-install package)))

;; Initial window configuration
(when window-system
(split-window-horizontally)
(setq truncate-lines nil)
(setq truncate-partial-width-windows nil)

(setq default-frame-alist (append (list '(width .  164)
                                        '(height . 60))
                                  default-frame-alist)))

;; Don't display startup message
(setq inhibit-startup-message t)
>>>>>>> a89b798e19f773d59a9d9703c52b5574a1750e8e
;; (ansi-term "/bin/zsh")
(add-hook 'after-init-hook  (lambda() (eshell)))


;; enable evil
(require 'evil)
(evil-mode 1)
(define-key evil-insert-state-map "\C-h" 'delete-backward-char)

;; install geiser
(package-install-with-refresh 'geiser)
