   (add-hook 'git-commit-mode-hook 'turn-on-flyspell)
   (add-hook 'with-editor-mode-hook 'evil-insert-state)
   :config
-  (bind-key "SPC" 'rock-leader magit-mode-map)
+  (rock/normalize-map magit-mode-map)
   (use-package evil-magit)
   :bind (:map rock/magit
               ("m" . magit-status)

  :config
  (setq dumb-jump-selector 'ivy
        dumb-jump-force-searcher 'ag))

(use-package window-numbering
  :init

              ("w" . toggle-word-wrap)
              ("a" . toggle-text-mode-auto-fill))

  :config
  (defmacro rock/normalize-map (map)
    "Augment a given map with rock-leader and evil-style window movement."
    `(progn
       (bind-key "SPC" 'rock-leader ,map)
       (define-key ,map (kbd "C-j") 'evil-window-down)
       (define-key ,map (kbd "C-k") 'evil-window-up)
       (define-key ,map (kbd "C-h") 'evil-window-left)
       (define-key ,map (kbd "C-l") 'evil-window-right)))

  (rock/normalize-map evil-normal-state-map)

  (use-package evil-commentary
    :delight evil-commentary-mode
