 ;; Magit
 (require 'magit)
 
-(evil-leader/set-key
-  "gd" 'magit-diff
-  "gs" 'magit-status
-  "gca" 'magit-commit-ammend
-  "gcs" 'magit-commit-squash)
+(defvar evil-leader-magit-map
+  (make-sparse-keymap "keymap for magit bindings under leader key"))
+
+(evil-leader/set-key
+  "m" evil-leader-magit-map)
+
+(emaps-define-key evil-leader-magit-map
+  "d" 'magit-diff-working-tree
+  "s" 'magit-status)
 
 
 ;; Flycheck

(evil-define-key 'insert emacs-lisp-mode-map " " 'emacs-lisp-space)

(global-unset-key (kbd "C-s"))
(define-key global-map (kbd "C-s n") 'evil-normal-state)
(define-key global-map (kbd "C-s m") 'evil-motion-state)
(define-key global-map (kbd "C-s e") 'evil-emacs-state)

;;; init.el ends here


(setq org-agenda-files `(,(org-subdir "todo.org") ,(org-subdir "homework.org")))

(defvar evil-leader-org-map
  (make-sparse-keymap "leader org-mode map"))

(evil-leader/set-key
  "o" evil-leader-org-map)

(emaps-define-key evil-leader-org-map
  "a" 'org-agenda
  "c" 'org-capture
  "l" 'org-store-link
  "s" 'org-switchb)

;; Other commands

