   (general-define-key "s-." #'repeat)
   :demand)
 
-;; cowboy override of hydra's base map
-;; it's bindings interfere with evil when
-;; a hydra passes foreign keys through.
-(defvar hydra-base-map (make-sparse-keymap))
-
 (use-package hydra
   :commands (defhydra)
   :config
-  :init)
+  :init
+  (setq hydra-base-map (make-sparse-keymap)))
 
 ;; frequently used functions
 (use-package utilities

  :init
  :config)

;; Cowboy override of git-timemachine-mode-map
;; Timemachine's map has a number of bindings which
;; are evil commands.  So we clear it out here.
(defvar git-timemachine-mode-map (make-sparse-keymap))

(use-package git-timemachine
  :commands ( hydra-timemachine/body )
  :init
  ;; evil-motion-state when in timemachine mode
  (add-hook 'git-timemachine-mode-hook (lambda ()
                                           (when (fboundp 'evil-motion-state)

  (add-hook 'peep-dired-hook (lambda ()
                                 (evil-make-intercept-map peep-dired-mode-map 'normal)
                                 (evil-normalize-keymaps 'normal)))
  (setq peep-dired-mode-map
        (let ((map (make-sparse-keymap)))
          (define-key map (kbd "j")         #'peep-dired-next-file)
          (define-key map (kbd "k")         #'peep-dired-prev-file)
          (define-key map (kbd "C-f")       #'peep-dired-scroll-page-down)
          (define-key map (kbd "C-b")       #'peep-dired-scroll-page-up)
          (define-key map (kbd "q")         #'peep-dired)
          map))
  :general
  (:keymaps 'dired-mode-map
            "C-c f" #'peep-dired)
