X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=emacs_el%2Fconfiguration%2Fdon-configuration.org;h=ee2bf5e3ce33ee46830a92d7bac262d7b1d8f0da;hb=d967bbc9115a91987c640c65f9ca0f2cb326cf40;hp=be27ed9d7864144f9ae34cafa0916f7e29015f5e;hpb=77332bd11bd1812f5df265f0ff30cb3c181181f4;p=lib.git

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index be27ed9..ee2bf5e 100644
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -71,6 +71,22 @@
   (add-hook 'minibuffer-exit-hook #'don/minibuffer-exit-hook)
 #+END_SRC
 * Modules
+** Flyspell 🐝 
+#+BEGIN_SRC emacs-lisp
+  (use-package flyspell
+    :ensure t
+    :diminish flyspell-mode 🐝
+    :config
+    (add-hook 'message-mode-hook 'turn-on-flyspell)
+    (add-hook 'text-mode-hook 'turn-on-flyspell)
+    (add-hook 'c-mode-common-hook 'flyspell-prog-mode)
+    (add-hook 'cperl-mode-hook 'flyspell-prog-mode)
+    (add-hook 'tcl-mode-hook 'flyspell-prog-mode)
+    :init
+    (setq ispell-program-name "ispell")
+    )
+
+#+END_SRC
 ** Winnermode
 #+BEGIN_SRC emacs-lisp
   (winner-mode 1)
@@ -146,18 +162,18 @@
   (setq split-width-threshold  100)
   (setq split-height-threshold 60)
 
