 (use-package evil
   :ensure t
   :init
+<<<<<<< HEAD
+  (evil-mode)
+  (setq evil-emacs-state-cursor '("red" box))
+  (setq evil-normal-state-cursor '("gray" box))
+  (setq evil-visual-state-cursor '("orange" box))
+  (setq evil-insert-state-cursor '("green" bar))
+  (setq evil-replace-state-cursor '("red" bar))
+  (setq evil-operator-state-cursor '("red" hollow))
+  (use-package evil-leader
+    :ensure t
+    ;; :init
+    :config
+    (evil-leader/set-leader "<SPC>")
+    (evil-leader/set-key
+      "f" 'find-file
+      "e" 'load-file
+      "bk" 'kill-buffer
+      "bl" 'list-buffers
+      "bn" 'next-buffer
+      "bs" 'switch-to-buffer
+      "bo" 'other-window
+      "bwd" 'delete-window
+      "n" 'linum-relative-global-mode
+      "butterfly" 'butterfly
+      "hi" 'info
+      "hdf" 'describe-function
+      "hdv" 'describe-key
+      "hdk" 'describe-key
+      "pr" 'powerline-reset
+      "ol" 'org-store-line
+      "oa" 'org-agenda
+      "t" 'neotree
+      "pr" 'powerline-reset
+      "ub" 'battery
+      "up" 'proced
+      "vv" 'vimish-fold
+      "vd" 'vimish-fold-delete
+      "<SPC>" 'helm-M-x)
+    )
+  :config
+  (define-key evil-motion-state-map "0" 'evil-end-of-line)
+  (define-key evil-motion-state-map "$" 'evil-beginning-of-line)
+  (define-key evil-motion-state-map ";" 'evil-ex)
+  (define-key evil-motion-state-map ":" 'evil-repeat-find-char)
+  ;; define text objects
+  (define-and-bind-text-object "*" "*" "*")
+  (define-and-bind-text-object "%" "%" "%")
+  (define-and-bind-text-object "$" "$" "$")
+=======
     (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)

(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 ()
            (define-key evil-normal-state-local-map (kbd "TAB") 'neotree-enter)
            (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)))
=======
(global-set-key (kbd "<XF86MonBrightnessUp>")
    (lambda ()
      (interactive)
