Fix deer binding being overlapped by dired

octaflop · Apr 5, 2016 · 481c196 · 481c196
1 parent 7ca6455
commit 481c196
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/layers/+distribution/spacemacs-base/keybindings.el b/layers/+distribution/spacemacs-base/keybindings.el
@@ -112,7 +112,6 @@
 ;; applications ---------------------------------------------------------------
 (spacemacs/set-leader-keys
   "ac"  'calc-dispatch
-  "ad"  'dired
   "ap"  'list-processes
   "aP"  'proced
   "au"  'undo-tree-visualize)
@@ -153,7 +152,6 @@
   "fCd" 'spacemacs/unix2dos
   "fCu" 'spacemacs/dos2unix
   "fg" 'rgrep
-  "fj" 'dired-jump
   "fl" 'find-file-literally
   "fE" 'spacemacs/sudo-edit
   "fo" 'spacemacs/open-in-external-app
@@ -196,8 +194,6 @@
 (spacemacs/set-leader-keys
   "j0" 'spacemacs/push-mark-and-goto-beginning-of-line
   "j$" 'spacemacs/push-mark-and-goto-end-of-line
-  "jd" 'dired-jump
-  "jD" 'dired-jump-other-window
   "jf" 'find-function-at-point
   "ji" 'spacemacs/jump-in-buffer
   "jv" 'find-variable-at-point)

diff --git a/layers/+distribution/spacemacs-base/packages.el b/layers/+distribution/spacemacs-base/packages.el
@@ -13,6 +13,7 @@
       '(
         (bookmark :location built-in)
         diminish
+        (dired :location built-in)
         (dired-x :location built-in)
         (electric-indent-mode :location built-in)
         (ediff :location built-in)
@@ -84,6 +85,13 @@
         (when (eval-when-compile (version< "24.3.1" emacs-version))
           (diminish 'subword-mode))))))
 
+(defun spacemacs-base/init-dired ()
+  (spacemacs/set-leader-keys
+    "ad" 'dired
+    "fj" 'dired-jump
+    "jd" 'dired-jump
+    "jD" 'dired-jump-other-window))
+
 (defun spacemacs-base/init-dired-x ()
   (autoload 'dired-jump "dired-x"
     "Jump to Dired buffer corresponding to current buffer." t)

diff --git a/layers/+tools/ranger/packages.el b/layers/+tools/ranger/packages.el
@@ -10,20 +10,22 @@
 ;;
 ;;; License: GPLv3
 
-(setq ranger-packages '(ranger))
+(setq ranger-packages '(dired
+                        ranger))
 
 (defun ranger/init-ranger ()
   (use-package ranger
     :defer t
     :init
     (progn
-      (spacemacs/set-leader-keys
-        "ar" 'ranger
-        "ad" 'deer)
-
       ;; set up image-dired to allow picture resize
       (setq image-dired-dir (concat spacemacs-cache-directory "image-dir"))
       (unless (file-directory-p image-dired-dir)
         (make-directory image-dired-dir)))
     :config
     (define-key ranger-mode-map (kbd "-") 'ranger-up-directory)))
+
+(defun ranger/post-init-dired ()
+  (spacemacs/set-leader-keys
+    "ar" 'ranger
+    "ad" 'deer))