X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/4d5a11b302efecfc745f5e22dc4b9cf394e339c2..750085ffb2a44f1d020c86f8578607cebe839f91:/.emacs.d/init.el?ds=sidebyside diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 4998cd8..9aff3e3 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,4 +1,4 @@ -;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t -*- +;;; init.el --- bandali's emacs configuration -*- lexical-binding: t -*- ;; Copyright (C) 2018-2019 Amin Bandali @@ -18,8 +18,9 @@ ;;; Commentary: ;; Emacs configuration of Amin Bandali, computer scientist, functional -;; programmer, and free software activist. Uses straight.el for -;; purely functional and fully reproducible package management. +;; programmer, and free software activist. Used to use straight.el +;; for purely functional and fully reproducible package management. +;; Now I just use Guix. ;; Over the years, I've taken inspiration from configurations of many ;; great people. Some that I can remember off the top of my head are: @@ -37,18 +38,18 @@ ;;; Emacs initialization -(defvar mab/before-user-init-time (current-time) +(defvar b/before-user-init-time (current-time) "Value of `current-time' when Emacs begins loading `user-init-file'.") (message "Loading Emacs...done (%.3fs)" - (float-time (time-subtract mab/before-user-init-time + (float-time (time-subtract b/before-user-init-time before-init-time))) ;; temporarily increase `gc-cons-threshhold' and `gc-cons-percentage' ;; during startup to reduce garbage collection frequency. clearing ;; `file-name-handler-alist' seems to help reduce startup time too. -(defvar mab/gc-cons-threshold gc-cons-threshold) -(defvar mab/gc-cons-percentage gc-cons-percentage) -(defvar mab/file-name-handler-alist file-name-handler-alist) +(defvar b/gc-cons-threshold gc-cons-threshold) +(defvar b/gc-cons-percentage gc-cons-percentage) +(defvar b/file-name-handler-alist file-name-handler-alist) (setq gc-cons-threshold (* 400 1024 1024) ; 400 MiB gc-cons-percentage 0.6 file-name-handler-alist nil @@ -56,11 +57,11 @@ esup-child-profile-require-level 0) ;; set them back to their defaults once we're done initializing -(defun mab/post-init () - (setq gc-cons-threshold mab/gc-cons-threshold - gc-cons-percentage mab/gc-cons-percentage - file-name-handler-alist mab/file-name-handler-alist)) -(add-hook 'after-init-hook #'mab/post-init) +(defun b/post-init () + (setq gc-cons-threshold b/gc-cons-threshold + gc-cons-percentage b/gc-cons-percentage + file-name-handler-alist b/file-name-handler-alist)) +(add-hook 'after-init-hook #'b/post-init) ;; increase number of lines kept in *Messages* log (setq message-log-max 20000) @@ -74,7 +75,7 @@ ;;; whoami (setq user-full-name "Amin Bandali" - user-mail-address "amin@shemshak.org") + user-mail-address "bandali@gnu.org") ;;; comment macro @@ -86,71 +87,7 @@ nil) -;;; Package management - -;; No package.el (for emacs 26 and before, uncomment the following) -;; Not necessary when using straight.el -;; (C-h v straight-package-neutering-mode RET) - -(when (and - (not (featurep 'straight)) - (version< emacs-version "27")) - (setq package-enable-at-startup nil) - ;; (package-initialize) - ) - -;; for emacs 27 and later, we use early-init.el. see -;; https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=24acb31c04b4048b85311d794e600ecd7ce60d3b - -;; straight.el - -;; Main engine start... - -(setq straight-repository-branch "develop" - straight-check-for-modifications '(check-on-save find-when-checking)) - -(defun mab/bootstrap-straight () - (defvar bootstrap-version) - (let ((bootstrap-file - (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) - (bootstrap-version 5)) - (unless (file-exists-p bootstrap-file) - (with-current-buffer - (url-retrieve-synchronously - "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el" - 'silent 'inhibit-cookies) - (goto-char (point-max)) - (eval-print-last-sexp))) - (load bootstrap-file nil 'nomessage))) - -;; Solid rocket booster ignition... - -(mab/bootstrap-straight) - -;; We have lift off! - -(setq straight-use-package-by-default t) - -(defmacro use-feature (name &rest args) - "Like `use-package', but with `straight-use-package-by-default' disabled." - (declare (indent defun)) - `(use-package ,name - :straight nil - ,@args)) - -(with-eval-after-load 'recentf - (add-to-list 'recentf-exclude - (expand-file-name "~/.emacs.d/straight/build/"))) - -(defun mab/reload-init () - "Reload init.el." - (interactive) - (setq mab/file-name-handler-alist file-name-handler-alist) - (load user-init-file nil 'nomessage) - (mab/post-init)) - -;; use-package -(straight-use-package 'use-package) +;;; use-package (if nil ; set to t when need to debug init (progn (setq use-package-verbose t @@ -166,46 +103,46 @@ (use-package delight) -;; for browsing the Emacsmirror package database -(comment - (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)) - :config - (setq epkg-repository "~/.emacs.d/straight/repos/epkgs/") - (eval-when-compile (defvar ivy-initial-inputs-alist)) - (with-eval-after-load 'ivy - (add-to-list - 'ivy-initial-inputs-alist '(epkg-describe-package . "^") t)))) - ;;; Initial setup ;; keep ~/.emacs.d clean -(use-package no-littering - :demand t - :config - (savehist-mode 1) - (add-to-list 'savehist-additional-variables 'kill-ring) - (save-place-mode 1) - (setq auto-save-file-name-transforms - `((".*" ,(no-littering-expand-var-file-name "auto-save/") t)))) +(defvar b/etc-dir + (expand-file-name + (convert-standard-filename "etc/") user-emacs-directory) + "The directory where packages place their configuration files.") + +(defvar b/var-dir + (expand-file-name + (convert-standard-filename "var/") user-emacs-directory) + "The directory where packages place their persistent data files.") + +(defun b/etc (file) + "Expand filename FILE relative to `b/etc-dir'." + (expand-file-name (convert-standard-filename file) b/etc-dir)) + +(defun b/var (file) + "Expand filename FILE relative to `b/var-dir'." + (expand-file-name (convert-standard-filename file) b/var-dir)) + +(setq + auto-save-list-file-prefix (b/var "auto-save/sessions/") + nsm-settings-file (b/var "nsm-settings.el")) ;; separate custom file (don't want it mixing with init.el) -(use-feature custom +(use-package custom :no-require t :config - (setq custom-file (no-littering-expand-etc-file-name "custom.el")) + (setq custom-file (b/etc "custom.el")) (when (file-exists-p custom-file) (load custom-file)) ;; while at it, treat themes as safe (setf custom-safe-themes t)) ;; load the secrets file if it exists, otherwise show a warning -(with-demoted-errors - (load (no-littering-expand-etc-file-name "secrets"))) +(comment + (with-demoted-errors + (load (b/etc "secrets")))) ;; better $PATH (and other environment variable) handling (use-package exec-path-from-shell @@ -227,7 +164,7 @@ ;; start up emacs server. see ;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server -(use-feature server +(use-package server :defer 0.4 :config (or (server-running-p) (server-mode))) @@ -270,7 +207,7 @@ ;; focus follows mouse (setq mouse-autoselect-window t) -(defun mab/no-mouse-autoselect-window () +(defun b/no-mouse-autoselect-window () "Conveniently disable `focus-follows-mouse'. For disabling the behaviour for certain buffers and/or modes." (make-local-variable 'mouse-autoselect-window) @@ -283,28 +220,35 @@ For disabling the behaviour for certain buffers and/or modes." scroll-conservatively 10 scroll-preserve-screen-position 1) -(use-feature mwheel +(use-package mwheel :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 +(use-package pixel-scroll :defer 0.4 :config (pixel-scroll-mode 1)) ;; ask for GPG passphrase in minibuffer -(use-feature epg-config +(use-package epa + :custom + ; this will fail if gpg>=2.1 is not available + (epa-pinentry-mode 'loopback)) + +(use-package epg-config :defer 0.4 :custom ((epg-gpg-program (executable-find "gpg")) (epg-pinentry-mode 'loopback))) -(use-feature epg + +(use-package epg :after epg-config) + (use-package pinentry :demand - :after (epg server) + :after (epa epg server) :config (setq pinentry--socket-dir server-socket-dir) (pinentry-start)) @@ -316,12 +260,12 @@ For disabling the behaviour for certain buffers and/or modes." ;;; Useful utilities -(defmacro mab/setq-every (value &rest vars) +(defmacro b/setq-every (value &rest vars) "Set all the variables from VARS to value VALUE." (declare (indent defun) (debug t)) `(progn ,@(mapcar (lambda (x) (list 'setq x value)) vars))) -(defun mab/start-process (program &rest args) +(defun b/start-process (program &rest args) "Same as `start-process', but doesn't bother about name and buffer." (let ((process-name (concat program "_process")) (buffer-name (generate-new-buffer-name @@ -329,15 +273,15 @@ For disabling the behaviour for certain buffers and/or modes." (apply #'start-process process-name buffer-name program args))) -(defun mab/dired-start-process (program &optional args) +(defun b/dired-start-process (program &optional args) "Open current file with a PROGRAM." ;; Shell command looks like this: "program [ARGS]... FILE" (ARGS can ;; be nil, so remove it). - (apply #'mab/start-process + (apply #'b/start-process program (remove nil (list args (dired-get-file-for-visit))))) -(defun mab/add-elisp-section () +(defun b/add-elisp-section () (interactive) (insert "\n") (previous-line) @@ -404,6 +348,7 @@ For disabling the behaviour for certain buffers and/or modes." ;; backups (C-h v make-backup-files RET) (setq backup-by-copying t + backup-directory-alist (list (cons "." (b/var "backup/"))) version-control t delete-old-versions t) @@ -425,12 +370,12 @@ For disabling the behaviour for certain buffers and/or modes." ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf' ;; instead of the now obsolete `flet'. (with-eval-after-load 'compile - (defun mab/compilation-finish-function (buffer outstr) + (defun b/compilation-finish-function (buffer outstr) (unless (string-match "finished" outstr) (switch-to-buffer-other-window buffer)) t) - (setq compilation-finish-functions #'mab/compilation-finish-function) + (setq compilation-finish-functions #'b/compilation-finish-function) (require 'cl-macs) @@ -461,10 +406,10 @@ For disabling the behaviour for certain buffers and/or modes." ;; (enables niceties like `q' for quit) (setq view-read-only t) -(use-feature vc +(use-package vc :bind ("C-x v C-=" . vc-ediff)) -(use-feature ediff +(use-package ediff :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo) :custom ((ediff-window-setup-function 'ediff-setup-windows-plain) (ediff-split-window-function 'split-window-horizontally))) @@ -480,6 +425,7 @@ For disabling the behaviour for certain buffers and/or modes." ("C-c e i" . emacs-init-time) ("C-c e u" . emacs-uptime) + ("C-c e v" . emacs-version) ("C-c F m" . make-frame-command) ("C-c F d" . delete-frame) @@ -491,13 +437,8 @@ For disabling the behaviour for certain buffers and/or modes." ("C-x k" . kill-this-buffer) ("C-x K" . kill-buffer) - ("s-p" . beginning-of-buffer) - ("s-n" . end-of-buffer) - - ("M-O" . facemenu-keymap) - :map emacs-lisp-mode-map - ("" . mab/add-elisp-section)) + ("" . b/add-elisp-section)) (when (display-graphic-p) (unbind-key "C-z" global-map)) @@ -511,52 +452,10 @@ For disabling the behaviour for certain buffers and/or modes." ("" . kill-this-buffer) ("" . ivy-switch-buffer)) -(bind-keys - :prefix-map mab/straight-prefix-map - :prefix "C-c p s" - ("u" . straight-use-package) - ("f" . straight-freeze-versions) - ("t" . straight-thaw-versions) - ("P" . straight-prune-build) - ("g" . straight-get-recipe) - ("r" . mab/reload-init) - ;; 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)) - ;;; Essential packages -(use-package auto-compile - :demand t - :config - (auto-compile-on-load-mode) - (auto-compile-on-save-mode) - (setq auto-compile-display-buffer nil - auto-compile-mode-line-counter t - auto-compile-source-recreate-deletes-dest t - auto-compile-toggle-deletes-nonlib-dest t - auto-compile-update-autoloads t) - (add-hook 'auto-compile-inhibit-compile-hook - 'auto-compile-inhibit-compile-detached-git-head)) - -;; use the org-plus-contrib package to get the whole deal -(straight-use-package 'org-plus-contrib) - -(use-feature org +(use-package org :defer 0.5 :config (setq org-src-tab-acts-natively t @@ -592,7 +491,7 @@ For disabling the behaviour for certain buffers and/or modes." '(org-block ((t (:background "#1d1f21")))) '(org-latex-and-related ((t (:foreground "#b294bb"))))) -(use-feature ox-latex +(use-package ox-latex :after ox :config (setq org-latex-listings 'listings @@ -608,7 +507,7 @@ For disabling the behaviour for certain buffers and/or modes." t) (require 'ox-beamer)) -(use-feature ox-extra +(use-package ox-extra :config (ox-extras-activate '(latex-header-blocks ignore-headlines))) @@ -616,13 +515,13 @@ For disabling the behaviour for certain buffers and/or modes." ;; org file. closely inspired by ;; https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles (with-eval-after-load 'org - (defvar mab/show-async-tangle-results nil + (defvar b/show-async-tangle-results nil "Keep *emacs* async buffers around for later inspection.") - (defvar mab/show-async-tangle-time nil + (defvar b/show-async-tangle-time nil "Show the time spent tangling the file.") - (defun mab/async-babel-tangle () + (defun b/async-babel-tangle () "Tangle org file asynchronously." (interactive) (let* ((file-tangle-start-time (current-time)) @@ -634,12 +533,12 @@ For disabling the behaviour for certain buffers and/or modes." `(lambda () (require 'org) (org-babel-tangle-file ,file)) - (unless mab/show-async-tangle-results + (unless b/show-async-tangle-results `(lambda (result) (if result (message "Tangled %s%s" ,file-nodir - (if mab/show-async-tangle-time + (if b/show-async-tangle-time (format " (%.3fs)" (float-time (time-subtract (current-time) ',file-tangle-start-time))) @@ -648,7 +547,7 @@ For disabling the behaviour for certain buffers and/or modes." (add-to-list 'safe-local-variable-values - '(eval add-hook 'after-save-hook #'mab/async-babel-tangle 'append 'local)) + '(eval add-hook 'after-save-hook #'b/async-babel-tangle 'append 'local)) ;; *the* right way to do git (use-package magit @@ -666,18 +565,25 @@ For disabling the behaviour for certain buffers and/or modes." (nconc magit-section-initial-visibility-alist '(([unpulled status] . show) ([unpushed status] . show))) + (setq transient-history-file (b/var "transient/history.el") + transient-levels-file (b/etc "transient/levels.el") + transient-values-file (b/etc "transient/values.el")) :custom (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1) :custom-face (magit-diff-file-heading ((t (:weight normal))))) ;; recently opened files -(use-feature recentf +(use-package recentf :defer 0.2 - :config + ;; :config ;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:") - (setq recentf-max-saved-items 2000)) + :custom + (recentf-max-saved-items 2000) + (recentf-save-file (b/var "recentf-save.el"))) ;; smart M-x enhancement (needed by counsel for history) -(use-package smex) +(use-package smex + :config + (setq smex-save-file (b/var "smex-save.el"))) (use-package ivy :defer 0.3 @@ -741,42 +647,43 @@ For disabling the behaviour for certain buffers and/or modes." ("C-z" . helm-select-action)) ; List actions :config (helm-mode 1))) -(use-feature eshell +(use-package eshell :defer 0.5 :commands eshell :bind ("C-c a s e" . eshell) :config (eval-when-compile (defvar eshell-prompt-regexp)) - (defun mab/eshell-quit-or-delete-char (arg) + (defun b/eshell-quit-or-delete-char (arg) (interactive "p") (if (and (eolp) (looking-back eshell-prompt-regexp nil)) (eshell-life-is-too-much) (delete-char arg))) - (defun mab/eshell-clear () + (defun b/eshell-clear () (interactive) (let ((inhibit-read-only t)) (erase-buffer)) (eshell-send-input)) - (defun mab/eshell-setup () + (defun b/eshell-setup () (make-local-variable 'company-idle-delay) (defvar company-idle-delay) (setq company-idle-delay nil) (bind-keys :map eshell-mode-map - ("C-d" . mab/eshell-quit-or-delete-char) - ("C-S-l" . mab/eshell-clear) + ("C-d" . b/eshell-quit-or-delete-char) + ("C-S-l" . b/eshell-clear) ("M-r" . counsel-esh-history) ([tab] . company-complete))) - :hook (eshell-mode . mab/eshell-setup) + :hook (eshell-mode . b/eshell-setup) :custom + (eshell-directory-name (b/var "eshell/")) (eshell-hist-ignoredups t) (eshell-input-filter 'eshell-input-filter-initial-space)) -(use-feature ibuffer +(use-package ibuffer :bind - (("C-x C-b" . ibuffer-other-window) + (("C-x C-b" . ibuffer) :map ibuffer-mode-map ("P" . ibuffer-backward-filter-group) ("N" . ibuffer-forward-filter-group) @@ -848,7 +755,7 @@ For disabling the behaviour for certain buffers and/or modes." " " filename))) :hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default")))) -(use-feature outline +(use-package outline :hook (prog-mode . outline-minor-mode) :delight (outline-minor-mode " outl") :bind @@ -857,7 +764,7 @@ For disabling the behaviour for certain buffers and/or modes." ("" . outline-toggle-children) ("M-p" . outline-previous-visible-heading) ("M-n" . outline-next-visible-heading) - :prefix-map mab/outline-prefix-map + :prefix-map b/outline-prefix-map :prefix "s-O" ("TAB" . outline-toggle-children) ("a" . outline-hide-body) @@ -866,10 +773,10 @@ For disabling the behaviour for certain buffers and/or modes." ("h" . outline-hide-subtree) ("s" . outline-show-subtree))) -(use-feature ls-lisp +(use-package ls-lisp :custom (ls-lisp-dirs-first t)) -(use-feature dired +(use-package dired :config (setq dired-listing-switches "-alh" ls-lisp-use-insert-directory-program nil) @@ -915,15 +822,15 @@ For disabling the behaviour for certain buffers and/or modes." ("\\" . dired-hide-details-mode) ("z" . (lambda () (interactive) - (mab/dired-start-process "zathura")))) + (b/dired-start-process "zathura")))) :hook (dired-mode . dired-hide-details-mode)) -(use-feature help +(use-package help :config (temp-buffer-resize-mode) (setq help-window-select t)) -(use-feature tramp +(use-package tramp :config (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:")) (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil)) @@ -949,46 +856,51 @@ For disabling the behaviour for certain buffers and/or modes." :hook (magit-post-refresh . diff-hl-magit-post-refresh)) ;; display Lisp objects at point in the echo area -(use-feature eldoc +(use-package eldoc :when (version< "25" emacs-version) :delight " eldoc" :config (global-eldoc-mode)) ;; highlight matching parens -(use-feature paren +(use-package paren :demand :config (show-paren-mode)) -(use-feature elec-pair +(use-package elec-pair :demand :config (electric-pair-mode)) -(use-feature simple +(use-package simple :delight (auto-fill-function " fill") :config (column-number-mode)) ;; save minibuffer history -(use-feature savehist - :config (savehist-mode)) +(use-package savehist + :config + (savehist-mode) + :custom + (savehist-file (b/var "savehist.el"))) ;; automatically save place in files -(use-feature saveplace +(use-package saveplace :when (version< "25" emacs-version) - :config (save-place-mode)) + :config (save-place-mode) + :custom + (save-place-file (b/var "save-place.el"))) -(use-feature prog-mode +(use-package prog-mode :config (global-prettify-symbols-mode) (defun indicate-buffer-boundaries-left () (setq indicate-buffer-boundaries 'left)) (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left)) -(use-feature text-mode +(use-package text-mode :hook (text-mode . indicate-buffer-boundaries-left)) -(use-feature conf-mode +(use-package conf-mode :mode "\\.*rc$") -(use-feature sh-mode +(use-package sh-mode :mode "\\.bashrc$") (use-package company @@ -1022,7 +934,7 @@ For disabling the behaviour for certain buffers and/or modes." (setq flycheck-check-syntax-automatically '(mode-enabled save)) :custom (flycheck-mode-line-prefix "flyc")) -(use-feature flyspell +(use-package flyspell :delight " flysp") ;; http://endlessparentheses.com/ispell-and-apostrophes.html @@ -1052,70 +964,75 @@ For disabling the behaviour for certain buffers and/or modes." (advice-add #'ispell-parse-output :filter-args #'endless/replace-quote)) -(use-feature abbrev +(use-package abbrev :delight " abbr" - :hook (text-mode . abbrev-mode)) + :hook (text-mode . abbrev-mode) + :custom + (abbrev-file-name (b/var "abbrev.el"))) ;;; Programming modes -(use-feature lisp-mode +(use-package lisp-mode :config (defun indent-spaces-mode () (setq indent-tabs-mode nil)) (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) -(use-feature reveal +(use-package reveal :delight (reveal-mode " reveal") :hook (emacs-lisp-mode . reveal-mode)) -(use-feature elisp-mode +(use-package elisp-mode :delight (emacs-lisp-mode "Elisp" :major)) -(use-package alloy-mode - :straight (:host github :repo "dwwmmn/alloy-mode") - :mode "\\.als\\'" - :config (setq alloy-basic-offset 2)) - -(use-package proof-site ; for Coq - :straight proof-general) - -(eval-when-compile (defvar lean-mode-map)) -(use-package lean-mode - :defer 0.4 - :bind (:map lean-mode-map - ("S-SPC" . company-complete)) - :config - (require 'lean-input) - (setq default-input-method "Lean" - lean-input-tweak-all '(lean-input-compose - (lean-input-prepend "/") - (lean-input-nonempty)) - lean-input-user-translations '(("/" "/"))) - (lean-input-setup)) - -(use-package haskell-mode - :config - (setq haskell-indentation-layout-offset 4 - haskell-indentation-left-offset 4 - flycheck-checker 'haskell-hlint - flycheck-disabled-checkers '(haskell-stack-ghc haskell-ghc))) - -(use-package dante - :after haskell-mode - :commands dante-mode - :hook (haskell-mode . dante-mode)) - -(use-package hlint-refactor - :after haskell-mode - :bind (:map hlint-refactor-mode-map - ("C-c l b" . hlint-refactor-refactor-buffer) - ("C-c l r" . hlint-refactor-refactor-at-point)) - :hook (haskell-mode . hlint-refactor-mode)) - -(use-package flycheck-haskell - :after haskell-mode) -;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el +(comment + ;; TODO + (use-package alloy-mode + :straight (:host github :repo "dwwmmn/alloy-mode") + :mode "\\.als\\'" + :config (setq alloy-basic-offset 2)) + + (use-package proof-site ; for Coq + :straight proof-general) + + (eval-when-compile (defvar lean-mode-map)) + (use-package lean-mode + :defer 0.4 + :bind (:map lean-mode-map + ("S-SPC" . company-complete)) + :config + (require 'lean-input) + (setq default-input-method "Lean" + lean-input-tweak-all '(lean-input-compose + (lean-input-prepend "/") + (lean-input-nonempty)) + lean-input-user-translations '(("/" "/"))) + (lean-input-setup)) + + (use-package haskell-mode + :config + (setq haskell-indentation-layout-offset 4 + haskell-indentation-left-offset 4 + flycheck-checker 'haskell-hlint + flycheck-disabled-checkers '(haskell-stack-ghc haskell-ghc))) + + (use-package dante + :after haskell-mode + :commands dante-mode + :hook (haskell-mode . dante-mode)) + + (use-package hlint-refactor + :after haskell-mode + :bind (:map hlint-refactor-mode-map + ("C-c l b" . hlint-refactor-refactor-buffer) + ("C-c l r" . hlint-refactor-refactor-at-point)) + :hook (haskell-mode . hlint-refactor-mode)) + + (use-package flycheck-haskell + :after haskell-mode) + ;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el + ) (use-package sgml-mode :config @@ -1128,7 +1045,7 @@ For disabling the behaviour for certain buffers and/or modes." (use-package web-mode :mode "\\.html\\'" :config - (mab/setq-every 2 + (b/setq-every 2 web-mode-code-indent-offset web-mode-css-indent-offset web-mode-markup-indent-offset)) @@ -1214,9 +1131,12 @@ For disabling the behaviour for certain buffers and/or modes." (eclim-executable "~/.p2/pool/plugins/org.eclim_2.8.0/bin/eclim") (eclim-eclipse-dirs '("~/usr/eclipse/dsl-2018-09/eclipse")))) -(use-package geiser) +(use-package geiser + :config + (make-directory (b/var "geiser/") t) + (setq geiser-repl-history-filename (b/var "geiser/repl-history"))) -(use-feature geiser-guile +(use-package geiser-guile :config (setq geiser-guile-load-path "~/src/git/guix")) @@ -1236,7 +1156,9 @@ For disabling the behaviour for certain buffers and/or modes." ;;; Theme -(add-to-list 'custom-theme-load-path "~/.emacs.d/lisp") +(add-to-list 'custom-theme-load-path + (expand-file-name + (convert-standard-filename "lisp") user-emacs-directory)) (load-theme 'tangomod t) (use-package smart-mode-line @@ -1246,40 +1168,42 @@ For disabling the behaviour for certain buffers and/or modes." (sml/setup) (smart-mode-line-enable)) -(use-package doom-themes) +(comment + ;; TODO + (use-package doom-themes)) -(defvar mab/org-mode-font-lock-keywords +(defvar b/org-mode-font-lock-keywords '(("[ \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 -(defun mab/lights-on () +(defun b/lights-on () "Enable my favourite light theme." (interactive) (mapc #'disable-theme custom-enabled-themes) (load-theme 'tangomod t) (sml/apply-theme 'automatic) (font-lock-remove-keywords - 'org-mode mab/org-mode-font-lock-keywords)) + 'org-mode b/org-mode-font-lock-keywords)) -(defun mab/lights-off () +(defun b/lights-off () "Go dark." (interactive) (mapc #'disable-theme custom-enabled-themes) - (load-theme 'doom-tomorrow-night t) + ;; (load-theme 'doom-tomorrow-night t) (sml/apply-theme 'automatic) (font-lock-add-keywords - 'org-mode mab/org-mode-font-lock-keywords t)) + 'org-mode b/org-mode-font-lock-keywords t)) (bind-keys - ("s-t d" . mab/lights-off) - ("s-t l" . mab/lights-on)) + ("s-t d" . b/lights-off) + ("s-t l" . b/lights-on)) ;;; Emacs enhancements & auxiliary packages -(use-feature man +(use-package man :config (setq Man-width 80)) (use-package which-key @@ -1361,9 +1285,10 @@ For disabling the behaviour for certain buffers and/or modes." :defer 0.5 :bind-keymap ("C-c P" . projectile-command-map) :config + (make-directory (b/var "projectile/") t) (projectile-mode) - (defun mab/projectile-mode-line-fun () + (defun b/projectile-mode-line-fun () "Report project name and type in the modeline." (let ((project-name (projectile-project-name)) (project-type (projectile-project-type))) @@ -1372,7 +1297,7 @@ For disabling the behaviour for certain buffers and/or modes." (if project-type (format ":%s" project-type) "")))) - (setq projectile-mode-line-function 'mab/projectile-mode-line-fun) + (setq projectile-mode-line-function 'b/projectile-mode-line-fun) (defun my-projectile-invalidate-cache (&rest _args) ;; ignore the args to `magit-checkout' @@ -1385,7 +1310,9 @@ For disabling the behaviour for certain buffers and/or modes." (advice-add 'magit-branch-and-checkout :after #'my-projectile-invalidate-cache))) :custom + (projectile-cache-file (b/var "projectile/cache.el")) (projectile-completion-system 'ivy) + (projectile-known-projects-file (b/var "projectile/known-projects.el")) (projectile-mode-line-prefix " proj")) (use-package helpful @@ -1410,28 +1337,28 @@ For disabling the behaviour for certain buffers and/or modes." (use-package boxquote :defer 0.6 :bind - (:prefix-map mab/boxquote-prefix-map - :prefix "C-c q" - ("b" . boxquote-buffer) - ("B" . boxquote-insert-buffer) - ("d" . boxquote-defun) - ("F" . boxquote-insert-file) - ("hf" . boxquote-describe-function) - ("hk" . boxquote-describe-key) - ("hv" . boxquote-describe-variable) - ("hw" . boxquote-where-is) - ("k" . boxquote-kill) - ("p" . boxquote-paragraph) - ("q" . boxquote-boxquote) - ("r" . boxquote-region) - ("s" . boxquote-shell-command) - ("t" . boxquote-text) - ("T" . boxquote-title) - ("u" . boxquote-unbox) - ("U" . boxquote-unbox-region) - ("y" . boxquote-yank) - ("M-q" . boxquote-fill-paragraph) - ("M-w" . boxquote-kill-ring-save))) + (:prefix-map b/boxquote-prefix-map + :prefix "C-c q" + ("b" . boxquote-buffer) + ("B" . boxquote-insert-buffer) + ("d" . boxquote-defun) + ("F" . boxquote-insert-file) + ("hf" . boxquote-describe-function) + ("hk" . boxquote-describe-key) + ("hv" . boxquote-describe-variable) + ("hw" . boxquote-where-is) + ("k" . boxquote-kill) + ("p" . boxquote-paragraph) + ("q" . boxquote-boxquote) + ("r" . boxquote-region) + ("s" . boxquote-shell-command) + ("t" . boxquote-text) + ("T" . boxquote-title) + ("u" . boxquote-unbox) + ("U" . boxquote-unbox-region) + ("y" . boxquote-yank) + ("M-q" . boxquote-fill-paragraph) + ("M-w" . boxquote-kill-ring-save))) (use-package orgalist ;; http://lists.gnu.org/archive/html/emacs-orgmode/2019-04/msg00007.html @@ -1539,88 +1466,43 @@ For disabling the behaviour for certain buffers and/or modes." (use-package multiple-cursors :bind (("C-S-" . mc/add-cursor-on-click) - (:prefix-map mab/mc-prefix-map + (:prefix-map b/mc-prefix-map :prefix "C-c m" ("c" . mc/edit-lines) ("n" . mc/mark-next-like-this) ("p" . mc/mark-previous-like-this) - ("a" . mc/mark-all-like-this)))) + ("a" . mc/mark-all-like-this))) + :config + (setq mc/list-file (b/var "mc-list.el"))) -(use-package forge - :after magit - :demand) +(comment + ;; TODO + (use-package forge + :after magit + :demand)) (use-package yasnippet :defer 0.6 :config (defconst yas-verbosity-cur yas-verbosity) (setq yas-verbosity 2) + (setq yas-snippet-dirs (list (b/etc "yasnippet/snippets/"))) (add-to-list 'yas-snippet-dirs "~/src/git/guix/etc/snippets" t) (yas-reload-all) (setq yas-verbosity yas-verbosity-cur) (yas-global-mode)) -(use-package debbugs - :straight (debbugs - :host github - :repo "emacs-straight/debbugs" - :files (:defaults "Debbugs.wsdl"))) +(use-package debbugs) (use-package org-ref :init - (mab/setq-every '("~/usr/org/references.bib") + (b/setq-every '("~/usr/org/references.bib") reftex-default-bibliography org-ref-default-bibliography) (setq org-ref-bibliography-notes "~/usr/org/notes.org" org-ref-pdf-directory "~/usr/org/bibtex-pdfs/")) -;; ugh, temporary (still better than using the proprietary web app) -(use-package slack - :commands (slack-start) - :init - (eval-when-compile ; silence the byte-compiler - (defvar url-http-data nil) - (defvar url-http-extra-headers nil) - (defvar url-http-method nil) - (defvar url-callback-function nil) - (defvar url-callback-arguments nil) - (defvar oauth--token-data nil)) - (setq slack-buffer-emojify t - slack-prefer-current-team t) - :config - (slack-register-team - :name "nday-students" - :default t - :token nday-students-token - :subscribed-channels '(general) - :full-and-display-names t) - (with-eval-after-load 'swiper - (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t)) - (setq lui-time-stamp-format "[%Y-%m-%d %H:%M:%S]" - lui-time-stamp-only-when-changed-p t - lui-time-stamp-position 'right) - :bind - (("C-c s s" . slack-start) - ("C-c s u" . slack-select-unread-rooms) - ("C-c s b" . slack-select-rooms) - ("C-c s t" . slack-change-current-team) - ("C-c s c" . slack-ws-close) - :map slack-mode-map - ("M-p" . slack-buffer-goto-prev-message) - ("M-n" . slack-buffer-goto-next-message) - ("C-c e" . slack-message-edit) - ("C-c k" . slack-message-delete) - ("C-c C-k" . slack-channel-leave) - ("C-c r a" . slack-message-add-reaction) - ("C-c r r" . slack-message-remove-reaction) - ("C-c r s" . slack-message-show-reaction-users) - ("C-c p l" . slack-room-pins-list) - ("C-c p a" . slack-message-pins-add) - ("C-c p r" . slack-message-pins-remove) - ("@" . slack-message-embed-mention) - ("#" . slack-message-embed-channel))) - (use-package alert :commands (alert) :init (setq alert-default-style 'notifications)) @@ -1628,18 +1510,22 @@ For disabling the behaviour for certain buffers and/or modes." ;; (use-package fill-column-indicator) (use-package emojify + :config + (make-directory (b/var "emojify/") t) + (setq emojify-emojis-dir (b/var "emojify/")) :hook (erc-mode . emojify-mode)) -(use-feature window +(use-package window :bind (("s-o" . other-window) - ("M-o" . other-window) ("s-/ ." . split-window-right) ("s-/ ," . split-window-below) ("s-/ 0" . delete-window) - ("s-q" . delete-window))) + ("s-q" . delete-window)) + :custom + (split-width-threshold 150)) -(use-feature windmove +(use-package windmove :defer 0.6 :bind (("s-h" . windmove-left) @@ -1659,16 +1545,16 @@ For disabling the behaviour for certain buffers and/or modes." ;;; Email (with Gnus) -(defvar mab/maildir (expand-file-name "~/mail/")) +(defvar b/maildir (expand-file-name "~/mail/")) (with-eval-after-load 'recentf - (add-to-list 'recentf-exclude mab/maildir)) + (add-to-list 'recentf-exclude b/maildir)) (setq - mab/gnus-init-file (no-littering-expand-etc-file-name "gnus") + b/gnus-init-file (b/etc "gnus") mail-user-agent 'gnus-user-agent read-mail-command 'gnus) -(use-feature gnus +(use-package gnus :bind (("s-m" . gnus) ("s-M" . gnus-unplugged)) :init @@ -1878,7 +1764,7 @@ For disabling the behaviour for certain buffers and/or modes." ("nnimap\\+uw:.*" (gcc-self . t))) gnus-large-newsgroup 50 - gnus-home-directory (no-littering-expand-var-file-name "gnus/") + gnus-home-directory (b/var "gnus/") gnus-directory (concat gnus-home-directory "news/") message-directory (concat gnus-home-directory "mail/") nndraft-directory (concat gnus-home-directory "drafts/") @@ -1896,7 +1782,7 @@ For disabling the behaviour for certain buffers and/or modes." (with-eval-after-load 'recentf (add-to-list 'recentf-exclude gnus-home-directory))) -(use-feature gnus-art +(use-package gnus-art :config (setq gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)") @@ -1924,9 +1810,9 @@ For disabling the behaviour for certain buffers and/or modes." :map gnus-article-mode-map ("M-L" . org-store-link))) -(use-feature gnus-sum +(use-package gnus-sum :bind (:map gnus-summary-mode-map - :prefix-map mab/gnus-summary-prefix-map + :prefix-map b/gnus-summary-prefix-map :prefix "v" ("r" . gnus-summary-reply) ("w" . gnus-summary-wide-reply) @@ -1935,23 +1821,23 @@ For disabling the behaviour for certain buffers and/or modes." (bind-keys :map gnus-summary-mode-map ("M-L" . org-store-link)) - :hook (gnus-summary-mode . mab/no-mouse-autoselect-window)) + :hook (gnus-summary-mode . b/no-mouse-autoselect-window)) -(use-feature gnus-msg +(use-package gnus-msg :config - (defvar mab/signature "Amin Bandali + (defvar b/signature "Amin Bandali Free Software Activist | GNU Webmaster & Volunteer GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103 https://shemshak.org/~amin") - (defvar mab/gnu-signature "Amin Bandali + (defvar b/gnu-signature "Amin Bandali Free Software Activist | GNU Webmaster & Volunteer GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103 https://bandalis.org") - (defvar mab/uw-signature "Amin Bandali, MMath Student + (defvar b/uw-signature "Amin Bandali, MMath Student Cheriton School of Computer Science University of Waterloo https://bandalis.org") - (defvar mab/csc-signature "Amin Bandali + (defvar b/csc-signature "Amin Bandali Termcom, Computer Science Club University of Waterloo https://bandalis.org") @@ -1959,64 +1845,64 @@ https://bandalis.org") '((".*" (address "amin@shemshak.org") (body "\nBest,\n") - (signature mab/signature) - (eval (setq mab/message-cite-say-hi t))) + (signature b/signature) + (eval (setq b/message-cite-say-hi t))) ("nnimap\\+gnu:.*" (address "bandali@gnu.org") - (signature mab/gnu-signature) + (signature b/gnu-signature) (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org"))) ((header "subject" "ThankCRM") (to "webmasters-comment@gnu.org") (body "") - (eval (setq mab/message-cite-say-hi nil))) + (eval (setq b/message-cite-say-hi nil))) ("nnimap\\+uw:.*" (address "abandali@uwaterloo.ca") - (signature mab/uw-signature)) + (signature b/uw-signature)) ("nnimap\\+uw:INBOX" (gcc "\"nnimap+uw:Sent Items\"")) ("nnimap\\+csc:.*" (address "abandali@csclub.uwaterloo.ca") - (signature mab/csc-signature) + (signature b/csc-signature) (gcc "nnimap+csc:Sent"))))) -(use-feature gnus-topic +(use-package gnus-topic :hook (gnus-group-mode . gnus-topic-mode) :config (setq gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n")) -(use-feature gnus-agent +(use-package gnus-agent :config (setq gnus-agent-synchronize-flags 'ask) :hook (gnus-group-mode . gnus-agent-mode)) -(use-feature gnus-group +(use-package gnus-group :config (setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)")) (comment ;; problematic with ebdb's popup, *EBDB-Gnus* - (use-feature gnus-win + (use-package gnus-win :config (setq gnus-use-full-window nil))) -(use-feature gnus-dired +(use-package gnus-dired :commands gnus-dired-mode :init (add-hook 'dired-mode-hook 'gnus-dired-mode)) -(use-feature mm-decode +(use-package mm-decode :config (setq mm-discouraged-alternatives '("text/html" "text/richtext") mm-decrypt-option 'known mm-verify-option 'known)) -(use-feature sendmail +(use-package sendmail :config (setq sendmail-program (executable-find "msmtp") ;; message-sendmail-extra-arguments '("-v" "-d") mail-specify-envelope-from t mail-envelope-from 'header)) -(use-feature message +(use-package message :config ;; redefine for a simplified In-Reply-To header ;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67) @@ -2028,7 +1914,7 @@ https://bandalis.org") (when from msg-id)))) - (defconst mab/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:") + (defconst b/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) @@ -2037,9 +1923,9 @@ https://bandalis.org") (message-yank-cited-prefix ">") (message-yank-empty-prefix ">") (message-citation-line-format - (if mab/message-cite-say-hi - (concat "Hi %F,\n\n" mab/message-cite-style-format) - mab/message-cite-style-format))) + (if b/message-cite-say-hi + (concat "Hi %F,\n\n" b/message-cite-style-format) + b/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 @@ -2063,15 +1949,15 @@ https://bandalis.org") ;; (message-header-cc ((t (:foreground "#333" :weight normal)))) ) -(use-feature mml +(use-package mml :delight " mml") -(use-feature mml-sec +(use-package mml-sec :custom (mml-secure-openpgp-encrypt-to-self t) (mml-secure-openpgp-sign-with-sender t)) -(use-feature footnote +(use-package footnote :after message ;; :config ;; (setq footnote-start-tag "" @@ -2079,7 +1965,7 @@ https://bandalis.org") ;; footnote-style 'unicode) :bind (:map message-mode-map - :prefix-map mab/footnote-prefix-map + :prefix-map b/footnote-prefix-map :prefix "C-c f" ("a" . footnote-add-footnote) ("b" . footnote-back-to-message) @@ -2090,15 +1976,14 @@ https://bandalis.org") ("s" . footnote-set-style))) (use-package ebdb - :straight (:host github :repo "girzel/ebdb") :after gnus :bind (:map gnus-group-mode-map ("e" . ebdb)) :config - (setq ebdb-sources (no-littering-expand-var-file-name "ebdb")) + (setq ebdb-sources (b/var "ebdb")) (with-eval-after-load 'swiper (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t))) -(use-feature ebdb-com +(use-package ebdb-com :after ebdb) ;; (use-package ebdb-complete @@ -2110,7 +1995,7 @@ https://bandalis.org") :config (defun company-ebdb--post-complete (_) nil)) -(use-feature ebdb-gnus +(use-package ebdb-gnus :after ebdb :custom (ebdb-gnus-window-configuration @@ -2121,7 +2006,7 @@ https://bandalis.org") (article 1.0) (ebdb-gnus 0.3)))))) -(use-feature ebdb-mua +(use-package ebdb-mua :after ebdb ;; :custom (ebdb-mua-pop-up nil) ) @@ -2129,7 +2014,6 @@ https://bandalis.org") ;; (use-package ebdb-message ;; :after ebdb) - ;; (use-package ebdb-vcard ;; :after ebdb) @@ -2159,7 +2043,7 @@ https://bandalis.org") ;;; IRC (with ERC and ZNC) -(use-feature erc +(use-package erc :bind (("C-c a e b" . erc-switch-to-buffer) :map erc-mode-map ("M-a" . erc-track-switch-buffer)) @@ -2190,18 +2074,19 @@ https://bandalis.org") (add-to-list 'erc-modules 'scrolltoplace) (erc-update-modules)) -(use-feature erc-fill +(use-package erc-fill :after erc :custom + (erc-fill-column 77) (erc-fill-function 'erc-fill-static) (erc-fill-static-center 18)) -(use-feature erc-pcomplete +(use-package erc-pcomplete :after erc :custom (erc-pcomplete-nick-postfix ",")) -(use-feature erc-track +(use-package erc-track :after erc :custom (erc-track-enable-keybindings nil) @@ -2217,7 +2102,7 @@ https://bandalis.org") :after erc) (use-package znc - :straight (:host nil :repo "https://git.shemshak.org/amin/znc.el") + :load-path "lisp/znc.el/" :bind (("C-c a e e" . znc-erc) ("C-c a e a" . znc-all)) :config @@ -2238,6 +2123,6 @@ https://bandalis.org") (message "Loading %s...done (%.3fs)" user-init-file (float-time (time-subtract (current-time) - mab/before-user-init-time))) + b/before-user-init-time))) ;;; init.el ends here