From 48e3f32497d16a3c39596194a1928679eb9a6ad0 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 19 May 2017 14:42:56 +0200
Subject: zsh: Remove $HOME/bin from path

---
 zsh/.config/zsh/.zshenv | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv
index 87276bd0..51323f10 100644
--- a/zsh/.config/zsh/.zshenv
+++ b/zsh/.config/zsh/.zshenv
@@ -53,11 +53,6 @@ then
       ;;
   esac
 
-  if [[ ${path[(I)$HOME/bin ]} ]]
-  then
-    path+=($HOME/bin)
-  fi
-
   if [[ ${path[(I)$HOME/.local/bin ]} ]]
   then
     path+=($HOME/.local/bin)
-- 
cgit 1.4.1


From 0ccf53c11af68097cc869c2418b5bc432f317c78 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 21 May 2017 13:52:48 +0200
Subject: Emacs: Ensure package archives are up-to-date before installing

---
 emacs/.emacs.d/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/emacs/.emacs.d/Makefile b/emacs/.emacs.d/Makefile
index 3d965e44..7741ef3e 100644
--- a/emacs/.emacs.d/Makefile
+++ b/emacs/.emacs.d/Makefile
@@ -1,5 +1,6 @@
 define EMACS_TANGLE
 (progn\
+  (package-refresh-contents nil)\
   (setq vc-follow-symlinks nil)\
   (find-file \"init.org\")\
   (require 'ob-tangle)\
-- 
cgit 1.4.1


From a066f5988f86347bc208b4169ec34688f3a9a350 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 21 May 2017 13:53:21 +0200
Subject: Emacs: Change X font size following DPI change

---
 emacs/.emacs.d/init.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 989c282b..fe3c6435 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -222,8 +222,8 @@ because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresource
             (ap/set-fonts "Monaco" 16 "Lucida Grande" 16 t 0.2)
           (ap/set-fonts "Monoid" 12 "Helvetica Neue" 12 t 0.1))))
      ((eq window-system 'x)
-      (set-fontset-font "fontset-default" 'unicode (font-spec :name "Terminus" :size 14))
-      (ap/set-fonts "Fixed" 14 "Lucida" 14 nil))))
+      (set-fontset-font "fontset-default" 'unicode (font-spec :name "Terminus" :size 18))
+      (ap/set-fonts "Terminus" 18 "Lucida" 14 nil))))
 
   (ap/set-fonts-according-to-system))
 #+END_SRC
-- 
cgit 1.4.1


From 256624894ef9a1c23ae7dc5464029542398ca7ca Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 22 May 2017 12:40:18 +0200
Subject: Fix display of readme on GitHub

---
 README.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 3acd8b22..6c85344c 100644
--- a/README.org
+++ b/README.org
@@ -20,7 +20,7 @@ It should work on:
 
 ** Installation
 
