X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/fdbe9b15818c5a45336ec513f1b6c76b357e000b..31c32319d82bb77433d8c0449e7a635a688e8a22:/init.org?ds=sidebyside diff --git a/init.org b/init.org index 6877be2..3679c1c 100644 --- a/init.org +++ b/init.org @@ -1,4 +1,4 @@ -#+title: =aminb='s Literate Emacs Configuration +#+title: Literate Emacs Configuration of Amin Bandali #+author: Amin Bandali #+babel: :cache yes #+property: header-args :tangle yes @@ -214,7 +214,7 @@ but for now I've decided to keep them enabled. See documentation for #+begin_src emacs-lisp (setq user-full-name "Amin Bandali" - user-mail-address "amin@aminb.org") + user-mail-address "amin@bndl.org") #+end_src ** Package management @@ -320,9 +320,10 @@ and without compromising on performance. use-package-expand-minimally t)) (setq use-package-always-defer t) +(require 'bind-key) #+end_src -*** Epkg +*** COMMENT Epkg #+begin_quote Browse the Emacsmirror package database @@ -333,7 +334,6 @@ database, low-level functions for querying the database, and a =package.el=-like user interface for browsing the available packages. #+begin_src emacs-lisp -(require 'bind-key) (use-package epkg :commands (epkg-list-packages epkg-describe-package) :bind @@ -400,7 +400,7 @@ in my shell. #+begin_src emacs-lisp (use-package exec-path-from-shell - :defer 1 + :defer 0.4 :init (setq exec-path-from-shell-arguments nil exec-path-from-shell-check-startup-files nil) @@ -431,7 +431,7 @@ See [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.htm #+begin_src emacs-lisp (use-feature server - :defer 1 + :defer 0.4 :config (or (server-running-p) (server-mode))) #+end_src @@ -507,14 +507,14 @@ buffers and/or modes. scroll-preserve-screen-position 1) (use-feature mwheel - :defer 1 + :defer 0.4 :config (setq mouse-wheel-scroll-amount '(1 ((shift) . 1)) ; one line at a time mouse-wheel-progressive-speed nil ; don't accelerate scrolling mouse-wheel-follow-mouse t)) ; scroll window under mouse (use-feature pixel-scroll - :defer 1 + :defer 0.4 :config (pixel-scroll-mode 1)) #+end_src @@ -805,6 +805,9 @@ Some bindings for functions from built-in GNU Emacs packages: ("s-p" . beginning-of-buffer) ("s-n" . end-of-buffer)) + +(when (display-graphic-p) + (unbind-key "C-z" global-map)) #+end_src While at it, let's bind a few for some =straight-*= functions too: @@ -870,41 +873,6 @@ system. In short, my favourite way of life. -First, we have to resort to a [[https://github.com/raxod502/straight.el#installing-org-with-straightel][hack]] to be able to use the correct -latest version of Org from upstream. - -#+begin_src emacs-lisp - (use-package git) - - (defun org-git-version () - "The Git version of org-mode. - Inserted by installing org-mode or when a release is made." - (require 'git) - (let ((git-repo (expand-file-name - "straight/repos/org/" user-emacs-directory))) - (string-trim - (git-run "describe" - "--match=release\*" - "--abbrev=6" - "HEAD")))) - - (defun org-release () - "The release version of org-mode. - Inserted by installing org-mode or when a release is made." - (require 'git) - (let ((git-repo (expand-file-name - "straight/repos/org/" user-emacs-directory))) - (string-trim - (string-remove-prefix - "release_" - (git-run "describe" - "--match=release\*" - "--abbrev=0" - "HEAD"))))) - -(provide 'org-version) -#+end_src - We will use the =org-plus-contrib= package to get the whole deal: #+begin_src emacs-lisp @@ -915,23 +883,29 @@ And here's where my actual Org configurations begin: #+begin_src emacs-lisp (use-feature org - :defer 2 + :defer 0.5 :config (setq org-src-tab-acts-natively t org-src-preserve-indentation nil org-edit-src-content-indentation 0 - org-email-link-description-format "Email %c: %s" ; %.30s + org-link-email-description-format "Email %c: %s" ; %.30s org-highlight-latex-and-related '(entities) org-use-speed-commands t org-startup-folded 'content org-catch-invisible-edits 'show-and-error org-log-done 'time) (add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t) - :bind (:map org-mode-map ("M-L" . org-insert-last-stored-link)) + :bind + (("C-c a o a" . org-agenda) + :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-agenda-files '("~/usr/org/todos/personal.org" + "~/usr/org/todos/masters.org")) + (org-agenda-start-on-weekday 0) (org-latex-packages-alist '(("" "listings") ("" "color"))) :custom-face '(org-block-begin-line ((t (:foreground "#5a5b5a" :background "#1d1f21")))) @@ -1024,7 +998,7 @@ Not just how I do git, but /the/ way to do git. #+begin_src emacs-lisp (use-package magit - :defer 2 + :defer 0.5 :bind (("C-x g" . magit-status) ("s-g s" . magit-status) ("s-g l" . magit-log-buffer-file)) @@ -1048,7 +1022,7 @@ Recently opened files. #+begin_src emacs-lisp (use-feature recentf - :defer 0.5 + :defer 0.2 :config (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:") (setq recentf-max-saved-items 40)) @@ -1079,7 +1053,7 @@ There's no way I could top that, so I won't attempt to. #+begin_src emacs-lisp (use-package ivy - :defer 0.6 + :defer 0.3 :bind (:map ivy-minibuffer-map ([escape] . keyboard-escape-quit) @@ -1127,7 +1101,7 @@ There's no way I could top that, so I won't attempt to. #+begin_src emacs-lisp (use-feature eshell - :defer 2 + :defer 0.5 :commands eshell :bind ("C-c a s e" . eshell) :config @@ -1216,7 +1190,8 @@ There's no way I could top that, so I won't attempt to. ("emacs" (or (name . "^\\*scratch\\*$") - (name . "^\\*Messages\\*$")))))) + (name . "^\\*Messages\\*$"))) + ("erc" (mode . erc-mode))))) (ibuffer-formats '((mark modified read-only locked " " (name 18 18 :left :elide) @@ -1409,7 +1384,7 @@ Automatically save place in each file. #+begin_src emacs-lisp (use-package company - :defer 3 + :defer 0.6 :bind (:map company-active-map ([tab] . company-complete-common-or-cycle) @@ -1428,7 +1403,7 @@ Automatically save place in each file. #+begin_src emacs-lisp (use-package flycheck - :defer 3 + :defer 0.6 :hook (prog-mode . flycheck-mode) :bind (:map flycheck-mode-map @@ -1443,7 +1418,7 @@ Automatically save place in each file. ;; http://endlessparentheses.com/ispell-and-apostrophes.html (use-package ispell - :defer 3 + :defer 0.6 :config ;; ’ can be part of a word (setq ispell-local-dictionary-alist @@ -1505,7 +1480,7 @@ Automatically save place in each file. #+begin_src emacs-lisp (eval-when-compile (defvar lean-mode-map)) (use-package lean-mode - :defer 1 + :defer 0.4 :bind (:map lean-mode-map ("S-SPC" . company-complete)) :config @@ -1830,7 +1805,7 @@ treemacs :after (treemacs)) #+end_src -*** eclim +*** COMMENT eclim #+begin_src emacs-lisp (use-package eclim @@ -1884,7 +1859,7 @@ Emacs package that displays available keybindings in popup #+begin_src emacs-lisp (use-package which-key - :defer 1 + :defer 0.4 :config (which-key-add-key-based-replacements ;; prefixes for global prefixes and minor modes @@ -1900,9 +1875,11 @@ Emacs package that displays available keybindings in popup "C-x v" "version control" ;; prefixes for my personal bindings "C-c a" "applications" + "C-c a e" "erc" + "C-c a o" "org" "C-c a s" "shells" "C-c p" "package-management" - "C-c p e" "package-management/epkg" + ;; "C-c p e" "package-management/epkg" "C-c p s" "straight.el" "C-c psa" "all" "C-c psp" "package" @@ -1998,7 +1975,7 @@ Emacs package that displays available keybindings in popup #+begin_src emacs-lisp (use-package crux ; results in Waiting for git... [2 times] - :defer 1 + :defer 0.4 :bind (("C-c b k" . crux-kill-other-buffers) ("C-c d" . crux-duplicate-current-line-or-region) ("C-c D" . crux-duplicate-and-comment-current-line-or-region) @@ -2044,7 +2021,7 @@ Emacs package that displays available keybindings in popup #+begin_src emacs-lisp (use-package helpful - :defer 3 + :defer 0.6 :bind (("C-S-h c" . helpful-command) ("C-S-h f" . helpful-callable) ; helpful-function @@ -2059,7 +2036,7 @@ Make =*scratch*= and =*Messages*= unkillable. #+begin_src emacs-lisp (use-package unkillable-scratch - :defer 3 + :defer 0.6 :config (unkillable-scratch 1) :custom @@ -2076,7 +2053,7 @@ Make =*scratch*= and =*Messages*= unkillable. #+begin_src emacs-lisp (use-package boxquote - :defer 3 + :defer 0.6 :bind (:prefix-map a/boxquote-prefix-map :prefix "C-c q" @@ -2116,7 +2093,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. #+begin_src emacs-lisp (use-package typo - :defer 2 + :defer 0.5 :config (typo-global-mode 1) :hook (text-mode . typo-mode)) @@ -2126,7 +2103,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. #+begin_src emacs-lisp (use-package hl-todo - :defer 4 + :defer 0.5 :config (global-hl-todo-mode)) #+end_src @@ -2135,7 +2112,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. #+begin_src emacs-lisp (use-package shrink-path - :defer 2 + :defer 0.5 :after eshell :config (defun +eshell/prompt () @@ -2175,7 +2152,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. #+begin_src emacs-lisp (use-package multi-term - :defer 3 + :defer 0.6 :bind (("C-c a s m" . multi-term-dedicated-toggle) :map term-mode-map ("C-c C-j" . term-char-mode) @@ -2247,7 +2224,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. #+begin_src emacs-lisp (use-package yasnippet - :defer 3 + :defer 0.6 :config (defconst yas-verbosity-cur yas-verbosity) (setq yas-verbosity 2) @@ -2289,13 +2266,19 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. (nnimap-address "127.0.0.1") (nnimap-server-port 143) (nnimap-authenticator plain) - (nnimap-user "amin@aminb.org")) + (nnimap-user "amin@bndl.org")) (nnimap "uwaterloo" (nnimap-stream plain) (nnimap-address "127.0.0.1") (nnimap-server-port 143) (nnimap-authenticator plain) - (nnimap-user "abandali@uwaterloo.ca"))) + (nnimap-user "abandali@uwaterloo.ca")) + (nnimap "csclub" + (nnimap-stream plain) + (nnimap-address "127.0.0.1") + (nnimap-server-port 143) + (nnimap-authenticator plain) + (nnimap-user "abandali@csclub.uw"))) gnus-message-archive-group "nnimap+amin:Sent" gnus-parameters '(("gnu.*" @@ -2339,8 +2322,6 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. (concat local lapsed)))) (bind-keys :map gnus-article-mode-map - ("r" . gnus-article-reply-with-original) - ("R" . gnus-article-wide-reply-with-original) ("M-L" . org-store-link))) (use-feature gnus-sum @@ -2353,8 +2334,6 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. :config (bind-keys :map gnus-summary-mode-map - ("r" . gnus-summary-reply-with-original) - ("R" . gnus-summary-wide-reply-with-original) ("M-L" . org-store-link)) :hook (gnus-summary-mode . a/no-mouse-autoselect-window)) @@ -2362,21 +2341,26 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. :config (setq gnus-posting-styles '((".*" - (address "amin@aminb.org") + (address "amin@bndl.org") (body "\nBest,\namin\n") (eval (setq a/message-cite-say-hi t))) ("gnu.*" - (address "bandali@gnu.org")) + (address "bandali@gnu.org") + (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org"))) ((header "subject" "ThankCRM") (to "webmasters-comment@gnu.org") (body "\nAdded to 2019supporters.html.\n\nMoving to campaigns.\n\n-amin\n") (eval (setq a/message-cite-say-hi nil))) ("nnimap\\+uwaterloo:.*" (address "abandali@uwaterloo.ca") - (gcc "\"nnimap+uwaterloo:Sent Items\""))))) + (gcc "\"nnimap+uwaterloo:Sent Items\"")) + ("nnimap\\+csclub:.*" + (address "abandali@csclub.uwaterloo.ca") + (gcc "nnimap+csclub:Sent"))))) (use-feature gnus-topic - :hook (gnus-group-mode . gnus-topic-mode)) + :hook (gnus-group-mode . gnus-topic-mode) + :config (setq gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n")) (use-feature gnus-agent :config @@ -2408,6 +2392,16 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. #+begin_src emacs-lisp (use-feature message :config + ;; redefine for a simplified In-Reply-To header + ;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67) + (defun message-make-in-reply-to () + "Return the In-Reply-To header for this message." + (when message-reply-headers + (let ((from (mail-header-from message-reply-headers)) + (msg-id (mail-header-id message-reply-headers))) + (when from + msg-id)))) + (defconst a/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:") (defconst message-cite-style-bandali '((message-cite-function 'message-cite-original) @@ -2426,8 +2420,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. message-send-mail-function 'message-send-mail-with-sendmail message-sendmail-envelope-from 'header message-dont-reply-to-names - "\\(\\(.*@aminb\\.org\\)\\|\\(amin@bandali\\.me\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)" - message-user-fqdn "aminb.org") + "\\(\\(amin@bndl\\.org\\)\\|\\(.*@\\(aminb\\|amin\\.bndl\\)\\.org\\)\\|\\(\\(bandali\\|aminb?\\|mab\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)") (require 'company-ebdb) :hook (;; (message-setup . mml-secure-message-sign-pgpmime) (message-mode . flyspell-mode) @@ -2550,17 +2543,28 @@ Convenient footnotes in =message-mode=. (gnus-harvest-install))) #+end_src -* Blogging +* IRC :PROPERTIES: -:CUSTOM_ID: blogging +:CUSTOM_ID: irc :END: -** [[https://ox-hugo.scripter.co][ox-hugo]] +Now with ERC! #+begin_src emacs-lisp -(use-package ox-hugo - :after ox - :demand) +(use-package znc + :straight (:host nil :repo "https://git.bndl.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.bndl.org" 1337 t + ((freenode "amin/freenode" ,pwd))) + ("znc.bndl.org" 1337 t + ((moznet "amin/moznet" ,pwd))))))) #+end_src * Post initialization