-  (defun my/split-window-prefer-horizontally (window)
+  (defun my/split-window-prefer-vertically (window)
     "If there's only one window (excluding any possibly active
            minibuffer), then split the current window horizontally."
     (if (and (one-window-p t)
              (not (active-minibuffer-window))
-             ( > (frame-width) (frame-height))
+             ( < (frame-width) (frame-height))
              )
-        (let ((split-height-threshold nil))
+        (let ((split-width-threshold nil))
           (split-window-sensibly window))
       (split-window-sensibly window)))
 
-  (setq split-window-preferred-function #'my/split-window-prefer-horizontally)
+  (setq split-window-preferred-function #'my/split-window-prefer-vertically)
   (setq window-combination-resize t)
 #+END_SRC
 
@@ -285,6 +301,8 @@ value, scrolling continues until there is no more output.
 #+BEGIN_SRC emacs-lisp :tangle don-configuration.el
   (use-package magit
     :ensure t
+    :bind (("C-x g" . magit-status)
+           ("C-x C-g" . magit-status))
     :config
     ;; don't verify where we are pushing
     (setq magit-push-always-verify nil)
@@ -492,7 +510,6 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 
 #+BEGIN_SRC emacs-lisp
   (use-package rainbow-mode
-    :ensure f
     ;; add ess to the x major mode
     :config (add-to-list 'rainbow-x-colors-major-mode-list 'ESS[S])
     (add-to-list 'rainbow-x-colors-major-mode-list 'ESS[R])
@@ -528,7 +545,7 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
   ; use iedit everywhere
   (define-key my-keys-minor-mode-map (kbd "C-;") 'iedit-mode)
   ;; use outline mode keybindings everywhere
-  (define-key my-keys-minor-mode-map (kbd "C-;") 'my/mydra-outline/body)
+  ;; (define-key my-keys-minor-mode-map (kbd "C-;") 'my/mydra-outline/body)
 
   (define-minor-mode my-keys-minor-mode
     "A minor mode so that my key settings override annoying major modes."
@@ -794,13 +811,6 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
   (put 'downcase-region 'disabled nil)
   (put 'narrow-to-region 'disabled nil)
 
-  (setq ispell-program-name "ispell")
-  (autoload 'flyspell-mode "flyspell" "On-the-fly spelling checker." t)
-  (add-hook 'message-mode-hook 'turn-on-flyspell)
-  (add-hook 'text-mode-hook 'turn-on-flyspell)
-  (add-hook 'c-mode-common-hook 'flyspell-prog-mode)
-  (add-hook 'cperl-mode-hook 'flyspell-prog-mode)
-  (add-hook 'tcl-mode-hook 'flyspell-prog-mode)
   ; (defun turn-on-flyspell ()
   ;    "Force flyspell-mode on using a positive arg.  For use in hooks."
   ;    (interactive)
@@ -881,94 +891,98 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 
   ; fix up tmux xterm keys
   ; stolen from http://unix.stackexchange.com/questions/24414/shift-arrow-not-working-in-emacs-within-tmux
-  (if (getenv "TMUX")
-      (progn
-        (let ((x 2) (tkey ""))
-          (while (<= x 8)
-            ;; shift
-            (if (= x 2)
-                (setq tkey "S-"))
-            ;; alt
-            (if (= x 3)
-                (setq tkey "M-"))
-            ;; alt + shift
-            (if (= x 4)
-                (setq tkey "M-S-"))
-            ;; ctrl
-            (if (= x 5)
-                (setq tkey "C-"))
-            ;; ctrl + shift
-            (if (= x 6)
-                (setq tkey "C-S-"))
-            ;; ctrl + alt
-            (if (= x 7)
-                (setq tkey "C-M-"))
-            ;; ctrl + alt + shift
-            (if (= x 8)
-                (setq tkey "C-M-S-"))
-  
-            ;; arrows
-            (define-key key-translation-map (kbd (format "M-[ 1 ; %d A" x)) (kbd (format "%s<up>" tkey)))
-            (define-key key-translation-map (kbd (format "M-[ 1 ; %d B" x)) (kbd (format "%s<down>" tkey)))
-            (define-key key-translation-map (kbd (format "M-[ 1 ; %d C" x)) (kbd (format "%s<right>" tkey)))
-            (define-key key-translation-map (kbd (format "M-[ 1 ; %d D" x)) (kbd (format "%s<left>" tkey)))
-            ;; home
-            (define-key key-translation-map (kbd (format "M-[ 1 ; %d H" x)) (kbd (format "%s<home>" tkey)))
-            ;; end
-            (define-key key-translation-map (kbd (format "M-[ 1 ; %d F" x)) (kbd (format "%s<end>" tkey)))
-            ;; page up
-            (define-key key-translation-map (kbd (format "M-[ 5 ; %d ~" x)) (kbd (format "%s<prior>" tkey)))
-            ;; page down
-            (define-key key-translation-map (kbd (format "M-[ 6 ; %d ~" x)) (kbd (format "%s<next>" tkey)))
-            ;; insert
-            (define-key key-translation-map (kbd (format "M-[ 2 ; %d ~" x)) (kbd (format "%s<delete>" tkey)))
-            ;; delete
-            (define-key key-translation-map (kbd (format "M-[ 3 ; %d ~" x)) (kbd (format "%s<delete>" tkey)))
-            ;; f1
-            (define-key key-translation-map (kbd (format "M-[ 1 ; %d P" x)) (kbd (format "%s<f1>" tkey)))
-            ;; f2
-            (define-key key-translation-map (kbd (format "M-[ 1 ; %d Q" x)) (kbd (format "%s<f2>" tkey)))
-            ;; f3
-            (define-key key-translation-map (kbd (format "M-[ 1 ; %d R" x)) (kbd (format "%s<f3>" tkey)))
-            ;; f4
-            (define-key key-translation-map (kbd (format "M-[ 1 ; %d S" x)) (kbd (format "%s<f4>" tkey)))
-            ;; f5
-            (define-key key-translation-map (kbd (format "M-[ 15 ; %d ~" x)) (kbd (format "%s<f5>" tkey)))
-            ;; f6
-            (define-key key-translation-map (kbd (format "M-[ 17 ; %d ~" x)) (kbd (format "%s<f6>" tkey)))
-            ;; f7
-            (define-key key-translation-map (kbd (format "M-[ 18 ; %d ~" x)) (kbd (format "%s<f7>" tkey)))
-            ;; f8
-            (define-key key-translation-map (kbd (format "M-[ 19 ; %d ~" x)) (kbd (format "%s<f8>" tkey)))
-            ;; f9
-            (define-key key-translation-map (kbd (format "M-[ 20 ; %d ~" x)) (kbd (format "%s<f9>" tkey)))
-            ;; f10
-            (define-key key-translation-map (kbd (format "M-[ 21 ; %d ~" x)) (kbd (format "%s<f10>" tkey)))
-            ;; f11
-            (define-key key-translation-map (kbd (format "M-[ 23 ; %d ~" x)) (kbd (format "%s<f11>" tkey)))
-            ;; f12
-            (define-key key-translation-map (kbd (format "M-[ 24 ; %d ~" x)) (kbd (format "%s<f12>" tkey)))
-            ;; f13
-            (define-key key-translation-map (kbd (format "M-[ 25 ; %d ~" x)) (kbd (format "%s<f13>" tkey)))
-            ;; f14
-            (define-key key-translation-map (kbd (format "M-[ 26 ; %d ~" x)) (kbd (format "%s<f14>" tkey)))
-            ;; f15
-            (define-key key-translation-map (kbd (format "M-[ 28 ; %d ~" x)) (kbd (format "%s<f15>" tkey)))
-            ;; f16
-            (define-key key-translation-map (kbd (format "M-[ 29 ; %d ~" x)) (kbd (format "%s<f16>" tkey)))
-            ;; f17
-            (define-key key-translation-map (kbd (format "M-[ 31 ; %d ~" x)) (kbd (format "%s<f17>" tkey)))
-            ;; f18
-            (define-key key-translation-map (kbd (format "M-[ 32 ; %d ~" x)) (kbd (format "%s<f18>" tkey)))
-            ;; f19
-            (define-key key-translation-map (kbd (format "M-[ 33 ; %d ~" x)) (kbd (format "%s<f19>" tkey)))
-            ;; f20
-            (define-key key-translation-map (kbd (format "M-[ 34 ; %d ~" x)) (kbd (format "%s<f20>" tkey)))
-
-            (setq x (+ x 1))
-            ))
+  (defun fix-up-tmux-keys ()
+      "Fix up tmux xterm keys"
+      (if (getenv "TMUX")
+          (progn
+            (let ((x 2) (tkey ""))
+              (while (<= x 8)
+                ;; shift
+                (if (= x 2)
+                    (setq tkey "S-"))
+                ;; alt
+                (if (= x 3)
+                    (setq tkey "M-"))
+                ;; alt + shift
+                (if (= x 4)
+                    (setq tkey "M-S-"))
+                ;; ctrl
+                (if (= x 5)
+                    (setq tkey "C-"))
+                ;; ctrl + shift
+                (if (= x 6)
+                    (setq tkey "C-S-"))
+                ;; ctrl + alt
+                (if (= x 7)
+                    (setq tkey "C-M-"))
+                ;; ctrl + alt + shift
+                (if (= x 8)
+                    (setq tkey "C-M-S-"))
+
+                ;; arrows
+                (define-key key-translation-map (kbd (format "M-[ 1 ; %d A" x)) (kbd (format "%s<up>" tkey)))
+                (define-key key-translation-map (kbd (format "M-[ 1 ; %d B" x)) (kbd (format "%s<down>" tkey)))
+                (define-key key-translation-map (kbd (format "M-[ 1 ; %d C" x)) (kbd (format "%s<right>" tkey)))
+                (define-key key-translation-map (kbd (format "M-[ 1 ; %d D" x)) (kbd (format "%s<left>" tkey)))
+                ;; home
+                (define-key key-translation-map (kbd (format "M-[ 1 ; %d H" x)) (kbd (format "%s<home>" tkey)))
+                ;; end
+                (define-key key-translation-map (kbd (format "M-[ 1 ; %d F" x)) (kbd (format "%s<end>" tkey)))
+                ;; page up
+                (define-key key-translation-map (kbd (format "M-[ 5 ; %d ~" x)) (kbd (format "%s<prior>" tkey)))
+                ;; page down
+                (define-key key-translation-map (kbd (format "M-[ 6 ; %d ~" x)) (kbd (format "%s<next>" tkey)))
+                ;; insert
+                (define-key key-translation-map (kbd (format "M-[ 2 ; %d ~" x)) (kbd (format "%s<delete>" tkey)))
+                ;; delete
+                (define-key key-translation-map (kbd (format "M-[ 3 ; %d ~" x)) (kbd (format "%s<delete>" tkey)))
+                ;; f1
+                (define-key key-translation-map (kbd (format "M-[ 1 ; %d P" x)) (kbd (format "%s<f1>" tkey)))
+                ;; f2
+                (define-key key-translation-map (kbd (format "M-[ 1 ; %d Q" x)) (kbd (format "%s<f2>" tkey)))
+                ;; f3
+                (define-key key-translation-map (kbd (format "M-[ 1 ; %d R" x)) (kbd (format "%s<f3>" tkey)))
+                ;; f4
+                (define-key key-translation-map (kbd (format "M-[ 1 ; %d S" x)) (kbd (format "%s<f4>" tkey)))
+                ;; f5
+                (define-key key-translation-map (kbd (format "M-[ 15 ; %d ~" x)) (kbd (format "%s<f5>" tkey)))
+                ;; f6
+                (define-key key-translation-map (kbd (format "M-[ 17 ; %d ~" x)) (kbd (format "%s<f6>" tkey)))
+                ;; f7
+                (define-key key-translation-map (kbd (format "M-[ 18 ; %d ~" x)) (kbd (format "%s<f7>" tkey)))
+                ;; f8
+                (define-key key-translation-map (kbd (format "M-[ 19 ; %d ~" x)) (kbd (format "%s<f8>" tkey)))
+                ;; f9
+                (define-key key-translation-map (kbd (format "M-[ 20 ; %d ~" x)) (kbd (format "%s<f9>" tkey)))
+                ;; f10
+                (define-key key-translation-map (kbd (format "M-[ 21 ; %d ~" x)) (kbd (format "%s<f10>" tkey)))
+                ;; f11
+                (define-key key-translation-map (kbd (format "M-[ 23 ; %d ~" x)) (kbd (format "%s<f11>" tkey)))
+                ;; f12
+                (define-key key-translation-map (kbd (format "M-[ 24 ; %d ~" x)) (kbd (format "%s<f12>" tkey)))
+                ;; f13
+                (define-key key-translation-map (kbd (format "M-[ 25 ; %d ~" x)) (kbd (format "%s<f13>" tkey)))
+                ;; f14
+                (define-key key-translation-map (kbd (format "M-[ 26 ; %d ~" x)) (kbd (format "%s<f14>" tkey)))
+                ;; f15
+                (define-key key-translation-map (kbd (format "M-[ 28 ; %d ~" x)) (kbd (format "%s<f15>" tkey)))
+                ;; f16
+                (define-key key-translation-map (kbd (format "M-[ 29 ; %d ~" x)) (kbd (format "%s<f16>" tkey)))
+                ;; f17
+                (define-key key-translation-map (kbd (format "M-[ 31 ; %d ~" x)) (kbd (format "%s<f17>" tkey)))
+                ;; f18
+                (define-key key-translation-map (kbd (format "M-[ 32 ; %d ~" x)) (kbd (format "%s<f18>" tkey)))
+                ;; f19
+                (define-key key-translation-map (kbd (format "M-[ 33 ; %d ~" x)) (kbd (format "%s<f19>" tkey)))
+                ;; f20
+                (define-key key-translation-map (kbd (format "M-[ 34 ; %d ~" x)) (kbd (format "%s<f20>" tkey)))
+
+                (setq x (+ x 1))
+                ))
+            )
         )
-    )
+      )
+  ; (add-hook 'tty-setup-hook 'fix-up-tmux-keys)
 
   ; procmailmode configuration
   (load "procmail_mode")