X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/47904cb736a67cadb9531a3862954ce8550c7cef..925481f2c29c853b6829dd797733da5bf2521972:/.emacs.d/init.el diff --git a/.emacs.d/init.el b/.emacs.d/init.el index a043652..539b045 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,6 +1,6 @@ -;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*- +;;; init.el --- mab's emacs configuration -*- lexical-binding: t -*- -;; Copyright (C) 2018-2020 Amin Bandali +;; Copyright (C) 2018-2019 Amin Bandali ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -82,7 +82,7 @@ ;;; whoami (setq user-full-name "Amin Bandali" - user-mail-address "bandali@gnu.org") + user-mail-address "mab@gnu.org") ;;; comment macro @@ -226,6 +226,12 @@ For disabling the behaviour for certain buffers and/or modes." (make-local-variable 'mouse-autoselect-window) (setq mouse-autoselect-window nil)) +(defun b/kill-current-buffer () + "Kill the current buffer." + ;; also see https://redd.it/64xb3q + (interactive) + (kill-buffer (current-buffer))) + ;;; Defaults @@ -451,12 +457,26 @@ For disabling the behaviour for certain buffers and/or modes." :config (pixel-scroll-mode 1)) (use-package epg-config + :config + ;; ask for GPG passphrase in minibuffer + ;; this will fail if gpg>=2.1 is not available + (if (version< "27" emacs-version) + (setq epg-pinentry-mode 'loopback) + (setq epa-pinentry-mode 'loopback)) :custom (epg-gpg-program (executable-find "gpg"))) (use-package epg :after epg-config) +(use-package pinentry + :demand + :after (epa epg server) + :config + ;; workaround for systemd-based distros: + ;; (setq pinentry--socket-dir server-socket-dir) + (pinentry-start)) + (use-package auth-source :custom (auth-sources '("~/.authinfo.gpg")) @@ -483,7 +503,7 @@ For disabling the behaviour for certain buffers and/or modes." ("C-S-h C" . describe-char) ("C-S-h F" . describe-face) - ("C-x k" . kill-this-buffer) + ("C-x k" . b/kill-current-buffer) ("C-x K" . kill-buffer) ("C-x s" . save-buffer) ("C-x S" . save-some-buffers) @@ -837,7 +857,7 @@ around if needed." ;; 'magit-insert-untracked-files ;; 'append) (setq magit-repository-directories '(("~/" . 0) - ("~/src/git/" . 1))) + ("~/src/git/" . 2))) (nconc magit-section-initial-visibility-alist '(([unpulled status] . show) ([unpushed status] . show))) @@ -2115,7 +2135,7 @@ This function is intended for use with `ivy-ignore-buffers'." (nnimap-address "127.0.0.1") (nnimap-server-port 143) (nnimap-authenticator plain) - (nnimap-user "bandali@gnu.local") + (nnimap-user "mab@gnu.local") (nnimap-inbox "INBOX") (nnimap-split-methods 'nnimap-split-fancy) (nnimap-split-fancy (| @@ -2398,17 +2418,19 @@ https://shemshak.org/~amin") (defvar b/uw-signature "Amin Bandali, MMath Student Cheriton School of Computer Science University of Waterloo -https://bndl.org") +https://bandali.eu.org") (defvar b/csc-signature "Amin Bandali -Systems Committee +System Administrator, Systems Committee Computer Science Club, University of Waterloo https://csclub.uwaterloo.ca/~abandali") (setq gnus-message-replysign t gnus-posting-styles '((".*" - (address "bandali@gnu.org")) + (address "mab@gnu.org")) ("nnimap\\+gnu:l\\..*" (signature nil)) + ("nnimap\\+gnu:.*" + (organization "GNU")) ((header "subject" "ThankCRM") (to "webmasters-comment@gnu.org") (body "") @@ -2515,7 +2537,7 @@ https://csclub.uwaterloo.ca/~abandali") message-subscribed-address-functions '(gnus-find-subscribed-addresses) message-dont-reply-to-names - "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)") + "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(mab\\|bandali\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)") ;; (require 'company-ebdb) :hook (;; (message-setup . mml-secure-message-sign-pgpmime) (message-mode . flyspell-mode) @@ -2669,6 +2691,7 @@ https://csclub.uwaterloo.ca/~abandali") (erc-cmd-DEOP (format "%s" (erc-current-nick)))) (add-to-list 'erc-modules 'keep-place) (add-to-list 'erc-modules 'notifications) + (add-to-list 'erc-modules 'smiley) (add-to-list 'erc-modules 'spelling) (add-to-list 'erc-modules 'scrolltoplace) (erc-update-modules)) @@ -2703,22 +2726,21 @@ https://csclub.uwaterloo.ca/~abandali") (use-package erc-scrolltoplace :after erc) -;; (use-package znc -;; :straight (:host nil :repo "https://git.shemshak.org/amin/znc.el") -;; :bind (("C-c a e e" . znc-erc) -;; ("C-c a e a" . znc-all)) -;; :config -;; (let ((pwd (let ((auth (auth-source-search :host "znca"))) -;; (cond -;; ((null auth) (error "Couldn't find znca's authinfo")) -;; (t (funcall (plist-get (car auth) :secret))))))) -;; (setq znc-servers -;; `(("znc.shemshak.org" 1337 t -;; ((freenode "amin/freenode" ,pwd))) -;; ("znc.shemshak.org" 1337 t -;; ((moznet "amin/moznet" ,pwd))) -;; ("znc.shemshak.org" 1337 t -;; ((oftc "amin/oftc" ,pwd))))))) +(use-package znc + :bind (("C-c a e e" . znc-erc) + ("C-c a e a" . znc-all)) + :config + (let ((pwd (let ((auth (auth-source-search :host "znca"))) + (cond + ((null auth) (error "Couldn't find znca's authinfo")) + (t (funcall (plist-get (car auth) :secret))))))) + (setq znc-servers + `(("znc.shemshak.org" 1337 t + ((freenode "amin/freenode" ,pwd))) + ("znc.shemshak.org" 1337 t + ((moznet "amin/moznet" ,pwd))) + ("znc.shemshak.org" 1337 t + ((oftc "amin/oftc" ,pwd))))))) ;;; Post initialization