diff options
| -rw-r--r-- | .bashrc | 6 | ||||
| -rw-r--r-- | .config/firefox-ia-pac.js | 8 | ||||
| -rw-r--r-- | .config/git/attributes | 1 | ||||
| -rw-r--r-- | .config/git/config | 2 | ||||
| -rw-r--r-- | .config/isync/mbsyncrc | 20 | ||||
| -rw-r--r-- | .emacs.d/lisp/bandali-essentials.el | 53 |
6 files changed, 75 insertions, 15 deletions
@@ -174,7 +174,7 @@ case $__host in selene) alias m="mbsync csclub; mbsync kelar; mbsync ia; getmail" ;; - adelita) + adelita|marita) alias m="mbsync kelar; mbsync ia; getmail" ;; monarch) @@ -199,6 +199,10 @@ if [ -f "${pass_otp_comps}" ]; then . "${pass_otp_comps}" fi +GIT_COMPLETION_SHOW_ALL_COMMANDS=1 +GIT_COMPLETION_SHOW_ALL=1 +GIT_COMPLETION_IGNORE_CASE=1 + function t { cd $(mktemp -d /tmp/$1.XXXX) } diff --git a/.config/firefox-ia-pac.js b/.config/firefox-ia-pac.js new file mode 100644 index 0000000..cbdd94d --- /dev/null +++ b/.config/firefox-ia-pac.js @@ -0,0 +1,8 @@ +// https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/Proxy_servers_and_tunneling/Proxy_Auto-Configuration_PAC_file + +function FindProxyForURL(url, host) { + if (shExpMatch(host, "es-*.??.archive.org")) + return "SOCKS localhost:10597; DIRECT"; + else + return "DIRECT"; +} diff --git a/.config/git/attributes b/.config/git/attributes new file mode 100644 index 0000000..0b3733a --- /dev/null +++ b/.config/git/attributes @@ -0,0 +1 @@ +*.el diff=elisp diff --git a/.config/git/config b/.config/git/config index 1191792..75cfa81 100644 --- a/.config/git/config +++ b/.config/git/config @@ -103,5 +103,7 @@ [diff] algorithm = histogram renames = true +[diff "elisp"] + xfuncname = ^\\([^[:space:]]*def[^[:space:]]+[[:space:]]+([^()[:space:]]+) [commit] verbose = true diff --git a/.config/isync/mbsyncrc b/.config/isync/mbsyncrc index 146f52e..536d58f 100644 --- a/.config/isync/mbsyncrc +++ b/.config/isync/mbsyncrc @@ -8,7 +8,7 @@ IMAPAccount kelar Host mail.kelar.org User bandali@kelar.org PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/kelar.gpg" -SSLType IMAPS +TLSType IMAPS Timeout 300 IMAPStore kelar-remote @@ -19,7 +19,7 @@ Host 127.0.0.1 Port 143 User bandali@kelar.local PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/kelar-local.gpg" -SSLType None +TLSType None IMAPStore kelar-local Account kelar-local @@ -35,7 +35,7 @@ Host 127.0.0.1 Port 143 User bandali@gnu.local PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/gnub-local.gpg" -SSLType None +TLSType None IMAPStore gnub-local Account gnub-local @@ -45,7 +45,7 @@ Host 127.0.0.1 Port 1143 User bandali@gnu.local PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/gnub-local.gpg" -SSLType None +TLSType None Timeout 420 IMAPStore gnub-tunnel @@ -62,7 +62,7 @@ Host 127.0.0.1 Port 1143 User bandali@debian.local PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/debian-local.gpg" -SSLType None +TLSType None Timeout 420 IMAPStore deb-tunnel @@ -73,7 +73,7 @@ Host 127.0.0.1 Port 143 User bandali@debian.local PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/debian-local.gpg" -SSLType None +TLSType None IMAPStore deb-local Account deb-local @@ -88,7 +88,7 @@ IMAPAccount csclub Host mail.csclub.uwaterloo.ca User abandali PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/csclub.gpg" -SSLType IMAPS +TLSType IMAPS Timeout 240 IMAPStore csclub-remote @@ -99,7 +99,7 @@ Host 127.0.0.1 Port 143 User abandali@csclub.uwaterloo.local PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/csclub-local.gpg" -SSLType None +TLSType None IMAPStore csclub-local Account csclub-local @@ -114,7 +114,7 @@ IMAPAccount ia Host mail.archive.org User bandali@archive.org PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/ia.gpg" -SSLType IMAPS +TLSType IMAPS Timeout 300 IMAPStore ia-remote @@ -125,7 +125,7 @@ Host 127.0.0.1 Port 143 User bandali@archive.local PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/ia-local.gpg" -SSLType None +TLSType None IMAPStore ia-local Account ia-local diff --git a/.emacs.d/lisp/bandali-essentials.el b/.emacs.d/lisp/bandali-essentials.el index ff32cc9..18593f0 100644 --- a/.emacs.d/lisp/bandali-essentials.el +++ b/.emacs.d/lisp/bandali-essentials.el @@ -37,7 +37,8 @@ read-buffer-completion-ignore-case t enable-recursive-minibuffers t delete-by-moving-to-trash t - resize-mini-windows t + max-mini-window-height 0.20 + ;; resize-mini-windows t message-log-max 20000 mode-line-compact t ;; mouse-autoselect-window t @@ -198,6 +199,10 @@ ;; vc-git-show-stash 0 vc-git-print-log-follow t)) +(with-eval-after-load 'vc-hooks + (setopt + vc-use-incoming-outgoing-prefixes t)) + (with-eval-after-load 'ediff (setopt ediff-window-setup-function #'ediff-setup-windows-plain @@ -377,10 +382,52 @@ (car args)) (cdr args))))) +;; (with-eval-after-load 'icomplete +;; ;; (b/keymap-set minibuffer-local-completion-map +;; ;; "M-TAB" #'minibuffer-force-complete) + +;; (setq icomplete-on-del-error-function #'abort-recursive-edit) + +;; (defun b/icomplete-fido-backward-updir () +;; "Delete char before or go up directory, like `ido-mode'." +;; (interactive) +;; (if (and (eq (char-before) ?/) +;; (eq (icomplete--category) 'file)) +;; (save-excursion +;; (goto-char (1- (point))) +;; (when (search-backward "/" (point-min) t) +;; (delete-region (1+ (point)) (point-max)))) +;; (condition-case nil +;; (call-interactively #'delete-backward-char) +;; (error +;; (when icomplete-on-del-error-function +;; (funcall icomplete-on-del-error-function)))))) + +;; (let ((m icomplete-fido-mode-map)) +;; (b/keymap-set m "DEL" #'b/icomplete-fido-backward-updir) +;; (b/keymap-set m "RET" #'icomplete-fido-exit) +;; (b/keymap-set m "C-m" #'icomplete-fido-exit))) +;; (add-hook 'after-init-hook #'fido-vertical-mode) + +;; (defun b/icomplete--fido-mode-setup () +;; "Customizations to `fido-mode''s minibuffer." +;; (when (and icomplete-mode (icomplete-simple-completing-p)) +;; (setq-local +;; ;; icomplete-compute-delay 0.1 +;; ;; icomplete-hide-common-prefix t +;; ;; icomplete-separator " ยท " +;; completion-styles '(basic substring partial-completion flex)))) +;; (add-hook 'minibuffer-setup-hook #'b/icomplete--fido-mode-setup 1) + (with-eval-after-load 'vertico (setopt vertico-cycle t) - ;; (b/keymap-set vertico-map "TAB" #'minibuffer-force-complete) + (let ((m vertico-map)) + ;; (b/keymap-set m "TAB" #'minibuffer-force-complete) + (b/keymap-set m "RET" #'vertico-directory-enter) + (b/keymap-set m "DEL" #'vertico-directory-delete-char) + (b/keymap-set m "M-DEL" #'vertico-directory-delete-word)) + ;; (add-hook 'rfn-eshadow-update-overlay-hook #'vertico-directory-tidy) (require 'orderless) (setopt completion-styles @@ -411,8 +458,6 @@ 'consult-mode-histories '(vc-git-log-edit-mode . log-edit-comment-ring))) (b/keymap-global-set "C-c b" #'consult-buffer) -(b/keymap-global-set "C-c o" #'consult-outline) -(b/keymap-global-set "C-c f r" #'consult-find) (b/keymap-global-set "C-c h i" #'consult-history) (b/keymap-global-set "C-c i m" #'consult-imenu) (b/keymap-global-set "C-c s s" #'consult-line) |