** License
#+begin_src emacs-lisp :comments none
-;; Copyright (C) 2018 Amin Bandali <amin@aminb.org>
+;; Copyright (C) 2018 Amin Bandali <bandali@gnu.org>
;; 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
#+begin_src emacs-lisp
(setq user-full-name "Amin Bandali"
- user-mail-address "amin@aminb.org")
+ user-mail-address "amin@bandali.me")
#+end_src
** Package management
** Secrets file
+Load the secrets file if it exists, otherwise show a warning.
+
#+begin_src emacs-lisp
-(load (no-littering-expand-etc-file-name "secrets"))
+(with-demoted-errors
+ (load (no-littering-expand-etc-file-name "secrets")))
#+end_src
** Better =$PATH= handling
(evil-mode 1)
(general-swap-key nil '(normal motion) ";" ":")
- (setq evil-want-visual-char-semi-exclusive t)
+ (setq evil-want-visual-char-semi-exclusive t
+ evil-cross-lines t)
;; custom mode state mappings
(dolist (mspair '((ebdb-mode . emacs)
#+begin_src emacs-lisp
(use-package org
- :defer 3
+ :defer 1
:general
(amin--leader-keys
:states 'normal
org-src-preserve-indentation nil
org-edit-src-content-indentation 0
org-email-link-description-format "Email %c: %s" ; %.30s
+ org-highlight-latex-and-related '(entities)
org-log-done 'time)
(add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
(after! org-src
(org-edit-src-save)
(org-edit-src-exit)))
(define-key org-src-mode-map [remap evil-quit] 'org-edit-src-abort))
+ (font-lock-add-keywords
+ 'org-mode
+ '(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
+ (1 '(:foreground "#5a5b5a" :background "#292b2b") t) ; directive
+ (3 '(:foreground "#81a2be" :background "#292b2b") t) ; kind
+ (4 '(:foreground "#c5c8c6") t))) ; title
+ t)
:bind (:map org-mode-map ("M-L" . org-insert-last-stored-link))
:hook ((org-mode . org-indent-mode)
(org-mode . auto-fill-mode)
(org-mode . flyspell-mode))
:custom
- (org-latex-packages-alist '(("" "listings") ("" "color"))))
+ (org-latex-packages-alist '(("" "listings") ("" "color")))
+ :custom-face
+ '(org-block-begin-line ((t (:foreground "#5a5b5a" :background "#1d1f21"))))
+ '(org-block ((t (:background "#1d1f21"))))
+ '(org-latex-and-related ((t (:foreground "#b294bb")))))
(use-package ox-latex
:after ox
#+begin_src emacs-lisp
(use-package magit
- :defer 2
+ :defer 1
:general (amin--leader-keys "g s" 'magit-status)
:bind ("s-g" . magit-status)
:config
:config
(setq ivy-wrap t)
(ivy-mode 1)
- :custom-face
- (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
- (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold))))
- (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold)))))
+ ;; :custom-face
+ ;; (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
+ ;; (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold))))
+ ;; (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold))))
+)
#+end_src
**** Swiper
#+begin_src emacs-lisp
(use-package eshell
- :defer t
+ :defer 1
:commands eshell
:config
(eval-when-compile (defvar eshell-prompt-regexp))
(eshell-send-input))
(defun amin|eshell-setup ()
+ (make-local-variable 'company-idle-delay)
+ (setq company-idle-delay nil)
(bind-keys :map eshell-mode-map
- ("C-d" . amin/eshell-quit-or-delete-char)
- ("C-l" . amin/eshell-clear)))
+ ("C-d" . amin/eshell-quit-or-delete-char)
+ ("C-S-l" . amin/eshell-clear)
+ ("M-r" . counsel-esh-history)
+ ([tab] . company-complete)))
- :hook (eshell-mode . amin|eshell-setup))
+ :hook (eshell-mode . amin|eshell-setup)
+ :custom
+ (eshell-hist-ignoredups t)
+ (eshell-input-filter 'eshell-input-filter-initial-space))
#+end_src
*** Ibuffer
:config (column-number-mode))
(progn ; `text-mode'
- (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left))
+ (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left)
+ (add-hook 'text-mode-hook #'abbrev-mode))
(use-package tramp
:defer t
#+begin_src emacs-lisp
(use-package company
- :defer 2
+ :defer 1
:bind
(:map company-active-map
([tab] . company-complete-common-or-cycle)
([escape] . company-abort))
:custom
- (company-idle-delay 0.3)
(company-minimum-prefix-length 1)
(company-selection-wrap-around t)
(company-dabbrev-char-regexp "\\sw\\|\\s_\\|[-_]")
(load-theme 'tangomod t)
#+end_src
-** [[https://github.com/Malabarba/smart-mode-line][smart-mode-line]]
+** doom-modeline
#+begin_src emacs-lisp
-(use-package smart-mode-line
- :config
- (sml/setup)
- (sml/apply-theme 'light)
- (remove-hook 'display-time-hook 'sml/propertize-time-string))
+(use-package doom-modeline
+ :demand t
+ :config (setq doom-modeline-height 32)
+ :hook (after-init . doom-modeline-init))
+#+end_src
+
+** doom-themes
+
+#+begin_src emacs-lisp
+(use-package doom-themes)
#+end_src
** theme helper functions
#+begin_src emacs-lisp
-(defun amin/light ()
- "Load light theme(s)."
+(defun amin/lights-on ()
+ "Enable my favourite light theme."
(interactive)
(progn
(mapc #'disable-theme custom-enabled-themes)
- (load-theme 'tangomod t)
- (sml/apply-theme 'light)))
+ (load-theme 'tangomod t)))
-(defun amin/dark ()
- "Load dark theme(s)."
+(defun amin/lights-off ()
+ "Go dark."
(interactive)
(progn
(mapc #'disable-theme custom-enabled-themes)
- (load-theme 'tangomod-dark t)
- (sml/apply-theme 'dark)))
+ (load-theme 'doom-tomorrow-night t)))
(amin--leader-keys
"t" '(:ignore t :wk "theme")
- "t d" 'amin/dark
- "t l" 'amin/light)
+ "t d" 'amin/lights-off
+ "t l" 'amin/lights-on)
#+end_src
** [[https://github.com/bbatsov/crux][crux]]
#+begin_src emacs-lisp
(use-package projectile
- :defer 2
+ :defer t
:bind-keymap ("C-c p" . projectile-command-map)
:config
(projectile-mode)
"h h p" 'helpful-at-point))
#+end_src
-** [[https://github.com/kyagi/shell-pop-el][shell-pop]]
+** [[https://github.com/knu/shell-toggle.el][shell-toggle]]
#+begin_src emacs-lisp
-(use-package shell-pop
- :defer 1
- :general (amin--leader-keys "a s" 'shell-pop)
- :init
- (setq shell-pop-universal-key "C-c e"
- shell-pop-shell-type '("eshell" "*eshell*" (lambda nil (eshell)))))
+(use-package shell-toggle
+ :after eshell
+ :general (amin--leader-keys "a s" 'amin/shell-toggle)
+ :bind ("C-c e" . amin/shell-toggle)
+ :config
+ (defun amin/shell-toggle (make-cd)
+ "Toggle between the shell buffer and whatever buffer you are editing.
+With a prefix argument MAKE-CD also insert a \"cd DIR\" command
+into the shell, where DIR is the directory of the current buffer.
+
+When called in the shell buffer returns you to the buffer you were editing
+before calling this the first time.
+
+Options: `shell-toggle-goto-eob'"
+ (interactive "P")
+ ;; Try to decide on one of three possibilities:
+ ;; If not in shell-buffer, switch to it.
+ ;; If in shell-buffer, return to state before going to the shell-buffer
+ (if (eq (current-buffer) shell-toggle-shell-buffer)
+ (shell-toggle-buffer-return-from-shell)
+ (progn
+ (shell-toggle-buffer-goto-shell make-cd)
+ (if shell-toggle-full-screen-window-only (delete-other-windows)))))
+
+ ;; override to split horizontally instead
+ (defun shell-toggle-buffer-switch-to-other-window ()
+ "Switch to other window.
+If the current window is the only window in the current frame,
+create a new window and switch to it.
+
+\(This is less intrusive to the current window configuration than
+`switch-buffer-other-window')"
+ (let ((this-window (selected-window)))
+ (other-window 1)
+ ;; If we did not switch window then we only have one window and need to
+ ;; create a new one.
+ (if (eq this-window (selected-window))
+ (progn
+ (split-window-horizontally)
+ (other-window 1)))))
+
+ :custom
+ (shell-toggle-launch-shell 'shell-toggle-eshell))
#+end_src
** [[https://github.com/EricCrosson/unkillable-scratch][unkillable-scratch]]
:config
(unkillable-scratch 1)
:custom
+ (unkillable-scratch-behavior 'do-nothing)
(unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$")))
#+end_src
:config
(setq gnus-posting-styles
'((".*"
- (address "amin@aminb.org")
- (body "\nBest,\namin\n"))
+ (address "amin@bandali.me")
+ (body "\nBest,\namin\n")
+ (signature-file "~/.signature-amin")
+ (eval (setq amin--message-cite-say-hi t)))
("gnu.*"
- (address "bandali@gnu.org"))
+ (address "bandali@gnu.org")
+ (signature-file nil))
((header "subject" "ThankCRM")
- (to "webmasters-comment@gnu.org"))
+ (to "webmasters-comment@gnu.org")
+ (body "\nAdded to 2018supporters.html.\n\nMoving to campaigns.\n\n-amin\n")
+ (eval (setq amin--message-cite-say-hi nil)))
("nnimap\\+uwaterloo:.*"
(address "abandali@uwaterloo.ca")
- (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
+ (gcc "\"nnimap+uwaterloo:Sent Items\"")
+ (signature-file nil)))))
(use-package gnus-topic
:hook (gnus-group-mode . gnus-topic-mode))
#+begin_src emacs-lisp
(use-package message
:config
+ (defconst amin--message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:")
(defconst message-cite-style-bandali
'((message-cite-function 'message-cite-original)
(message-citation-line-function 'message-insert-formatted-citation-line)
(message-yank-prefix "> ")
(message-yank-cited-prefix ">")
(message-yank-empty-prefix ">")
- (message-citation-line-format "Hi %F,\n\nOn %Y-%m-%d %l:%M %p, %N wrote:"))
+ (message-citation-line-format
+ (if amin--message-cite-say-hi
+ (concat "Hi %F,\n\n" amin--message-cite-style-format)
+ amin--message-cite-style-format)))
"Citation style based on Mozilla Thunderbird's. Use with message-cite-style.")
(setq message-cite-style 'message-cite-style-bandali
message-kill-buffer-on-exit t
message-send-mail-function 'message-send-mail-with-sendmail
message-sendmail-envelope-from 'header
message-dont-reply-to-names
- "\\(\\(.*@aminb\\.org\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)"
+ "\\(\\(amin@bandali\\.me\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)"
message-user-fqdn "aminb.org")
:hook (;; (message-setup . mml-secure-message-sign-pgpmime)
(message-mode . flyspell-mode)
- (message-mode . (lambda () (setq fill-column 65
- message-fill-column 65))))
- :custom-face
- (message-header-subject ((t (:foreground "#111" :weight semi-bold))))
- (message-header-to ((t (:foreground "#111" :weight normal))))
- (message-header-cc ((t (:foreground "#333" :weight normal)))))
+ (message-mode . (lambda ()
+ ;; (setq fill-column 65
+ ;; message-fill-column 65)
+ (make-local-variable 'company-idle-delay)
+ (setq company-idle-delay 0.2))))
+ ;; :custom-face
+ ;; (message-header-subject ((t (:foreground "#111" :weight semi-bold))))
+ ;; (message-header-to ((t (:foreground "#111" :weight normal))))
+ ;; (message-header-cc ((t (:foreground "#333" :weight normal))))
+ )
(after! mml-sec
(setq mml-secure-openpgp-encrypt-to-self t
footnote-style 'unicode))
#+end_src
-** COMMENT supercite
-
-#+begin_src emacs-lisp
-(use-package supercite
- :after message
- :init
- (setq sc-nested-citation-p t
- ;; sc-cite-blank-lines-p t
- sc-citation-leader ""
- sc-reference-tag-string ""
- sc-preferred-header-style 5 ; (sc-header-author-writes)
- sc-auto-fill-region-p nil
- sc-confirm-always-p nil)
- :config
- ;; (defun amin--sc-header-on-wrote ()
- ;; "\"On <date>, <sc-author> wrote:\" unless:
- ;; 1. the \"sc-author\" field cannot be found, in which case nothing is inserted;
- ;; 2. the \"date\" field is missing in which case only the from part is printed."
- ;; (let ((sc-mumble "")
- ;; (whofrom (sc-whofrom)))
- ;; (if whofrom
- ;; (insert sc-reference-tag-string
- ;; (sc-hdr "On " (sc-mail-field "date") ", ")
- ;; (sc-hdr "" (sc-mail-field "sc-author")) " wrote:\n"))))
- ;; (defun amin--sc-header ()
- ;; "Hi <firstname>,\n\n <from> writes:"
- ;; (let ((sc-mumble "")
- ;; (whofrom (sc-whofrom)))
- ;; (if whofrom
- ;; (insert (sc-hdr "Hi " (sc-mail-field "sc-firstname") ",\n\n")
- ;; sc-reference-tag-string
- ;; whofrom
- ;; " writes:\n"))))
- ;; (add-to-list 'sc-rewrite-header-list '(amin--sc-header) t)
- ;; (add-to-list 'sc-rewrite-header-list '(amin--sc-header-on-wrote) t)
- ;; (setq sc-preferred-header-style (1- (length sc-rewrite-header-list)))
- (add-hook 'mail-citation-hook 'sc-cite-original))
-#+end_src
-
-** ebdb
-
-#+begin_src emacs-lisp
-(use-package ebdb
- :defer 1
- :bind (:map gnus-group-mode-map ("e" . ebdb))
- :config
- (setq ebdb-sources (no-littering-expand-var-file-name "ebdb")))
+** bbdb
-(use-package ebdb-com
- :after ebdb)
-
-(use-package ebdb-complete
- :after ebdb
- :config
- (ebdb-complete-enable))
+Manually install bbdb (=lisp/bbdb= copied from an ELPA-based setup),
+because installing it from source on Emacs 27 using the following
+submodule configuration for some reason doesn’t work and results in
+very strange errors when using any of the functions.
-(use-package ebdb-gnus
- :after ebdb)
-
-(use-package ebdb-message
- :after ebdb)
-
-;; (use-package ebdb-vcard
-;; :after ebdb)
-#+end_src
-
-** COMMENT bbdb
-
-#+begin_comment
+#+begin_src conf :tangle no
[submodule "bbdb"]
path = lib/bbdb
url = https://git.savannah.nongnu.org/git/bbdb.git
- load-path = lisp/elisp
+ load-path = lisp
info-path = doc
build-step = ./autogen.sh
- build-step = ./configure --with-lispdir=elisp
+ build-step = ./configure
build-step = make
build-step = make install
-#+end_comment
+#+end_src
+
+I tried using =borg-elpa= instead of doing it like this, but it added
+2 seconds to my startup time, which is unacceptable to me.
#+begin_src emacs-lisp
(use-package bbdb
+ :load-path "lisp/bbdb"
:init
- (bbdb-mua-auto-update-init 'message)
- (setq bbdb-mua-auto-update-p 'query)
- (add-hook 'gnus-startup-hook 'bbdb-insinuate-gnus))
+ (load (expand-file-name "lisp/bbdb/bbdb-autoloads.el" user-emacs-directory))
+ ;; (bbdb-mua-auto-update-init 'message)
+ (setq bbdb-mua-auto-update-p 'query
+ bbdb-complete-mail nil)
+ (bbdb-initialize 'gnus 'message))
#+end_src
** COMMENT message-x
(gnus-harvest-install)))
#+end_src
-** COMMENT gnus-alias :ARCHIVE:
-
-#+begin_src emacs-lisp
-(use-package gnus-alias
- :commands (gnus-alias-determine-identity
- gnus-alias-select-identity)
- :bind (:map message-mode-map
- ("s-i" . gnus-alias-select-identity))
- :config
- (setq
- gnus-alias-default-identity "amin"
- gnus-alias-identity-alist
- '(("amin"
- nil ;; Does not refer to any other identity
- "Amin Bandali <amin@aminb.org>"
- nil ;; Organization
- nil ;; extra headers
- nil ;; extra body text
- nil) ;; signature file
- ("gnu"
- nil
- "Amin Bandali <bandali@gnu.org>"
- nil
- nil
- nil
- nil)
- ("uw"
- nil
- "Amin Bandali <abandali@uwaterloo.ca>"
- nil
- (("Gcc" . "\"nnimap+uwaterloo:Sent Items\""))
- nil
- nil))
- gnus-alias-identity-rules
- '(("amin" ("Delivered-To" "<amin\\@aminb\\.org" both) "amin")
- ("gnu" ("Delivered-To" "<gnu\\@aminb\\.org" both) "gnu")
- ("uw" ("any" "<\\(.+\\)\\@uwaterloo\\.ca" both) "uw"))
- gnus-alias-override-user-mail-address t)
- :hook (message-setup . gnus-alias-determine-identity))
-#+end_src
-
-** COMMENT [[https://notmuchmail.org][notmuch]] :ARCHIVE:
-
-See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
-
-#+begin_src emacs-lisp
-(defun amin/notmuch ()
- "Delete other windows, then launch `notmuch'."
- (interactive
- (when (equal current-prefix-arg nil)
- (delete-other-windows)))
- (notmuch))
-
-(use-package notmuch
- :commands notmuch
- :bind ("C-c n" . amin/notmuch)
- :custom (notmuch-always-prompt-for-sender t)
- :config
- (setq notmuch-hello-sections
- '(notmuch-hello-insert-header
- notmuch-hello-insert-saved-searches
- ;; notmuch-hello-insert-search
- notmuch-hello-insert-alltags)
- notmuch-search-oldest-first nil
- notmuch-show-all-tags-list t
- notmuch-message-headers ; see bug follow-up above
- '("Subject" "To" "Cc" "Date" "List-Id" "X-RT-Originator")
- notmuch-hello-thousands-separator ","
- notmuch-fcc-dirs
- '(("amin@aminb.org" . "amin/Sent")
- ("bandali@gnu.org" . "gnu/Sent")
- ("abandali@uwaterloo.ca" . "\"uwaterloo/Sent Items\"")
- ("mab@gnu.org" . "gnu/Sent")
- ("amin@gnu.org" . "gnu/Sent")
- ("aminb@gnu.org" . "gnu/Sent")
- (".*" . "sent"))
- notmuch-search-result-format
- '(("date" . "%12s ")
- ("count" . "%-7s ")
- ("authors" . "%-40s ")
- ("subject" . "%s ")
- ("tags" . "(%s)"))
- notmuch-saved-searches
- '((:name "inbox" :query "tag:inbox" :key "i")
- (:name "unread" :query "tag:unread" :key "u")
- (:name "latest" :query "tag:latest" :key "l")
- (:name "encrypted" :query "tag:encrypted" :key "e")
- (:name "flagged" :query "tag:flagged" :key "f")
- (:name "sent" :query "tag:sent" :key "s")
- (:name "drafts" :query "tag:draft" :key "d")
- (:name "all mail" :query "*" :key "a")))
- ;; (add-hook 'visual-fill-column-mode-hook
- ;; (lambda ()
- ;; (when (string= major-mode 'notmuch-message-mode)
- ;; (setq visual-fill-column-width 70))))
- ;; (set! :evil-state 'notmuch-message-mode 'insert)
- ;; (advice-add #'notmuch-bury-or-kill-this-buffer
- ;; :override #'kill-this-buffer)
- :hook (notmuch-message-mode . doom-modeline-set-special-modeline)
- :bind
- (:map notmuch-hello-mode-map
- ("u" . (lambda ()
- "Search for `unread'-tagged messages"
- (interactive)
- (notmuch-hello-search "tag:unread")))
- ("i" . (lambda ()
- "Search for `inbox'-tagged messages"
- (interactive)
- (notmuch-hello-search "tag:inbox")))
- ("l" . (lambda ()
- "Search for `latest'-tagged messages"
- (interactive)
- (notmuch-hello-search "tag:latest")))
- ("e" . (lambda ()
- "Search for `encrypted'-tagged messages"
- (interactive)
- (notmuch-hello-search "tag:encrypted"))))
- (:map notmuch-search-mode-map
- ("k" . (lambda ()
- "Mark message read"
- (interactive)
- (notmuch-search-tag '("-unread"))
- ;; (notmuch-search-archive-thread)
- (notmuch-search-next-thread)))
- ("u" . (lambda ()
- "Mark message unread"
- (interactive)
- (notmuch-search-tag '("+unread"))
- (notmuch-search-next-thread)))
- ("K" . (lambda ()
- "Mark message deleted"
- (interactive)
- (notmuch-search-tag '("-unread" "-inbox" "+deleted"))
- (notmuch-search-next-thread)))
- ("S" . (lambda ()
- "Mark message as spam"
- (interactive)
- (notmuch-search-tag '("-unread" "-inbox" "-webmasters" "+spam"))
- (notmuch-search-next-thread))))
- (:map notmuch-tree-mode-map
- ("k" . (lambda ()
- "Mark message read"
- (interactive)
- (notmuch-tree-tag '("-unread"))
- ;; (notmuch-tree-archive-thread)
- (notmuch-tree-next-message)))
- ("u" . (lambda ()
- "Mark message unread"
- (interactive)
- (notmuch-tree-tag '("+unread"))
- (notmuch-tree-next-message)))
- ("K" . (lambda ()
- "Mark message deleted"
- (interactive)
- (notmuch-tree-tag '("-unread" "-inbox" "+deleted"))
- (notmuch-tree-next-message)))
- ("S" . (lambda ()
- "Mark message as spam"
- (interactive)
- (notmuch-tree-tag '("-unread" "-inbox" "-webmasters" "+spam"))
- (notmuch-tree-next-message))))
- :custom-face
- (notmuch-search-unread-face ((t (:weight semi-bold))))
- (notmuch-tag-face ((t (:foreground "navy blue" :weight semi-bold)))))
-
-(use-package counsel-notmuch
- :bind ("C-c s m" . counsel-notmuch))
-
-(after! notmuch-crypto
- (setq notmuch-crypto-process-mime t))
-
-(use-package org-notmuch
- :after (:any org notmuch))
-#+end_src
-
* Blogging
** [[https://ox-hugo.scripter.co][ox-hugo]]
projects / ~bandali / configs / blobdiff