diff options
| -rw-r--r-- | .bashrc | 1 | ||||
| -rw-r--r-- | .config/dovecot/canonical.sieve | 67 | ||||
| -rw-r--r-- | .config/git/config | 6 | ||||
| -rw-r--r-- | .config/git/config.canonical | 8 | ||||
| -rw-r--r-- | .config/git/config.sfl | 2 | ||||
| -rw-r--r-- | .config/isync/mbsyncrc | 56 | ||||
| -rw-r--r-- | .emacs.d/eshell/alias | 1 | ||||
| -rw-r--r-- | .emacs.d/init.el | 82 |
8 files changed, 25 insertions, 198 deletions
@@ -156,7 +156,6 @@ alias mpva="mpv --ytdl-format=bestaudio" alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc' alias getmail='getmail --getmaildir "$XDG_CONFIG_HOME"/getmail --rcfile getmailrc' alias m="mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; getmail" -alias mc="mbsync canonical; m" # theme alias da='change-theme dark' alias li='change-theme light' diff --git a/.config/dovecot/canonical.sieve b/.config/dovecot/canonical.sieve deleted file mode 100644 index 6c45c57..0000000 --- a/.config/dovecot/canonical.sieve +++ /dev/null @@ -1,67 +0,0 @@ -require [ "regex", "variables", "fileinto", "envelope", "mailbox", - "imap4flags", "include" ]; - -if address :is "from" "noreply+chat@canonical.com" { - fileinto :create "mattermost"; - stop; -} - -if address :is "from" "noreply+discourse@canonical.com" { - fileinto :create "discourse"; - stop; -} - -if address :is :domain "from" ["discourse.ubuntu.com", "forum.snapcraft.io", "discourse.charmhub.io"] { - fileinto :create "discourse"; - stop; -} - -if address :is "from" "jira@warthogs.atlassian.net" { - fileinto :create "jira"; - stop; -} - -if address :is :domain "from" "rt.canonical.com" { - fileinto :create "rt"; - stop; -} - -if anyof (address :is "from" "archive@ubuntu.com", - address :matches :domain "from" ["launchpad.net", "*.launchpad.net"]) -{ - fileinto :create "launchpad"; - stop; -} - -if address :is "from" "gitlab@salsa.debian.org" { - fileinto :create "salsa"; - stop; -} - -if address :is "from" "bugzilla-daemon@mozilla.org" { - fileinto :create "bugzilla"; - stop; -} - -if address :is "to" "ftp-release-notifications@gnome.org" { - fileinto :create "gnome-releases"; - stop; -} - -if address :is "from" "notifications@github.com" { - keep; - stop; -} - -if header :regex "list-id" "<.+.xt.local>" { - keep; - stop; -} - -if allof (header :regex "list-id" "<([a-z_0-9-]+)[.@]", - not address :regex :localpart "from" "^(no)?reply") -{ - set :lower "listname" "${1}"; - fileinto :create "l.${listname}"; - stop; -} diff --git a/.config/git/config b/.config/git/config index 2d3bfd8..f61c550 100644 --- a/.config/git/config +++ b/.config/git/config @@ -91,11 +91,7 @@ path = ~/.config/git/config.gnu [includeIf "gitdir:src/debian/"] path = ~/.config/git/config.debian -[includeIf "gitdir:src/canonical/"] - path = ~/.config/git/config.canonical -[includeIf "gitdir:src/sfl/"] - path = ~/.config/git/config.sfl [cinnabar] - version-check = 1718710536 + version-check = 1728006286 [help] autoCorrect = prompt diff --git a/.config/git/config.canonical b/.config/git/config.canonical deleted file mode 100644 index 86f1a78..0000000 --- a/.config/git/config.canonical +++ /dev/null @@ -1,8 +0,0 @@ -[user] - email = bandali@canonical.com - -[sendemail] - smtpuser = bandali - smtpserver = smtp.canonical.com - smtpserverport = 587 - smtpencryption = tls diff --git a/.config/git/config.sfl b/.config/git/config.sfl deleted file mode 100644 index 34fb7f8..0000000 --- a/.config/git/config.sfl +++ /dev/null @@ -1,2 +0,0 @@ -[user] - email = amin.bandali@savoirfairelinux.com diff --git a/.config/isync/mbsyncrc b/.config/isync/mbsyncrc index b0151fd..7b8a89e 100644 --- a/.config/isync/mbsyncrc +++ b/.config/isync/mbsyncrc @@ -105,59 +105,3 @@ Channel csclub Far :csclub-remote: Near :csclub-local: Patterns * - -###### -IMAPAccount canonical -Host mail.canonical.com -User bandali -PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/canonical.gpg" -SSLType IMAPS - -IMAPStore canonical-remote -Account canonical - -IMAPAccount canonical-local -Host 127.0.0.1 -Port 143 -User bandali@canonical.local -PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/canonical-local.gpg" -SSLType None - -IMAPStore canonical-local -Account canonical-local - -Channel canonical -Far :canonical-remote: -Near :canonical-local: -Patterns * - -###### -IMAPAccount sfl -Host mail.savoirfairelinux.com -User amin.bandali -PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/sfl.gpg" -SSLType IMAPS - -IMAPStore sfl-remote -Account sfl - -IMAPAccount sfl-local -Host 127.0.0.1 -Port 143 -User amin.bandali@savoirfairelinux.local -PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/sfl-local.gpg" -SSLType None - -IMAPStore sfl-local -Account sfl-local - -Channel sfl -Far :sfl-remote: -Near :sfl-local: -Patterns * !"Jami Sales&IBk-s"* !"Jami&IBk-s"* - -Channel sflro -Far :sfl-remote: -Near :sfl-local: -Sync Pull -Patterns "Jami Sales&IBk-s"* "Jami&IBk-s"* diff --git a/.emacs.d/eshell/alias b/.emacs.d/eshell/alias index 597d9f4..a324d78 100644 --- a/.emacs.d/eshell/alias +++ b/.emacs.d/eshell/alias @@ -18,4 +18,3 @@ alias vim find-file $1 alias mbsync mbsync -c $XDG_CONFIG_HOME/isync/mbsyncrc $* alias getmail getmail --getmaildir $XDG_CONFIG_HOME/getmail --rcfile getmailrc $* alias m mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; getmail -alias mc mbsync canonical; mbsync csclub; mbsync kelar; mbsync shemshak; mbsync gnub; getmail diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 07e91c5..4b5dc0b 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -937,15 +937,7 @@ around if needed." (setopt gnus-select-method '(nnnil "") gnus-secondary-select-methods - `(,@(when (member (system-name) '("darya" "nostalgia" "selene")) - '((nnimap - "canonical" - (nnimap-stream plain) - (nnimap-address "127.0.0.1") - (nnimap-server-port 143) - (nnimap-authenticator plain) - (nnimap-user "bandali@canonical.local")))) - (nnimap + `((nnimap "kelar" (nnimap-stream plain) (nnimap-address "127.0.0.1") @@ -1046,15 +1038,7 @@ around if needed." ;; spam ("X-Spam-Flag" "YES" "Junk") ;; catch-all - "INBOX"))) - ;; (nnimap - ;; "sfl" - ;; (nnimap-stream plain) - ;; (nnimap-address "127.0.0.1") - ;; (nnimap-server-port 143) - ;; (nnimap-authenticator plain) - ;; (nnimap-user "amin.bandali@savoirfairelinux.local")) - ) + "INBOX")))) gnus-message-archive-group "nnimap+kelar:INBOX" gnus-parameters '(("l\\.fencepost-users" @@ -1149,13 +1133,6 @@ around if needed." `(,(format bandali ", MMath") "Systems Committee <syscom@csclub.uwaterloo.ca>" "Computer Science Club of the University of Waterloo") - "\n")) - (defvar b/sfl-signature - (mapconcat - #'identity - `(,(format bandali "") - "Volunteer, Savoir-faire Linux" - "jami:bandali") "\n"))) (setopt gnus-gcc-mark-as-read t @@ -1177,31 +1154,17 @@ around if needed." (address "bandali@gnu.org") ("X-Message-SMTP-Method" "smtp fencepost.gnu.org 587") (gcc "nnimap+gnu:INBOX")) - ("nnimap\\+canonical:.*" - (address "bandali@canonical.com") - ("X-Message-SMTP-Method" "smtp smtp.canonical.com 587") - (signature nil) - (gcc "nnimap+canonical:Sent")) - ((header "to" "amin\\.bandali@canonical\\.com") - (address "amin.bandali@canonical.com")) - ((header "cc" "amin\\.bandali@canonical\\.com") - (address "amin.bandali@canonical.com")) - ;; ("nnimap\\+.*:l\\.ubuntu-.*" - ;; (address "bandali@ubuntu.com") - ;; ("X-Message-SMTP-Method" "smtp mail.kelar.org 587")) - ;; ((header "list-id" ".*\\.lists.ubuntu.com") - ;; (address "bandali@ubuntu.com") - ;; ("X-Message-SMTP-Method" "smtp mail.kelar.org 587")) + ("nnimap\\+.*:l\\.ubuntu-.*" + (address "bandali@ubuntu.com") + ("X-Message-SMTP-Method" "smtp mail.kelar.org 587")) + ((header "list-id" ".*\\.lists.ubuntu.com") + (address "bandali@ubuntu.com") + ("X-Message-SMTP-Method" "smtp mail.kelar.org 587")) ("nnimap\\+csc:.*" (address "bandali@csclub.uwaterloo.ca") ("X-Message-SMTP-Method" "smtp mail.csclub.uwaterloo.ca 587") (signature b/csc-signature) - (gcc "nnimap+csc:Sent")) - ("nnimap\\+sfl:.*" - (address "amin.bandali@savoirfairelinux.com") - ("X-Message-SMTP-Method" "smtp mail.savoirfairelinux.com 587") - (signature b/sfl-signature) - (gcc "nnimap+sfl:Sent"))))) + (gcc "nnimap+csc:Sent"))))) ;; (require 'gnus-registry) ;; (with-eval-after-load 'gnus-registry @@ -1258,15 +1221,12 @@ around if needed." (setq gnus-topic-topology `(("Gnus" visible nil nil) (("misc" visible nil nil)) - ,@(when (member (system-name) '("darya" "nostalgia" "selene")) - '((("canonical" visible nil nil)))) (("csc" visible nil nil)) (("kelar" visible nil nil)) (("shemshak" visible nil nil)) (("debian" visible nil nil)) (("gnu" visible nil nil)) ;; (("old-gnu" visible nil nil)) - ;; (("sfl" visible nil nil)) ))) (with-eval-after-load 'gnus-win @@ -1345,8 +1305,7 @@ around if needed." "amin@shemshak\\.org" "\\(bandali\\|mab\\|aminb?\\)@gnu\\.org" "a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca" - "amin\\.bandali@savoirfairelinux\\.com" - "\\(amin\\.\\)?bandali@canonical\\.com" + "bandali@gnu\\.ca" "bandali@ubuntu\\.com" "bandali@debian\\.org") "\\|")) @@ -1502,13 +1461,6 @@ non-nil." (erc-tls :server "na.tilde.chat" :port 6697 :client-certificate t))) -;; (b/keymap-global-set -;; "C-c e c" -;; (lambda () -;; (interactive) -;; (erc :server "localhost" :port 6667 -;; :id 'matterircd-canonical))) - ;;; Editing @@ -1647,6 +1599,20 @@ non-nil." (add-hook 'latex-mode-hook #'reftex-mode) +(when (and + (featurep 'completion-preview) + (functionp #'completion-preview-mode)) + (b/keymap-set completion-preview-active-mode-map + "M-n" #'completion-preview-next-candidate) + (b/keymap-set completion-preview-active-mode-map + "M-p" #'completion-preview-prev-candidate) + (b/keymap-set completion-preview-active-mode-map + "M-i" #'completion-preview-insert) + (add-hook 'prog-mode-hook #'completion-preview-mode) + (add-hook 'text-mode-hook #'completion-preview-mode) + (with-eval-after-load 'comint + (add-hook 'comint-mode-hook #'completion-preview-mode))) + (run-with-idle-timer 0.5 nil #'require 'delight) (with-eval-after-load 'delight (delight 'auto-fill-function " f" "simple") |