Merge remote-tracking branch 'origin/master'

1 files changed, 42 insertions, 21 deletions

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 2fce27a1..eb432cf9 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -52,7 +52,10 @@ the buffer to be empty.
   (eval-when-compile (require 'use-package))
   (unless (featurep 'use-package)
     (require 'diminish)
-    (require 'bind-key))
+    (require 'bind-key)
+    (use-package use-package
+      :commands (use-package-autoload-keymap)
+      :defer 5))
   (setq use-package-verbose t
         use-package-always-ensure t
         package-enable-at-startup nil)
@@ -486,8 +489,7 @@ time.  Make sure to set it up with a nice =completing-read-function=
                          magit-completing-read-function #'magit-builtin-completing-read
                          magit-popup-use-prefix-argument 'default
                          magit-push-always-verify nil
-                         global-magit-file-mode nil
-                         magit-revert-buffers t)
+                         global-magit-file-mode nil)
                    (add-to-list 'magit-no-confirm 'safe-with-wip))
     :init (add-hook 'magit-mode-hook #'magit-load-config-extensions))
 #+END_SRC
@@ -534,10 +536,11 @@ trash for deleting on OS X.
 ** autorevert
 
 #+BEGIN_SRC emacs-lisp
-(use-package autorevert
-  :init (progn
-          (global-auto-revert-mode 1)
-          (setq auto-revert-verbose nil)))
+  (use-package autorevert
+    :init (progn
+            (global-auto-revert-mode 1)
+            (setq auto-revert-verbose nil
+                  auto-revert-use-notify (not (eq system-type 'darwin)))))
 #+END_SRC
 
 ** Encoding
@@ -903,7 +906,6 @@ point whilst I’m moving about.
         scroll-preserve-screen-position t
         mouse-wheel-scroll-amount '(1 ((shift) . 1) ((control)))
         split-height-threshold 100
-        split-width-threshold 70
         frame-resize-pixelwise t)
   (if (boundp 'ns-pop-up-frames)
       (setq ns-pop-up-frames nil))
@@ -1127,6 +1129,15 @@ Expand subfolders like a tree inside the parent
 
 * Documentation
 
+** ehelp
+
+ehelp is a less well-known package that’s part of Emacs and slightly
+improves the normal help commands, mostly by making quitting them easier.
+
+#+BEGIN_SRC emacs-lisp
+  (use-package ehelp
+    :bind-keymap ("C-h" . ehelp-map))
+#+END_SRC
 ** helm-dash
 
 Emacs’ documentation is great to read from inside Emacs. Helm-dash
@@ -1178,7 +1189,7 @@ A nicer way to browse keybindings for major modes.
 
 #+BEGIN_SRC emacs-lisp
 (use-package discover-my-major
-  :bind ("C-h C-m" . discover-my-major))
+  :bind ("<f1>" . discover-my-major))
 #+END_SRC
 
 ** which-key
@@ -1513,18 +1524,28 @@ I use [[http://ledger-cli.org/][=ledger=]] to manage my finances.  It has an Ema
 works really nicely.
 
 #+BEGIN_SRC emacs-lisp
-(use-package ledger-mode
-  :mode ("\\.ledger\\'" . ledger-mode)
-  :config (progn
-            (defun setup-ledger-mode ()
-              (setq-local indent-tabs-mode nil))
-            (add-hook 'ledger-mode-hook #'setup-ledger-mode)
-            (setq ledger-use-iso-dates t
-                  ledger-post-use-completion-engine :built-in
-                  ledger-reconcile-default-commodity "€"
-                  ledger-clear-whole-transactions t
-                  ledger-narrow-on-reconcile t
-                  ledger-default-date-format "%Y-%m-%d")))
+  (use-package ledger-mode
+    :mode ("\\.ledger\\'" . ledger-mode)
+    :config (progn
+              (defun setup-ledger-mode ()
+                (setq-local indent-tabs-mode nil))
+              (add-hook 'ledger-mode-hook #'setup-ledger-mode)
+              (setq ledger-use-iso-dates t
+                    ledger-post-use-completion-engine :built-in
+                    ledger-reconcile-default-commodity "€"
+                    ledger-clear-whole-transactions t
+                    ledger-narrow-on-reconcile t
+                    ledger-default-date-format "%Y-%m-%d"
+                    ledger-reports '(("Monthly Expenses" "ledger -f %(ledger-file) reg -M Expenses -l \"commodity == '€'\"")
+                                     ("Forecast:Next Month" "ledger -f %(ledger-file) bal --forecast 'format_date(d, \"%Y%m%d\")<(to_string(to_int(format_date(now, \"%Y%m01\"))+100))' --limit 'format_date(date, \"%Y%m%d\")>(to_string(to_int(format_date(now, \"%Y%m01\"))+200))' ^Expenses: ^Funds:")
+                                     ("Expenses:This Month" "ledger -f %(ledger-file) bal ^Expenses -p \"this month\"")
+                                     ("Asset & Liability Balances" "ledger -f %(ledger-file) bal --current -R :Budget: Assets:Receivable Liabilities:Personal")
+                                     ("Budget" "ledger -f %(ledger-file) bal ^Funds")
+                                     ("bal" "ledger -f %(ledger-file) bal")
+                                     ("reg" "ledger -f %(ledger-file) reg")
+                                     ("equity" "ledger -f %(ledger-file) equity")
+                                     ("payee" "ledger -f %(ledger-file) reg @%(payee)")
+                                     ("account" "ledger -f %(ledger-file) reg %(account)")))))
 #+END_SRC
 
 ** Markdown