From 069922e569c9f3729b2a6f48d414608e98e3344b Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 4 Jan 2016 15:58:42 +0100
Subject: Emacs: Configure avy keys for colemak

---
 tag-emacs/emacs.d/init.org | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index c65d5eb1..02be584e 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -2306,14 +2306,15 @@ Avy is a really nice way to move around files, like ace-jump-mode, but
 somehow I prefer it.
 
 #+BEGIN_SRC emacs-lisp
-(use-package avy
-  :bind* (("M-g g" . avy-goto-line)
-          ("M-g M-g" . avy-goto-line)
-          ("C-|" . avy-goto-line)
-          ("C-c SPC" . avy-goto-char-timer))
-  :config (progn
-            (avy-setup-default)
-            (setq avy-all-windows nil)))
+  (use-package avy
+    :bind* (("M-g g" . avy-goto-line)
+            ("M-g M-g" . avy-goto-line)
+            ("C-|" . avy-goto-line)
+            ("C-c SPC" . avy-goto-char-timer))
+    :config (progn
+              (avy-setup-default)
+              (setq avy-all-windows nil
+                    avy-keys '(?a ?r ?s ?t ?d ?h ?n ?e ?i ?\;))))
 #+END_SRC
 
 ** goto-chg
-- 
cgit 1.4.1


From a1385303f99a383252e18d9affa0d40f12aa2bd7 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 9 Jan 2016 17:45:42 +0100
Subject: Emacs: Fix tramp prompt hanging on certain prompts

---
 tag-emacs/emacs.d/init.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 02be584e..410a18b1 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -681,7 +681,7 @@ that I can sudo on remote machines
                                                    (not (let ((method (file-remote-p name 'method)))
                                                           (when (stringp method)
                                                             (member method '("su" "sudo")))))))
-                    tramp-shell-prompt-pattern "\\(?:^\\|
\\)[^#$%>\n]*#?[#$%>›] *\\(\\[[0-9;]*[a-zA-Z] *\\)*")
+                    tramp-shell-prompt-pattern "\\(?:^\\|
\\)[^]#$%>\n]*#?[]#$%>❯›] *\\(\\[[0-9;]*[a-zA-Z] *\\)*")
               (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" (concat "/" tramp-default-method ":%h:")))
               (add-to-list 'tramp-default-proxies-alist `(,(regexp-quote (system-name)) nil nil))
               (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))
-- 
cgit 1.4.1


From e3c5528891c42d23849d299fd5255f352d821b93 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 9 Jan 2016 17:46:05 +0100
Subject: Xresources: Use Input fonts in Emacs

---
 tag-xresources/xresources/main | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tag-xresources/xresources/main b/tag-xresources/xresources/main
index 7c805bd4..53e9676f 100644
--- a/tag-xresources/xresources/main
+++ b/tag-xresources/xresources/main
@@ -28,6 +28,6 @@ Emacs.MenuBar:            off
 Emacs.ScrollBars:         off
 Emacs.CursorBlink:        off
 
-Emacs.Font:                         -*-Fira Mono-normal-*-*-*-16-*-*-*-*-*-*-*
-Emacs.fixed-pitch.attributeFont:    -*-Fira Mono-normal-*-*-*-16-*-*-*-*-*-*-*
-Emacs.variable-pitch.attributeFont: -*-Fira Sans-medium-r-*-*-16-*-*-*-*-*-*-*
+Emacs.Font:                         -*-Input Mono Narrow-normal-*-*-*-16-*-*-*-*-*-*-*
+Emacs.fixed-pitch.attributeFont:    -*-Input Mono Narrow-normal-*-*-*-16-*-*-*-*-*-*-*
+Emacs.variable-pitch.attributeFont: -*-Input Sans-medium-r-*-*-16-*-*-*-*-*-*-*
-- 
cgit 1.4.1


From 10f81ec220477c7b8c7ea637639f78e90c7a4c3e Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 9 Jan 2016 17:46:23 +0100
Subject: Emacs: Add sync version of tangle-init

---
 tag-emacs/emacs.d/init.org | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 410a18b1..2c861433 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -2462,6 +2462,20 @@ the =org=-document after changes.
     :commands (async-start)
     :defer 2)
 
+  (defun tangle-init-sync ()
+    (interactive)
+    (when (string-suffix-p "init.org" (buffer-file-name))
+      (message "Tangling init")
+      ;; Avoid running hooks when tangling.
+      (let ((prog-mode-hook nil)
+            (dest (concat user-emacs-directory "init.el")))
+        (require 'ob-tangle)
+        (org-babel-tangle-file (buffer-file-name) dest)
+        (if (byte-compile-file dest)
+            dest
+          (with-current-buffer byte-compile-log-buffer
+            (buffer-string))))))
+
   (defun tangle-init ()
     "If the current buffer is 'init.org' the code-blocks are
       tangled, and the tangled file is compiled."
-- 
cgit 1.4.1