Merge branch 'master' of https://git.alanpearce.eu/dotfiles
3 files changed, 7 insertions(+), 5 deletions(-)
M autorandr/.config/autorandr/postswitch → autorandr/.config/autorandr/postswitch
@@ -6,7 +6,7 @@ DPI=144 nmcli radio wifi on ;; ("docked") - DPI=120 + DPI=96 nmcli radio all off ;; esac
M emacs/.emacs.d/main.el → emacs/.emacs.d/main.el
@@ -521,7 +521,8 @@ (use-package projectile-ripgrep :after (ripgrep projectile) :if (executable-find "rg") - :bind (("C-c p s r" . projectile-ripgrep))) + :bind (:map projectile-command-map + ("s r" . projectile-ripgrep))) ;; #+END_SRC ;;;;;; Projectile@@ -539,8 +540,9 @@ ("C-M-g" . projectile-vc)) :demand t :diminish projectile-mode :config (progn - (projectile-mode +1) + (projectile-global-mode +1) (add-to-list 'projectile-globally-ignored-directories ".stversions") + (setq projectile-mode-line "P") (defun yarn-install (&optional arg) (interactive "P")@@ -1785,7 +1787,7 @@ ;;;;;; Beancount ;; #+BEGIN_SRC emacs-lisp -(let ((beancount-dir (car (split-string (shell-command-to-string "ghq list --full-path beancount"))))) +(let ((beancount-dir (car (split-string (shell-command-to-string "ghq list --full-path blais/beancount"))))) (when (and beancount-dir (file-directory-p beancount-dir)) (add-to-list 'load-path (expand-file-name "editors/emacs/"
M offlineimap/.offlineimaprc → offlineimap/.offlineimaprc
@@ -66,7 +66,7 @@ [Repository satoshipay.io-remote] type = Gmail remoteuser = alan@satoshipay.io -remotepasseval = get_pass("satoshipay/google") +remotepasseval = get_pass("satoshipay/google/app-mail") sslcacertfile = /etc/ssl/certs/ca-certificates.crt keepalive = 1740 holdconnectionopen = yes