summaryrefslogtreecommitdiffstats
path: root/.emacs.d
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.emacs.d/eshell/alias1
-rw-r--r--.emacs.d/init.el82
2 files changed, 24 insertions, 59 deletions
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")