diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 86a5e55..67ad75e 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -715,10 +715,6 @@ MODE1 is enabled and vice-versa."
 (global-set-key (kbd "C-c d d") 'desktop-registry-change-desktop)
 (global-set-key (kbd "C-c d k") 'desktop-registry-remove-desktop)
 (global-set-key (kbd "C-c d s") 'desktop-save-in-desktop-dir)
-(global-set-key (kbd "C-c g b") 'magit-checkout)
-(global-set-key (kbd "C-c g f") 'magit-fetch)
-(global-set-key (kbd "C-c g i") 'magit-init)
-(global-set-key (kbd "C-c g s") 'magit-status)
 (global-set-key (kbd "C-c h r") 'hypo-region)
 (global-set-key (kbd "C-c i p") 'identica-update-status-interactive)
 (global-set-key (kbd "C-c m") 'gnus)
@@ -747,6 +743,9 @@ MODE1 is enabled and vice-versa."
 (global-set-key (kbd "M--") 'mc/mark-previous-like-this)
 (global-set-key (kbd "C-c C-<") 'mc/mark-all-like-this)
 (global-set-key [remap query-replace-regexp] 'vr/query-replace)
+(global-set-key (kbd "C-c o") #'hydra-org/body)
+;; (global-set-key (kbd "C-c f") #'hydra-vimish-fold/body)
+(global-set-key (kbd "C-c g") #'hydra-magit/body)
 
 (global-set-key (kbd "M-x") 'helm-M-x)
 (global-set-key (kbd "C-x b") 'helm-buffers-list)
diff --git a/emacs/.emacs.d/site-lisp/oni-hydras.el b/emacs/.emacs.d/site-lisp/oni-hydras.el
new file mode 100644
index 0000000..202aba0
--- /dev/null
+++ b/emacs/.emacs.d/site-lisp/oni-hydras.el
@@ -0,0 +1,61 @@
+;;; oni-hydras.el --- My pet hydras                  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2016  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;
+
+;;; Code:
+
+(require 'hydra)
+(require 'projectile)
+(require 'magit)
+
+;;;###autoload(autoload 'hydra-projectile/body "oni-hydras")
+(defhydra hydra-projectile (:color blue)
+  "Projectile"
+  ("f" projectile-find-file "find file")
+  ("p" projectile-switch-project "switch project"))
+
+;;;###autoload(autoload 'hydra-org/body "oni-hydras")
+(defhydra hydra-org (:color blue)
+  "Org"
+  ("c" org-capture "capture")
+  ("a" org-agenda "agenda"))
+
+;; (defhydra hydra-vimish-fold (:color blue)
+;;   "Fold"
+;;   ("t" vimish-fold-toggle "toggle")
+;;   ("f" vimish-fold "region")
+;;   ("d" vimish-fold-delete "delete")
+;;   ("r" vimish-fold-refold "refold")
+;;   ("u" vimish-fold-unfold "unfold"))
+
+;;;###autoload(autoload 'hydra-magit/body "oni-hydras")
+(defhydra hydra-magit (:color blue)
+  "Git"
+  ("i" magit-init "initialize")
+  ("b" magit-checkout "checkout")
+  ("f" magit-fetch "fetch")
+  ("s" magit-status "status")
+  ("B" magit-blame "blame"))
+
+(provide 'oni-hydras)
+;;; oni-hydras.el ends here