[dvorak] initial key rebindings

init.org

@@ -7,6 +7,19 @@
 But after ironing out [[https://github.com/jingtaozf/literate-elisp/issues/7][some issues]], I switched back to =literate-elisp=. It /does/ interoperate with the rest of Emacs, just be sure to not get any errors in your init!
 
 * init.org
+** dvorak
+#+BEGIN_SRC emacs-lisp
+(general-def
+  "M-h" 'default-indent-new-line
+  "M-'" 'sp-indent-defun
+  "M-i" 'keyboard-quit
+  :map magit-mode-map
+  "c" 'magit-previous-section
+  "r" 'magit-next-section
+  :map magit-status-mode-map
+  "c" 'magit-previous-section
+  "r" 'magit-next-section)
+#+END_SRC
 ** user interface
 #+BEGIN_SRC emacs-lisp
 (use-package cp-ui
@@ -22,8 +35,8 @@ But after ironing out [[https://github.com/jingtaozf/literate-elisp/issues/7][so
   ;; boon-like bindings
   (add-hook 'ediff-keymap-setup-hook
             (lambda ()
-              (define-key ediff-mode-map (kbd "i") 'ediff-previous-difference)
-              (define-key ediff-mode-map (kbd "o") 'ediff-next-difference))))
+              (define-key ediff-mode-map (kbd "c") 'ediff-previous-difference)
+              (define-key ediff-mode-map (kbd "r") 'ediff-next-difference))))
 
 #+END_SRC
 ** atomic-chrome
@@ -89,7 +102,7 @@ This needs to be before =boon=, or you get a "failed to define function ido-mini
   :load-path "~/.emacs.d/contrapunctus/ido-mini/"
   :bind (("C-x C-l" . ido-mini)
          :map boon-command-map
-         ("J" . ido-mini))
+         ("H" . ido-mini))
   :config
   (ivy-mode))
 #+END_SRC
@@ -107,44 +120,43 @@ This needs to be before =boon=, or you get a "failed to define function ido-mini
 (use-package boon
   :ensure t
   :commands (boon-mode)
+  :load-path "~/.emacs.d/elisp-git/boon"
   :bind
   (:map boon-command-map
         ("C-l" . recenter-top-bottom)
-        ("r"   . swiper)
-        ("/"   . undo-tree-undo)
-        ("?"   . undo-tree-redo)
-        ("G"   . join-line) ;; mnemonic - Glue (I'd like to bind J and
-        ;; : to sentence movement once I extend
-        ;; Boon to select by sentence movement)
-      ;; ("TAB" . 'company-indent-or-complete-common)
-        ;; ;; this works, but also breaks unfolding in org mode :\
-      ;; ("<tab>" . 'company-indent-or-complete-common)
-        ("C"   . 'boon-toggle-comment)
-        ("t"   . nil)
-        ("t w" . 'transpose-words)
-        ("t e" . 'transpose-sexps)
-        ("t l" . 'transpose-lines)
-        ("t p" . 'transpose-paragraphs)
-        ("t c" . 'transpose-chars)
-        ;; ("\\" . projectile-command-map)
+        ("p"   . swiper)
+        ("z"   . undo-tree-undo)
+        ("Z"   . undo-tree-redo)
+        ("I"   . join-line)
+        ;; ("TAB" . 'company-indent-or-complete-common) ;; this works,
+        ;; but also breaks unfolding in org mode :\ ("<tab>" .
+        ;; 'company-indent-or-complete-common)
+        ("J"   . 'boon-toggle-comment)
+        ("y"   . nil)
+        ("y w" . 'transpose-words)
+        ("y e" . 'transpose-sexps)
+        ("y l" . 'transpose-lines)
+        ("y p" . 'transpose-paragraphs)
+        ("y c" . 'transpose-chars)
+        ;; ("\\" . projectile-command-map) ;; error - define this in projectile's `use-package'
         ("("  . boon-navigate-backward)
         (")"  . boon-navigate-forward)
-        ("e r" . swiper-thing-at-point)
+        (". p" . swiper-thing-at-point)
         ("M"   . ido-mini)
-        ("J"   . ido-mini))
+        ("H"   . ido-mini))
   (:map boon-x-map
-        ("w" . 'write-file)
-        ("s" . 'save-buffer)
-        ("d" . 'dired-jump)
-        ("e" . 'eval-last-sexp)
-        ("f" . 'find-file)
-        ("c" . 'kill-emacs)
-        ("v" . 'find-alternate-file)
-        ("b" . 'ibuffer)
-        ("=" . text-scale-adjust)
-        ("-" . text-scale-adjust))
+        ("," . 'write-file)
+        ("o" . 'save-buffer)
+        ("e" . 'dired-jump)
+        ("." . 'eval-last-sexp)
+        ("u" . 'find-file)
+        ("j" . 'kill-emacs)
+        ("k" . 'find-alternate-file)
+        ("x" . 'ibuffer)
+        (")" . text-scale-adjust)
+        ("(" . text-scale-adjust))
   :config
-  (use-package boon-qwerty)
+  (require 'boon-dvorak)
   ;; (add-to-list 'boon-enclosures `(40 "(" ")")) ;; 40 = (
   ;; (use-package boon-powerline)
   ;; (boon-powerline-theme)
@@ -167,7 +179,7 @@ This needs to be before =boon=, or you get a "failed to define function ido-mini
   ;; (define-key boon-command-map (kbd "x d f") nil)
   (general-def boon-command-map
     "M"   'ido-mini
-    "J"   'ido-mini
+    "H"   'ido-mini
     ;; "x d" 'dired-jump
     )
   ;; :hook
@@ -656,8 +668,8 @@ Ask for confirmation before saving cookies. I'd rather just disallow them all th
 (use-package elpher
   :bind (:map elpher-mode-map
               ("n" . elpher-next-link)
-              ("p" . elpher-prev-link)
-              ("b" . elpher-back)
+              ("t" . elpher-prev-link)
+              ("h" . elpher-back)
               ("w" . elpher-copy-current-url)
               ("W" . elpher-copy-link-url)))