diff options
| author | Alan Pearce | 2017-09-19 19:17:37 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-09-19 19:17:37 +0200 |
| commit | ff961def98e85161a8373a51bb40e73a2e38897f (patch) | |
| tree | e97d03d66be541e4c9f8c53194bf1a9f4edd769b | |
| parent | 78a4703f79b22f7af6e21529f3f9c73607cf691f (diff) | |
| parent | a4cc28d1a815d504b637739f78100676983bda5c (diff) | |
| download | nixfiles-ff961def98e85161a8373a51bb40e73a2e38897f.tar.lz nixfiles-ff961def98e85161a8373a51bb40e73a2e38897f.tar.zst nixfiles-ff961def98e85161a8373a51bb40e73a2e38897f.zip | |
Merge branch 'master' of https://git.alanpearce.eu/dotfiles
| -rwxr-xr-x | autorandr/.config/autorandr/postswitch | 2 | ||||
| -rw-r--r-- | emacs/.emacs.d/main.el | 8 | ||||
| -rw-r--r-- | offlineimap/.offlineimaprc | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/autorandr/.config/autorandr/postswitch b/autorandr/.config/autorandr/postswitch index 44cb6ccf..ae9f7f8e 100755 --- a/autorandr/.config/autorandr/postswitch +++ b/autorandr/.config/autorandr/postswitch @@ -6,7 +6,7 @@ case $AUTORANDR_CURRENT_PROFILE in nmcli radio wifi on ;; ("docked") - DPI=120 + DPI=96 nmcli radio all off ;; esac diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el index 5c400086..b749a106 100644 --- a/emacs/.emacs.d/main.el +++ b/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 @@ :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 @@ With prefix TO-CURRENT-BUFFER, insert command output into buffer." ;;;;;; 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/" diff --git a/offlineimap/.offlineimaprc b/offlineimap/.offlineimaprc index 0bba8963..c1c4e37b 100644 --- a/offlineimap/.offlineimaprc +++ b/offlineimap/.offlineimaprc @@ -66,7 +66,7 @@ localfolders = %(satoshipaymaildir)s [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 |