X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/f94edfe60d898b26d1629f3c5cdd950996f6b0d5..7069ec695b0b15c1ea56305223bdafe92c1b3beb:/init.org diff --git a/init.org b/init.org index 8b6f146..167125c 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 @@ -33,6 +33,9 @@ few months, but decided to try =straight.el= which allows direct use of the various package archives. ** Installation +:PROPERTIES: +:CUSTOM_ID: installation +:END: To use this config for your Emacs, first you need to clone this repo, then tangle =init.org= into =init.el=, and optionally byte-compile @@ -46,12 +49,7 @@ cd ~/.emacs.d #+end_src Then, decide if you would like to use a byte-compiled init file, and -set the following variable accordingly: - -#+begin_src emacs-lisp -(defvar a/byte-compiled-init t - "If non-nil, byte-(re)compile init.el on successful tangles.") -#+end_src +set the [[#byte-compiled-init][a/byte-compiled-init]] variable accordingly. Now, first tangle =init.org=, and only if you chose to have a byte-compiled init, build init as well: @@ -107,7 +105,7 @@ file. ** License #+begin_src emacs-lisp :comments none -;; Copyright (C) 2018 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 @@ -139,6 +137,21 @@ file. :CUSTOM_ID: initial-setup :END: +** Byte-compiled init preference +:PROPERTIES: +:CUSTOM_ID: byte-compiled-init +:END: + +If you would like a byte-compiled init file, set the following +variable to ~t~, otherwise set it to ~nil~. + +#+begin_src emacs-lisp +(defvar a/byte-compiled-init t + "If non-nil, byte-(re)compile init.el on successful tangles.") +#+end_src + +You can click on [[#installation][Installation]] to jump back up there if you like :) + ** Emacs initialization I'd like to do a couple of measurements of Emacs' startup time. First, @@ -201,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 @@ -307,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 @@ -320,12 +334,11 @@ 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 - (("C-c P e d" . epkg-describe-package) - ("C-c P e p" . epkg-list-packages)) + (("C-c p e d" . epkg-describe-package) + ("C-c p e p" . epkg-list-packages)) :config (setq epkg-repository "~/.emacs.d/straight/repos/epkgs/") (eval-when-compile (defvar ivy-initial-inputs-alist)) @@ -484,6 +497,33 @@ buffers and/or modes. (setq mouse-autoselect-window nil)) #+end_src +** Better scrolling (arguably) + +#+begin_src emacs-lisp +(setq ;; scroll-margin 1 + ;; scroll-conservatively 10000 + scroll-step 1 + scroll-conservatively 10 + scroll-preserve-screen-position 1) + +(use-feature mwheel + :defer 1 + :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 + :config (pixel-scroll-mode 1)) +#+end_src + +** Ask for GPG passphrase in minibuffer + +#+begin_src emacs-lisp +(setq epg-pinentry-mode 'loopback) +#+end_src + ** Libraries #+begin_src emacs-lisp @@ -739,6 +779,8 @@ for this. ** Bindings +Some bindings for functions from built-in GNU Emacs packages: + #+begin_src emacs-lisp (bind-keys ("C-c a i" . ielm) @@ -746,21 +788,55 @@ for this. ("C-c e b" . eval-buffer) ("C-c e r" . eval-region) + ("C-c e i" . emacs-init-time) + ("C-c e u" . emacs-uptime) + ("C-c F m" . make-frame-command) ("C-c F d" . delete-frame) ("C-c F D" . delete-other-frames) ("C-c o" . other-window) - ("C-c Q" . save-buffers-kill-terminal) - ("C-S-h C" . describe-char) ("C-S-h F" . describe-face) - ("C-x K" . kill-this-buffer) + ("C-x k" . kill-this-buffer) + ("C-x K" . kill-buffer) ("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: + +#+begin_src emacs-lisp +(bind-keys + :prefix-map a/straight-prefix-map + :prefix "C-c p s" + ("u" . straight-use-package) + ("f" . straight-freeze-versions) + ("t" . straight-thaw-versions) + ("P" . straight-prune-build) + ("r" . straight-get-recipe) + ;; M-x ^straight-.*-all$ + ("a c" . straight-check-all) + ("a f" . straight-fetch-all) + ("a m" . straight-merge-all) + ("a n" . straight-normalize-all) + ("a F" . straight-pull-all) + ("a P" . straight-push-all) + ("a r" . straight-rebuild-all) + ;; M-x ^straight-.*-package$ + ("p c" . straight-check-package) + ("p f" . straight-fetch-package) + ("p m" . straight-merge-package) + ("p n" . straight-normalize-package) + ("p F" . straight-pull-package) + ("p P" . straight-push-package) + ("p r" . straight-rebuild-package)) #+end_src ** Packages @@ -797,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 @@ -1135,6 +1176,7 @@ There's no way I could top that, so I won't attempt to. (mode . python-mode) (mode . c-mode) (mode . c++-mode) + (mode . java-mode) (mode . emacs-lisp-mode) (mode . scheme-mode) (mode . haskell-mode) @@ -1142,7 +1184,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) @@ -1675,9 +1718,9 @@ instead. :hook (web-mode css-mode html-mode sgml-mode)) #+end_src -** COMMENT Java +** Java -*** meghanada +*** COMMENT meghanada #+begin_src emacs-lisp (use-package meghanada @@ -1688,7 +1731,7 @@ instead. :hook (java-mode . meghanada-mode)) #+end_src -*** lsp-java +*** COMMENT lsp-java #+begin_comment dependencies: @@ -1756,6 +1799,24 @@ treemacs :after (treemacs)) #+end_src +*** COMMENT eclim + +#+begin_src emacs-lisp +(use-package eclim + :bind (:map eclim-mode-map ("S-SPC" . company-complete)) + :hook ((java-mode . eclim-mode) + (eclim-mode . (lambda () + (make-local-variable 'company-idle-delay) + (defvar company-idle-delay) + ;; (setq company-idle-delay 0.7) + (setq company-idle-delay nil)))) + :custom + (eclim-auto-save nil) + ;; (eclimd-default-workspace "~/src/eclipse-workspace-exp") + (eclim-executable "~/.p2/pool/plugins/org.eclim_2.8.0/bin/eclim") + (eclim-eclipse-dirs '("~/usr/eclipse/dsl-2018-09/eclipse"))) +#+end_src + ** geiser #+begin_src emacs-lisp @@ -1808,20 +1869,23 @@ 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 s" "shells" - "C-c P" "package-management" - "C-c P e" "package-management/epkg" - "C-c P s" "package-management/straight.el" + "C-c p" "package-management" + ;; "C-c p e" "package-management/epkg" + "C-c p s" "straight.el" + "C-c psa" "all" + "C-c psp" "package" "C-c c" "compile-and-comments" "C-c e" "eval" "C-c f" "files" "C-c F" "frames" "C-S-h" "help(ful)" "C-c m" "multiple-cursors" - "C-c p" "projectile" - "C-c p s" "projectile/search" - "C-c p x" "projectile/execute" - "C-c p 4" "projectile/other-window" + "C-c P" "projectile" + "C-c P s" "projectile/search" + "C-c P x" "projectile/execute" + "C-c P 4" "projectile/other-window" "C-c q" "boxquote" "s-g" "magit" "s-o" "outline" @@ -1839,7 +1903,10 @@ Emacs package that displays available keybindings in popup "C-c C-e" "web/element" "C-c C-t" "web/tags") - (which-key-mode)) + (which-key-mode) + :custom + (which-key-add-column-padding 5) + (which-key-max-description-length 32)) #+end_src ** theme @@ -1926,7 +1993,7 @@ Emacs package that displays available keybindings in popup #+begin_src emacs-lisp (use-package projectile - :bind-keymap ("C-c p" . projectile-command-map) + :bind-keymap ("C-c P" . projectile-command-map) :config (projectile-mode) @@ -2050,9 +2117,10 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. (propertize (+eshell--current-git-branch) 'face 'font-lock-function-name-face) "\n" - (propertize "λ" 'face 'eshell-prompt-face) + ;; "λ" + ;; (propertize "λ" 'face 'eshell-prompt) ;; needed for the input text to not have prompt face - (propertize " " 'face 'default)))) + (propertize "λ " 'face 'default)))) (defun +eshell--current-git-branch () (let ((branch (car (loop for match in (split-string (shell-command-to-string "git branch") "\n") @@ -2137,6 +2205,29 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. ("a" . mc/mark-all-like-this)))) #+end_src +** forge + +#+begin_src emacs-lisp +(use-package forge + :after magit + :demand) +#+end_src + +** yasnippet + +#+begin_src emacs-lisp +(use-package yasnippet + :defer 3 + :config + (defconst yas-verbosity-cur yas-verbosity) + (setq yas-verbosity 2) + (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets") + (yas-reload-all) + (setq yas-verbosity yas-verbosity-cur) + :hook + (text-mode . yas-minor-mode)) +#+end_src + * Email :PROPERTIES: :CUSTOM_ID: email @@ -2168,13 +2259,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.*" @@ -2241,21 +2338,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 2018supporters.html.\n\nMoving to campaigns.\n\n-amin\n") + (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 @@ -2264,7 +2366,7 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. (use-feature gnus-group :config - (setq gnus-permanently-visible-groups "\\((INBOX\\|gnu$\\)")) + (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)")) (use-feature mm-decode :config @@ -2287,6 +2389,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) @@ -2305,8 +2417,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) @@ -2333,6 +2444,10 @@ Convenient footnotes in =message-mode=. #+begin_src emacs-lisp (use-feature footnote :after message + ;; :config + ;; (setq footnote-start-tag "" + ;; footnote-end-tag "" + ;; footnote-style 'unicode) :bind (:map message-mode-map :prefix-map a/footnote-prefix-map @@ -2343,11 +2458,7 @@ Convenient footnotes in =message-mode=. ("d" . footnote-delete-footnote) ("g" . footnote-goto-footnote) ("r" . footnote-renumber-footnotes) - ("s" . footnote-set-style)) - :config - (setq footnote-start-tag "" - footnote-end-tag "" - footnote-style 'unicode)) + ("s" . footnote-set-style))) #+end_src ** ebdb @@ -2429,6 +2540,30 @@ Convenient footnotes in =message-mode=. (gnus-harvest-install))) #+end_src +* IRC +:PROPERTIES: +:CUSTOM_ID: irc +:END: + +Now with ERC! + +#+begin_src emacs-lisp +(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 + * Blogging :PROPERTIES: :CUSTOM_ID: blogging @@ -2438,10 +2573,8 @@ Convenient footnotes in =message-mode=. #+begin_src emacs-lisp (use-package ox-hugo - :after ox) - -(use-feature ox-hugo-auto-export - :after ox-hugo) + :after ox + :demand) #+end_src * Post initialization