 (global-set-key (kbd "C-x w") 'ace-jump-word-mode)
 (global-set-key (kbd "M-SPC") 'helm-mini)
 (global-set-key (kbd "C-x o") 'switch-window)
-<<<<<<< HEAD
 
 (add-hook 'neotree-mode-hook
           (lambda ()

(use-package evil
  :ensure t
  :init
<<<<<<< HEAD
  (evil-mode)
  (setq evil-emacs-state-cursor '("red" box))
  (setq evil-normal-state-cursor '("gray" box))

            (define-key evil-normal-state-local-map (kbd "SPC") 'neotree-enter)
            (define-key evil-normal-state-local-map (kbd "q") 'neotree-hide)
            (define-key evil-normal-state-local-map (kbd "RET") 'neotree-enter)))

;; keybindings of esc quits
(define-key evil-normal-state-map [escape] 'keyboard-quit)