-Clone the project anywhere, e.g. with =[[https://github.com/motemen/ghq][ghq]]=
+Clone the project anywhere, e.g. with [[https://github.com/motemen/ghq][ghq]]
 
 #+BEGIN_SRC sh :exports code
 ghq get git://git.alanpearce.eu/dotfiles
-- 
cgit 1.4.1


From 0e56fb4d2f283fa5548e205dcd6e0e924f98c91c Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 22 May 2017 12:40:42 +0200
Subject: Emacs: Load company-nixos-options later

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

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index fe3c6435..c4022517 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -1035,6 +1035,7 @@ seems to work perfectly well for me.
 
 #+BEGIN_SRC emacs-lisp
 (use-package company-nixos-options
+  :defer 30
   :config (progn
             (add-to-list 'company-backends 'company-nixos-options)))
 #+END_SRC
-- 
cgit 1.4.1


From a4598d8f46876743549f31c3582e3209da8991ec Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 22 May 2017 15:29:21 +0200
Subject: Emacs: Install imenu-anywhere

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

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index c4022517..c7935c19 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -1791,6 +1791,15 @@ guess a definition.
   :config (setq dumb-jump-selector 'ivy))
 #+END_SRC
 
+** imenu-anywhere
+
+This is like imenu, but shows functions (or similar top-level
+entities) across buffers in the same project.  Neat!
+
+#+BEGIN_SRC emacs-lisp
+(use-package imenu-anywhere
+  :bind ("C-x C-." . ivy-imenu-anywhere))
+#+END_SRC
 ** Lisps
 
 *** All
-- 
cgit 1.4.1


From 7235841ea4cd6477ffe414a9065bf4e99bd05c1d Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 22 May 2017 15:29:35 +0200
Subject: Emacs: Load flycheck-flow after js2-mode

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

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index c7935c19..90aef783 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -1727,6 +1727,7 @@ On-the-fly error checking in programming modes?  Yes please.
 
 #+BEGIN_SRC emacs-lisp
 (use-package flycheck-flow
+  :after js2-mode
   :config (progn
             (flycheck-add-next-checker 'javascript-eslint 'javascript-flow)))
 #+END_SRC
-- 
cgit 1.4.1


From 1ddfc50b1e25f757f6e40602d204b3a5ca7db91e Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 22 May 2017 15:29:49 +0200
Subject: Emacs: Install flow-minor-mode

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

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 90aef783..451806da 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -2047,6 +2047,15 @@ the project.  This will allows emacs to find their executables.
             (add-hook 'js2-mode-hook #'add-node-modules-path)))
 #+END_SRC
 
+**** Flow
+
+#+BEGIN_SRC emacs-lisp
+(use-package flow-minor-mode
+  :after js2-mode
+  :config (progn
+            (add-hook 'js2-mode-hook #'flow-minor-enable-automatically)))
+#+END_SRC
+
 **** Indium
 
 Javascript with an inferior node.js process and a debugger?  Awesome.
-- 
cgit 1.4.1


From b64fafdae9c71648ffd0ac01446f1bcc7aa2c2e6 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 22 May 2017 16:48:45 +0200
Subject: Emacs: Don't flycheck on new-lines

This slows down the editor
---
 emacs/.emacs.d/init.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 451806da..9974cb85 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -1718,7 +1718,7 @@ On-the-fly error checking in programming modes?  Yes please.
   :defer 5
   :config (progn
             (global-flycheck-mode)
-            (setq flycheck-check-syntax-automatically '(save new-line mode-enabled))
+            (setq flycheck-check-syntax-automatically '(save mode-enabled))
             (if (executable-find "eslint_d")
                 (setq flycheck-javascript-eslint-executable "eslint_d"))))
 #+END_SRC
-- 
cgit 1.4.1


From 6ae56a3dd7686a6b6d2f815e4478b4abd3f4b114 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 22 May 2017 16:49:02 +0200
Subject: Emacs: Show flycheck messages as tooltips

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

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 9974cb85..a9344a7f 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -1723,6 +1723,18 @@ On-the-fly error checking in programming modes?  Yes please.
                 (setq flycheck-javascript-eslint-executable "eslint_d"))))
 #+END_SRC
 
+*** flycheck-pos-tip
+
+Show flycheck errors in a little popup, so I don't lose my place
+
+#+BEGIN_SRC emacs-lisp
+(use-package flycheck-pos-tip
+  :after flycheck
+  :config (progn
+            (setq flycheck-display-errors-delay 0.5)
+            (flycheck-pos-tip-mode 1)))
+#+END_SRC
+
 *** flycheck-flow
 
 #+BEGIN_SRC emacs-lisp
-- 
cgit 1.4.1


From 7846fd944c13a09578316924a1365a5b369a96b7 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 22 May 2017 16:49:13 +0200
Subject: Emacs: Remove useless call to use-package-verbose

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

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index a9344a7f..85697fe3 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -76,8 +76,7 @@ the buffer to be empty.
   (use-package use-package
     :commands (use-package-autoload-keymap)
     :defer 5))
