   (lambda () (interactive)
     (evil-window-top)
     (evil-scroll-line-to-center nil)))
-;; org -----------------------------------------------------------------------
-(eval-after-load "org-agenda"
-  '(progn
-     (define-key org-agenda-mode-map "j" 'org-agenda-next-line)
-     (define-key org-agenda-mode-map "k" 'org-agenda-previous-line)))
 
 ;; ---------------------------------------------------------------------------
 ;; evil-leader key bindings
 ;; ---------------------------------------------------------------------------
 
-;; M-x ------------------------------------------------------------------------
-(evil-leader/set-key ":" 'helm-M-x)
-;; Key bindings help ----------------------------------------------------------
-(evil-leader/set-key "?" 'helm-descbinds)
-;; ace-jump -------------------------------------------------------------------
-(evil-leader/set-key "," 'ace-jump-mode-pop-mark)
-;; shell command  -------------------------------------------------------------
-(evil-leader/set-key "S" 'shell-command)
-;; magic wand  ----------------------------------------------------------------
-(evil-leader/set-key "RET" 'wand:execute)
-;; switch back and forth between two last buffers -----------------------------
-(evil-leader/set-key "TAB"
-  (lambda ()
-    (interactive)
-    (switch-to-buffer (other-buffer (current-buffer) t))))
-;; switch window by number ----------------------------------------------------
+;; switch window
 (evil-leader/set-key
   "0" 'select-window-0
   "1" 'select-window-1

  "7" 'select-window-7
  "8" 'select-window-8
  "9" 'select-window-9)
;; applications ---------------------------------------------------------------
(evil-leader/set-key
  "ac"  'calc-dispatch
  "ad"  'dired
  "ag"  'magit-status
  "ai"  'irc
  "ap"  'proced
  "ase" 'eshell
  "asi" 'shell
  "ast" 'multi-term
  "at"  'twit
  "au"  'undo-tree-visualize
  "ay"  'helm-c-yas-complete)
;; buffers --------------------------------------------------------------------
(evil-leader/set-key
  "bd"  'delete-current-buffer-file
  "bK"  'kill-other-buffers
  "bk"  'ido-kill-buffer
  "b C-k" 'kill-matching-buffers-rudely
  "bmh" 'buf-move-left
  "bmj" 'buf-move-down
  "bmk" 'buf-move-up
  "bml" 'buf-move-right
  "bn"  'switch-to-next-buffer
  "bp"  'switch-to-prev-buffer
  "bR"  (lambda () (interactive) (revert-buffer nil t))
  "br"  'rename-current-buffer-file
  "bs"  'helm-mini
  "bw"  'toggle-read-only)
;; Cycling settings -----------------------------------------------------------
(evil-leader/set-key "ct" 'spacemacs/cycle-spacemacs-theme)

;; instantly display current keystrokes in mini buffer
(setq echo-keystrokes 0.02)

;; simple and more consistent keyboard quit key bindings
;; thanks to Bin Chen for the idea (http://blog.binchen.org/?p=735)
(global-set-key (kbd "f")
  (lambda () (interactive) (fd-trigger 'keyboard-quit)))
(define-key minibuffer-local-map (kbd "f")
  (lambda () (interactive) (fd-trigger 'abort-recursive-edit)))
;; evil
;; easier toggle for emacs-state
(evil-set-toggle-key "s-`")
;; returns to normal mode
