   :diminish undo-tree-mode
   :init
   (global-undo-tree-mode)
-  (evil-leader/set-key
-    "u" 'undo-tree-visualize))
+  :bind (:map rock-leader
+              ("u" . undo-tree-visualize)))
 
 (use-package company
   :diminish company-mode

  :config
  (progn
    (setq linum-relative-current-symbol ""))
  :init
  (evil-leader/set-key
    "ll" 'linum-relative-toggle))

(use-package magit
  :config
  (use-package evil-magit)
  :init
  (evil-leader/set-key
    "mm" 'magit-status))

(use-package rainbow-delimiters
  :config (add-hook 'prog-mode-hook 'rainbow-delimiters-mode))

(use-package evil
  :init
  (evil-mode 1)

  ;; My leader key map
  (bind-keys :map evil-normal-state-map :prefix-map rock-leader :prefix "SPC")

  :bind (:map rock-leader
              ("s" . save-buffer)
              ("bk" . kill-this-buffer)
              ("bm" . buffer-menu)
              ("wm" . maximize-window)
              ("w=" . balance-windows)
              ("wk" . delete-window)
              ("wr" . window-configuration-to-register))

  :bind (:map evil-normal-state-map
              ("C-h" . evil-window-left)
              ("C-j" . evil-window-down)
              ("C-k" . evil-window-up)
              ("C-l" . evil-window-right))

  :config
  (use-package evil-commentary
    :diminish evil-commentary-mode
    :config
    (evil-commentary-mode))

  (use-package evil-surround
    :init