-(setq use-package-verbose t
-      use-package-always-ensure t
+(setq use-package-always-ensure t
       package-enable-at-startup nil)
 #+END_SRC
 
-- 
cgit 1.4.1


From bbf952dce8bfa1e6c6fffb576d93f5fad7bb24b4 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 22 May 2017 16:51:47 +0200
Subject: Emacs: Make git-gutter look nicer

---
 emacs/.emacs.d/init.org | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 85697fe3..4b2303a5 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -172,7 +172,10 @@ Eziam looks nice, too
   :defines (eziam-scale-headings)
   :config (progn
             (setq eziam-scale-headings nil)
-            (load-theme 'eziam-light t)))
+            (load-theme 'eziam-light t)
+            (set-face-foreground 'git-gutter-fr:added "#96a4ab")
+            (set-face-foreground 'git-gutter-fr:modified "#96a4ab")
+            (set-face-foreground 'git-gutter-fr:deleted "#96a4ab")))
 #+END_SRC
 
 Highlighting quasi-quoted expressions in lisps is quite useful, but I
@@ -575,8 +578,19 @@ fringe so it doesn’t interfere with flycheck.
   :diminish git-gutter-mode
   :config (progn
             (global-git-gutter-mode 1)
-            (set-face-foreground 'git-gutter:modified "grey")
-            (setq git-gutter-fr:side 'right-fringe)))
+            ;; places the git gutter outside the margins.
+            (setq-default fringes-outside-margins t)
+            ;; thin fringe bitmaps
+            (fringe-helper-define 'git-gutter-fr:added '(center repeated)
+              "XXX.....")
+            (fringe-helper-define 'git-gutter-fr:modified '(center repeated)
+              "XXX.....")
+            (fringe-helper-define 'git-gutter-fr:deleted 'bottom
+              "X......."
+              "XX......"
+              "XXX....."
+              "XXXX....")
+            (setq git-gutter-fr:side 'left-fringe)))
 #+END_SRC
 
 ** magit
-- 
cgit 1.4.1


From f44fe9318f27659a278af650d11f7e87e211fd6d Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 22 May 2017 17:09:43 +0200
Subject: Emacs: Improve flycheck fringe indication

Show a flat block of colour on the right fringe
---
 emacs/.emacs.d/init.org | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 4b2303a5..7cc2c99e 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -1732,6 +1732,9 @@ On-the-fly error checking in programming modes?  Yes please.
   :config (progn
             (global-flycheck-mode)
             (setq flycheck-check-syntax-automatically '(save mode-enabled))
+            (setq flycheck-indication-mode 'right-fringe)
+            (fringe-helper-define 'flycheck-fringe-bitmap-double-arrow '(center repeated)
+              ".XXXXXXX")
             (if (executable-find "eslint_d")
                 (setq flycheck-javascript-eslint-executable "eslint_d"))))
 #+END_SRC
-- 
cgit 1.4.1


From 0932ad09f394290acf40c3dfffbcd1f61821b16b Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 23 May 2017 10:27:07 +0200
Subject: Emacs: Simplify code display in eziam

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

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 7cc2c99e..2163361f 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -173,6 +173,8 @@ Eziam looks nice, too
   :config (progn
             (setq eziam-scale-headings nil)
             (load-theme 'eziam-light t)
+            (set-face-underline 'js2-function-call nil)
+            (set-face-bold 'font-lock-keyword-face nil)
             (set-face-foreground 'git-gutter-fr:added "#96a4ab")
             (set-face-foreground 'git-gutter-fr:modified "#96a4ab")
             (set-face-foreground 'git-gutter-fr:deleted "#96a4ab")))
-- 
cgit 1.4.1


From 0b7675b33faefe7463ca61048e7e4ebd35e54157 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 23 May 2017 10:27:29 +0200
Subject: Emacs: Truncate lines instead of wrapping

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

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 2163361f..a8f9dc05 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -2402,7 +2402,8 @@ Emacs has an editor within.
 (put 'upcase-region 'disabled nil)
 (put 'downcase-region 'disabled nil)
 (setq sentence-end-double-space t
-      line-move-visual nil)
+      line-move-visual nil
+      truncate-lines t)
 #+END_SRC
 
 ** align
-- 
cgit 1.4.1


From 7414f92ac921f40e4a5d785f31f79a436b62d3e6 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 23 May 2017 15:47:28 +0200
Subject: Emacs: Install flycheck-vale, to check my English

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

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index a8f9dc05..3ed0e72b 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -2314,6 +2314,17 @@ Sometimes I might want to show off my emacs usage.
             (add-hook 'prog-mode-hook #'flyspell-prog-mode)))
 #+END_SRC
 
+** Style checking
+
+[[https://github.com/ValeLint/vale][Vale]] is a linter, but for prose.  Neat idea!  Salesman is a bad term.
+
+#+BEGIN_SRC emacs-lisp
+(use-package flycheck-vale
+  :config (progn
+            (add-to-list 'flycheck-vale-modes 'org-mode)
+            (flycheck-vale-setup)))
+#+END_SRC
+
 * Scripting
 
 Make a shell-script buffer executable after saving it, if it has a shebang.
-- 
cgit 1.4.1


From 1a8e5fd41a563b996745b0f66bfd5b9f86e7208f Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 23 May 2017 15:47:42 +0200
Subject: Emacs: Set truncate-lines correctly

---
 emacs/.emacs.d/init.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 3ed0e72b..8391ff73 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -2413,8 +2413,8 @@ Emacs has an editor within.
 (put 'upcase-region 'disabled nil)
 (put 'downcase-region 'disabled nil)
 (setq sentence-end-double-space t
-      line-move-visual nil
-      truncate-lines t)
+      line-move-visual nil)
+(setq-default truncate-lines t)
 #+END_SRC
 
 ** align
-- 
cgit 1.4.1


From 32ff2aca5ff86a2a024948dcb135ae946f9eba17 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 23 May 2017 15:49:15 +0200
Subject: Emacs: Make the fringe smaller

---
 emacs/.emacs.d/init.org | 2 --
 1 file changed, 2 deletions(-)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 8391ff73..9e4a0552 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -292,12 +292,10 @@ Sometimes I like to hide clutter.  Other times, it's useful.
 
 (defun hide-clutter ()
   (interactive)
-  (fringe-mode '(4 . 8))
   (hide-mode-line))
 
 (defun show-clutter ()
   (interactive)
-  (fringe-mode '(8 . 8))
   (show-mode-line))
 (hide-clutter)
 
-- 
cgit 1.4.1


From bebf6f939455755b24528b64c171ce453c3a3e03 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 23 May 2017 15:49:26 +0200
Subject: Emacs: Configure window-divider-mode on macOS

It didn't work on previous releases using the NextStep window system,
but with a new version of emacs-mac-port, it's good.  Fortunately,
Emacs knows the difference: window-system is either `ns` or `mac`
---
 emacs/.emacs.d/init.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 9e4a0552..d63803ba 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -311,7 +311,8 @@ Sometimes I like to hide clutter.  Other times, it's useful.
 
 (add-to-list 'default-frame-alist '(border-width . 0))
 (add-to-list 'default-frame-alist '(internal-border-width . 0))
-(when (eq window-system 'x)
+(when (or (eq window-system 'x)
+          (eq window-system 'mac))
   (setq window-divider-default-bottom-width 1
         window-divider-default-right-width 1
         window-divider-default-places t)
-- 
cgit 1.4.1


From 02b31add360e8ecb529683f0c476b6627eae933f Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 23 May 2017 15:50:50 +0200
Subject: Emacs: Don't run hide-clutter by default

---
 emacs/.emacs.d/init.org | 1 -
 1 file changed, 1 deletion(-)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index d63803ba..b28a06de 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -297,7 +297,6 @@ Sometimes I like to hide clutter.  Other times, it's useful.
 (defun show-clutter ()
   (interactive)
   (show-mode-line))
-(hide-clutter)
 
 (when mode-line-default-hidden
   (call-interactively #'hide-mode-line))
-- 
cgit 1.4.1


From 8830fc2affb29bdc47252ee9ef7a80b35b59344a Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 24 May 2017 10:56:43 +0200
Subject: Emacs: Fix error customising faces

---
 emacs/.emacs.d/init.org | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index b28a06de..ac42949e 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -173,11 +173,12 @@ Eziam looks nice, too
   :config (progn
             (setq eziam-scale-headings nil)
             (load-theme 'eziam-light t)
-            (set-face-underline 'js2-function-call nil)
-            (set-face-bold 'font-lock-keyword-face nil)
-            (set-face-foreground 'git-gutter-fr:added "#96a4ab")
-            (set-face-foreground 'git-gutter-fr:modified "#96a4ab")
-            (set-face-foreground 'git-gutter-fr:deleted "#96a4ab")))
+            (custom-theme-set-faces 'user
+                                    '(js2-function-call ((t (:underline nil))))
+                                    '(font-lock-keyword-face ((t (:weight normal))))
+                                    '(git-gutter-fr:added ((t (:foreground "#96a4ab"))))
+                                    '(git-gutter-fr:modified ((t (:foreground "#96a4ab"))))
+                                    '(git-gutter-fr:deleted ((t (:foreground "#96a4ab")))))))
 #+END_SRC
 
 Highlighting quasi-quoted expressions in lisps is quite useful, but I
-- 
cgit 1.4.1


From 65072b5fb67e2f7e6a1761b12e799f68404f9cdb Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 24 May 2017 10:57:10 +0200
Subject: Emacs: Fix byte-compile errors/warnings

---
 emacs/.emacs.d/init.org | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index ac42949e..764b950c 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -513,7 +513,7 @@ based upon some folder conventions I use.
   :demand t
   :diminish projectile-mode
   :config (progn
-            (projectile-global-mode)
+            (projectile-mode 1)
             (add-to-list 'projectile-globally-ignored-directories ".stversions")
 
             (defun yarn-install (&optional arg)
@@ -1277,7 +1277,7 @@ workplace, so I keep it in a host-specific, GPG-encrypted file.
                   send-mail-function #'smtpmail-send-it
                   message-send-mail-function #'smtpmail-send-it)))
 
-(with-eval-after-load 'gnus-mime
+(with-eval-after-load "gnus-mime"
   (define-key gnus-mime-button-map " " #'gnus-mime-view-part-externally))
 
 (with-eval-after-load "mailcap"
@@ -1734,8 +1734,9 @@ On-the-fly error checking in programming modes?  Yes please.
             (global-flycheck-mode)
             (setq flycheck-check-syntax-automatically '(save mode-enabled))
             (setq flycheck-indication-mode 'right-fringe)
-            (fringe-helper-define 'flycheck-fringe-bitmap-double-arrow '(center repeated)
-              ".XXXXXXX")
+            (with-eval-after-load 'git-gutter-fringe
+              (fringe-helper-define 'flycheck-fringe-bitmap-double-arrow '(center repeated)
+                ".XXXXXXX"))
             (if (executable-find "eslint_d")
                 (setq flycheck-javascript-eslint-executable "eslint_d"))))
 #+END_SRC
@@ -2353,6 +2354,7 @@ nice, when I remember to use it.
 #+BEGIN_SRC emacs-lisp
 (use-package eshell
   :bind ("C-c s" .  eshell)
+  :functions (eshell/pwd)
   :config (progn
             (setq eshell-directory-name "~/.emacs.d/eshell"
                   eshell-prompt-function (lambda ()
@@ -2437,7 +2439,7 @@ The most important one for me is JSON property alignment.
 I like to use the clipboard more than the primary selection in X11.
 
 #+BEGIN_SRC emacs-lisp
-(setq x-select-enable-clipboard t
+(setq select-enable-clipboard t
       save-interprogram-paste-before-kill t)
 (if (functionp 'x-cut-buffer-or-selection-value)
     (setq interprogram-paste-function 'x-cut-buffer-or-selection-value))
-- 
cgit 1.4.1


From 444586dc3d9433659aa7aea40c665f7c088746ec Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 24 May 2017 10:57:26 +0200
Subject: Emacs: Don't hide mode-line

---
 emacs/.emacs.d/init.org | 1 -
 1 file changed, 1 deletion(-)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 764b950c..6ab2fa9c 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -316,7 +316,6 @@ Sometimes I like to hide clutter.  Other times, it's useful.
   (setq window-divider-default-bottom-width 1
         window-divider-default-right-width 1
         window-divider-default-places t)
-  (setq mode-line-default-hidden t)
   (window-divider-mode +1))
 
 (add-hook 'after-change-major-mode-hook #'hide-mode-line-if-default-hidden)
-- 
cgit 1.4.1


From 3dbb464cc6c70bcc43caf53c4460c253801f687a Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 24 May 2017 10:57:41 +0200
Subject: Emacs: Auto-load eshell when idle

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

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 6ab2fa9c..f4d1b6e8 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -2353,6 +2353,7 @@ nice, when I remember to use it.
 #+BEGIN_SRC emacs-lisp
 (use-package eshell
   :bind ("C-c s" .  eshell)
+  :defer 10
   :functions (eshell/pwd)
   :config (progn
             (setq eshell-directory-name "~/.emacs.d/eshell"
-- 
cgit 1.4.1


From eae9dacbdb09ca1b0274a23d0ebe97a5a3235db7 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 24 May 2017 15:10:51 +0200
Subject: Emacs: Fix exec-path warning

---
 emacs/.emacs.d/init.org | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index f4d1b6e8..6392f5cf 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -387,7 +387,9 @@ variables from whatever my shell configuration is.
 #+BEGIN_SRC emacs-lisp
 (use-package exec-path-from-shell
   :if (eq system-type 'darwin)
-  :config (exec-path-from-shell-initialize))
+  :config (progn
+            (setq exec-path-from-shell-arguments '("-l"))
+            (exec-path-from-shell-initialize)))
 #+END_SRC
 
 * Keybindings
-- 
cgit 1.4.1


From 43bca738588a0e1b3cc2719fde3203561f9aaabd Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 24 May 2017 15:11:05 +0200
Subject: Emacs: Fix undefined fringe-helper error

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

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 6392f5cf..b13f4e71 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -575,6 +575,7 @@ changed.  This package colours the fringe.  I have it set to the right
 fringe so it doesn’t interfere with flycheck.
 
 #+BEGIN_SRC emacs-lisp
+(eval-when-compile (require 'fringe-helper))
 (use-package git-gutter-fringe
   :defer 2
   :diminish git-gutter-mode
-- 
cgit 1.4.1