summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
authorAlan Pearce2017-06-01 21:32:18 +0200
committerAlan Pearce2017-06-01 21:32:18 +0200
commit3ee51fe5f1110072b345638b1fc8d91af92c8c85 (patch)
treede0a0c9d5a60bb471c93611df66dd8c80e5c5320 /emacs
parentfc3d5ed0d20890cbb4350a7b774cd49269f91ebd (diff)
downloaddotfiles-3ee51fe5f1110072b345638b1fc8d91af92c8c85.tar.lz
dotfiles-3ee51fe5f1110072b345638b1fc8d91af92c8c85.tar.zst
dotfiles-3ee51fe5f1110072b345638b1fc8d91af92c8c85.zip
Emacs: Swap fringes used by git-gutter/flycheck
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.org45
1 files changed, 30 insertions, 15 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 6a90436..b9cbef9 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -591,15 +591,15 @@ fringe so it doesn’t interfere with flycheck.
             (setq-default fringes-outside-margins t)
             ;; thin fringe bitmaps
             (fringe-helper-define 'git-gutter-fr:added '(center repeated)
-              "XXX.....")
+              ".XXX....")
             (fringe-helper-define 'git-gutter-fr:modified '(center repeated)
-              "XXX.....")
+              ".XXX....")
             (fringe-helper-define 'git-gutter-fr:deleted 'bottom
-              "X......."
-              "XX......"
-              "XXX....."
-              "XXXX....")
-            (setq git-gutter-fr:side 'left-fringe)))
+              ".......X"
+              "......XX"
+              ".....XXX"
+              "....XXXX")
+            (setq git-gutter-fr:side 'right-fringe)))
 #+END_SRC
 
 ** magit
@@ -619,6 +619,17 @@ time.  Make sure to set it up with a nice =completing-read-function=
   :init (add-hook 'magit-mode-hook #'magit-load-config-extensions))
 #+END_SRC
 
+** git-messenger
+
+Popup the last commit that changed the line at point.
+
+#+BEGIN_SRC emacs-lisp
+(use-package git-messenger
+  :bind* (("C-x v p" . git-messenger:popup-message))
+  :config (progn
+            (setq git-messenger:use-magit-popup t)))
+#+END_SRC
+
 ** git-timemachine
 
 This package allow me to go through a file’s history with just a few
@@ -1305,7 +1316,7 @@ information here as well.
 #+BEGIN_SRC emacs-lisp
 (use-package bbdb
   :config (progn
-            (bbdb-initialize 'gnus 'mail 'message 'pgp)
+            (bbdb-initialize 'gnus 'message 'pgp)
             (bbdb-mua-auto-update-init 'gnus 'message)
             (setq bbdb-send-mail-style 'gnus
                   bbdb-complete-mail-allow-cycling t
@@ -1607,13 +1618,15 @@ works really nicely.
             (ledger-report "Budget (Cumulative)" nil)))
   :config (progn
             (setq ledger-use-iso-dates t
-                  ledger-post-use-completion-engine :built-in
+                  ledger-post-use-completion-engine :ido
                   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 --real -l \"payee != 'Opening Balances'\"")
-                                   ("Expenses:This Month" "ledger -f %(ledger-file) bal \\^Expenses -p \"this month\"")
+                  ledger-reports `(("Monthly Expenses" "ledger -f %(ledger-file) reg -M \\^Flex --real -X EUR -l \"payee != 'Opening Balances'\"")
+                                   ("Average Monthly Expenses (Past 12 Months)" ,(concat "ledger -f %(ledger-file) -b "
+                                                                                    (format-time-string "%Y-%m" (time-add (current-time) (days-to-time -365)))
+                                                                                    " --monthly --average balance ^Flex"))
+                                   ("Expenses:This Month" "ledger -f %(ledger-file) bal \\^Flex -p \"this month\"")
                                    ("On-budget Balances" "ledger -f %(ledger-file) bal --current -R :Budget: Assets:Receivable Liabilities:Personal")
                                    ("All Account Balances" "ledger -f %(ledger-file) bal --current -R \\^Assets \\^Liabilities")
                                    ("Budget Values (Current Month)" "ledger -f %(ledger-file) bal -p \"this month\" --limit \"payee=~/budget/\" \\^Funds")
@@ -1646,7 +1659,9 @@ Org is wünderbar.
 (use-package org
   :bind (("C-c C-a" . org-agenda-list)
          ("C-c a" . org-agenda)
-         ("C-c l" . org-store-link))
+         ("C-c l" . org-store-link)
+         :map org-src-mode-map
+         ("C-x C-s" . org-edit-src-exit))
   :defer 8
   :init (setq org-replace-disputed-keys t
               org-ellipsis "…")
@@ -1741,10 +1756,10 @@ 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)
+            (setq flycheck-indication-mode 'left-fringe)
             (with-eval-after-load 'git-gutter-fringe
               (fringe-helper-define 'flycheck-fringe-bitmap-double-arrow '(center repeated)
-                ".XXXXXXX"))
+                ".XXX...."))
             (if (executable-find "eslint_d")
                 (setq flycheck-javascript-eslint-executable "eslint_d"))))
 #+END_SRC