   :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
+  (setq git-timemachine-mode-map (make-sparse-keymap))  ;; override all bindings
   ;; evil-motion-state when in timemachine mode
   (add-hook 'git-timemachine-mode-hook (lambda ()
                                            (when (fboundp 'evil-motion-state)

  (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)

;; frequently used functions
(use-package utilities

            "C-c w" #'wdired-change-to-wdired-mode)
  :config)

(use-package peep-dired
  :init
  ;; This makes peep-dired-mode-map override all evil mappings
