;;; Commentary:
;; Emacs configuration of Amin Bandali, computer scientist, functional
-;; programmer, and free software activist. Used to use straight.el
-;; for purely functional and fully reproducible package management.
-;; Now I just use Guix.
+;; programmer, and free software activist. Uses straight.el for
+;; purely functional and fully reproducible package management.
;; 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:
nil)
\f
-;;; use-package
+;;; 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 b/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...
+
+(b/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 1))
+ `(use-package ,name
+ :straight nil
+ ,@args))
+
+(with-eval-after-load 'use-package-core
+ (let ((upflk (car use-package-font-lock-keywords)))
+ (font-lock-add-keywords
+ 'emacs-lisp-mode
+ `((,(replace-regexp-in-string
+ "use-package" "use-feature"
+ (car upflk))
+ ,@(cdr upflk))))))
+
+(with-eval-after-load 'recentf
+ (add-to-list 'recentf-exclude
+ (expand-file-name "~/.emacs.d/straight/build/")))
+
+(defun b/reload-init ()
+ "Reload init.el."
+ (interactive)
+ (setq b/file-name-handler-alist file-name-handler-alist)
+ (load user-init-file nil 'nomessage)
+ (b/post-init))
+
+;; use-package
+(straight-use-package 'use-package)
+
(if nil ; set to t when need to debug init
(progn
(setq use-package-verbose t
;;; Initial setup
;; keep ~/.emacs.d clean
-(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"))
+(use-package no-littering
+ :demand
+ :config
+ (defalias 'b/etc 'no-littering-expand-etc-file-name)
+ (defalias 'b/var 'no-littering-expand-var-file-name))
;; separate custom file (don't want it mixing with init.el)
-(use-package custom
- :no-require t
+(use-feature custom
+ :no-require
:config
(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))
+ (setf custom-safe-themes t)
+ ;; only one custom theme at a time
+ (comment
+ (defadvice load-theme (before clear-previous-themes activate)
+ "Clear existing theme settings instead of layering them"
+ (mapc #'disable-theme custom-enabled-themes))))
;; load the secrets file if it exists, otherwise show a warning
(comment
(exec-path-from-shell-copy-env "SSH_AGENT_PID")
(exec-path-from-shell-copy-env "SSH_AUTH_SOCK"))
-;; only one custom theme at a time
-(comment
- (defadvice load-theme (before clear-previous-themes activate)
- "Clear existing theme settings instead of layering them"
- (mapc #'disable-theme custom-enabled-themes)))
-
;; start up emacs server. see
;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server
-(use-package server
+(use-feature server
:defer 0.4
:config (or (server-running-p) (server-mode)))
+\f
+;;; Useful utilities
+
+;; useful libraries
+(require 'cl-lib)
+(require 'subr-x)
+
+(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 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
+ (concat program "_output"))))
+ (apply #'start-process
+ process-name buffer-name program 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 #'b/start-process
+ program
+ (remove nil (list args (dired-get-file-for-visit)))))
+
+(defun b/add-elisp-section ()
+ (interactive)
+ (insert "\n")
+ (previous-line)
+ (insert "\n\f\n;;; "))
+
+(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)
+ (setq mouse-autoselect-window nil))
+
+\f
+;;; Defaults
+
+;;;; C-level customizations
+
+(setq
+ ;; minibuffer
+ enable-recursive-minibuffers t
+ resize-mini-windows t
+ ;; more useful frame titles
+ frame-title-format '("" invocation-name " - "
+ (:eval
+ (if (buffer-file-name)
+ (abbreviate-file-name (buffer-file-name))
+ "%b")))
+ ;; i don't feel like jumping out of my chair every now and again; so
+ ;; don't BEEP! at me, emacs
+ ring-bell-function 'ignore
+ ;; better scrolling
+ ;; scroll-margin 1
+ ;; scroll-conservatively 10000
+ scroll-step 1
+ scroll-conservatively 10
+ scroll-preserve-screen-position 1
+ ;; focus follows mouse
+ mouse-autoselect-window t)
+
+(setq-default
+ ;; always use space for indentation
+ indent-tabs-mode nil
+ tab-width 4
+ ;; cursor shape
+ cursor-type 'bar)
+
;; unicode support
(comment
(dolist (ft (fontset-list))
nil
'prepend)))
-;; gentler font resizing
-(setq text-scale-mode-step 1.05)
-
-;; focus follows mouse
-(setq mouse-autoselect-window t)
-
-(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)
- (setq mouse-autoselect-window nil))
-
-;; better scrolling
-(setq ;; scroll-margin 1
- ;; scroll-conservatively 10000
- scroll-step 1
- scroll-conservatively 10
- scroll-preserve-screen-position 1)
+;;;; Elisp-level customizations
-(use-package mwheel
- :defer 0.4
+(use-feature startup
+ :no-require
+ :demand
: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-package pixel-scroll
- :defer 0.4
- :config (pixel-scroll-mode 1))
-
-;; ask for GPG passphrase in minibuffer
-(use-package epa
+ ;; don't need to see the startup echo area message
+ (advice-add #'display-startup-echo-area-message :override #'ignore)
:custom
- ; this will fail if gpg>=2.1 is not available
- (epa-pinentry-mode 'loopback))
-
-(use-package epg-config
- :defer 0.4
+ ;; i want *scratch* as my startup buffer
+ (initial-buffer-choice t)
+ ;; i don't need the default hint
+ (initial-scratch-message nil)
+ ;; use customizable text-mode as major mode for *scratch*
+ (initial-major-mode 'text-mode)
+ ;; inhibit buffer list when more than 2 files are loaded
+ (inhibit-startup-buffer-menu t)
+ ;; don't need to see the startup screen or echo area message
+ (inhibit-startup-screen t)
+ (inhibit-startup-echo-area-message user-login-name))
+
+(use-feature files
+ :no-require
+ :demand
:custom
- ((epg-gpg-program (executable-find "gpg"))
- (epg-pinentry-mode 'loopback)))
+ ;; backups (C-h v make-backup-files RET)
+ (backup-by-copying t)
+ (version-control t)
+ (delete-old-versions t)
-(use-package epg
- :after epg-config)
+ ;; auto-save
+ (auto-save-file-name-transforms
+ `((".*" ,(b/var "auto-save/") t)))
-(use-package pinentry
- :demand
- :after (epa epg server)
- :config
- (setq pinentry--socket-dir server-socket-dir)
- (pinentry-start))
+ ;; insert newline at the end of files
+ (require-final-newline t)
-;; useful libraries
-(require 'cl-lib)
-(require 'subr-x)
+ ;; open read-only file buffers in view-mode
+ ;; (enables niceties like `q' for quit)
+ (view-read-only t))
-\f
-;;; Useful utilities
-
-(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 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
- (concat program "_output"))))
- (apply #'start-process
- process-name buffer-name program 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 #'b/start-process
- program
- (remove nil (list args (dired-get-file-for-visit)))))
+;; disable disabled commands
+(setq disabled-command-function nil)
-(defun b/add-elisp-section ()
- (interactive)
- (insert "\n")
- (previous-line)
- (insert "\n\f\n;;; "))
+;; lazy-person-friendly yes/no prompts
+(defalias 'yes-or-no-p #'y-or-n-p)
-\f
-;;; Defaults
+;; enable automatic reloading of changed buffers and files
+(use-feature autorevert
+ :demand
+ :config
+ (global-auto-revert-mode 1)
+ :custom
+ (auto-revert-verbose nil)
+ (global-auto-revert-non-file-buffers nil))
;; time and battery in mode-line
(comment
- (use-package time
+ (use-feature time
:init
(setq display-time-default-load-average nil)
:config
(display-time-mode))
- (use-package battery
+ (use-feature battery
:config
(display-battery-mode)))
-;; smaller fringe
-;; (fringe-mode '(3 . 1))
-(fringe-mode nil)
-
-;; disable disabled commands
-(setq disabled-command-function nil)
-
-;; Save what I copy into clipboard from other applications into Emacs'
-;; kill-ring, which would allow me to still be able to easily access
-;; it in case I kill (cut or copy) something else inside Emacs before
-;; yanking (pasting) what I'd originally intended to.
-(setq save-interprogram-paste-before-kill t)
-
-;; minibuffer
-(setq enable-recursive-minibuffers t
- resize-mini-windows t)
-
-;; lazy-person-friendly yes/no prompts
-(defalias 'yes-or-no-p #'y-or-n-p)
-
-;; i want *scratch* as my startup buffer
-(setq initial-buffer-choice t)
-
-;; i don't need the default hint
-(setq initial-scratch-message nil)
-
-;; use customizable text-mode as major mode for *scratch*
-(setq initial-major-mode 'text-mode)
-
-;; inhibit buffer list when more than 2 files are loaded
-(setq inhibit-startup-buffer-menu t)
-
-;; don't need to see the startup screen or the echo area message
-(advice-add #'display-startup-echo-area-message :override #'ignore)
-(setq inhibit-startup-screen t
- inhibit-startup-echo-area-message user-login-name)
-
-;; more useful frame titles
-(setq frame-title-format
- '("" invocation-name " - "
- (:eval (if (buffer-file-name)
- (abbreviate-file-name (buffer-file-name))
- "%b"))))
-
-;; 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)
-
-;; enable automatic reloading of changed buffers and files
-(global-auto-revert-mode 1)
-(setq auto-revert-verbose nil
- global-auto-revert-non-file-buffers nil)
-
-;; always use space for indentation
-(setq-default
- indent-tabs-mode nil
- require-final-newline t
- tab-width 4)
+(use-feature fringe
+ :demand
+ :config
+ ;; smaller fringe
+ ;; (fringe-mode '(3 . 1))
+ (fringe-mode nil))
-;; enable winner-mode (C-h f winner-mode RET)
-(winner-mode 1)
+(use-feature winner
+ :demand
+ :config
+ ;; enable winner-mode (C-h f winner-mode RET)
+ (winner-mode 1))
-;; don't display *compilation* buffer on success. based on
-;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf'
-;; instead of the now obsolete `flet'.
-(with-eval-after-load 'compile
+(use-feature compile
+ :config
+ ;; don't display *compilation* buffer on success. based on
+ ;; https://stackoverflow.com/a/17788551, with changes to use `cl-letf'
+ ;; instead of the now obsolete `flet'.
(defun b/compilation-finish-function (buffer outstr)
(unless (string-match "finished" outstr)
(switch-to-buffer-other-window buffer))
ad-do-it))
(ad-activate 'compilation-start))
-;; search for non-ASCII characters: i’d like non-ASCII characters such
-;; as ‘’“”«»‹›áⓐ𝒶 to be selected when i search for their ASCII
-;; counterpart. shoutout to
-;; http://endlessparentheses.com/new-in-emacs-25-1-easily-search-non-ascii-characters.html
-(setq search-default-mode #'char-fold-to-regexp)
-;; uncomment to extend this behaviour to query-replace
-;; (setq replace-char-fold t)
-
-;; cursor shape
-(setq-default cursor-type 'bar)
-
-;; allow scrolling in Isearch
-(setq isearch-allow-scroll t)
-
-;; open read-only file buffers in view-mode
-;; (enables niceties like `q' for quit)
-(setq view-read-only t)
+(use-feature isearch
+ :custom
+ ;; allow scrolling in Isearch
+ (isearch-allow-scroll t)
+ ;; search for non-ASCII characters: i’d like non-ASCII characters such
+ ;; as ‘’“”«»‹›áⓐ𝒶 to be selected when i search for their ASCII
+ ;; counterpart. shoutout to
+ ;; http://endlessparentheses.com/new-in-emacs-25-1-easily-search-non-ascii-characters.html
+ (search-default-mode #'char-fold-to-regexp))
+
+;; uncomment to extend the above behaviour to query-replace
+(comment
+ (use-feature replace
+ :custom
+ (replace-char-fold t)))
-(use-package vc
+(use-feature vc
:bind ("C-x v C-=" . vc-ediff))
-(use-package ediff
+(use-feature 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)))
-;; i don't feel like jumping out of my chair every now and again; so
-;; don't BEEP! at me, emacs
-(setq ring-bell-function 'ignore)
+(use-feature face-remap
+ :custom
+ ;; gentler font resizing
+ (text-scale-mode-step 1.05))
+
+(use-feature 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
+ :defer 0.4
+ :config (pixel-scroll-mode 1))
+
+(use-feature epg-config
+ :custom
+ ((epg-gpg-program (executable-find "gpg"))))
\f
;;; General bindings
("C-c a i" . ielm)
("C-c e b" . eval-buffer)
+ ("C-c e e" . eval-last-sexp)
("C-c e r" . eval-region)
("C-c e i" . emacs-init-time)
("C-x k" . kill-this-buffer)
("C-x K" . kill-buffer)
+ ("C-x s" . save-buffer)
+ ("C-x S" . save-some-buffers)
:map emacs-lisp-mode-map
("<C-return>" . b/add-elisp-section))
(bind-keys
;; for back and forward mouse keys
+ ("<XF86Back>" . previous-buffer)
("<mouse-8>" . previous-buffer)
("<drag-mouse-8>" . previous-buffer)
+ ("<XF86Forward>" . next-buffer)
("<mouse-9>" . next-buffer)
("<drag-mouse-9>" . next-buffer)
("<drag-mouse-2>" . kill-this-buffer)
("<drag-mouse-3>" . ivy-switch-buffer))
+(bind-keys
+ :prefix-map b/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" . b/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))
+
\f
;;; Essential packages
-(use-package org
+;; use the org-plus-contrib package to get the whole deal
+(use-package org-plus-contrib)
+
+(use-feature org
:defer 0.5
:config
(setq org-src-tab-acts-natively t
'(org-block ((t (:background "#1d1f21"))))
'(org-latex-and-related ((t (:foreground "#b294bb")))))
-(use-package ox-latex
+(use-feature ox-latex
:after ox
:config
(setq org-latex-listings 'listings
t)
(require 'ox-beamer))
-(use-package ox-extra
+(use-feature ox-extra
:config
(ox-extras-activate '(latex-header-blocks ignore-headlines)))
;; *the* right way to do git
(use-package magit
:defer 0.5
- :bind (("C-c g g" . magit-status)
- ("C-c g s" . magit-status)
+ :bind (("C-x g" . magit-status)
+ ("C-c g g" . magit-status)
("C-c g b" . magit-blame-addition)
("C-c g l" . magit-log-buffer-file))
:config
'magit-insert-modules
'magit-insert-stashes
'append)
- (magit-add-section-hook 'magit-status-sections-hook
- 'magit-insert-ignored-files
- 'magit-insert-untracked-files
- 'append)
+ ;; (magit-add-section-hook 'magit-status-sections-hook
+ ;; 'magit-insert-ignored-files
+ ;; 'magit-insert-untracked-files
+ ;; 'append)
(setq magit-repository-directories '(("~/" . 0)
("~/src/git/" . 1)))
(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-package recentf
+(use-feature recentf
:defer 0.2
;; :config
;; (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")
:custom
- (recentf-max-saved-items 2000)
- (recentf-save-file (b/var "recentf-save.el")))
+ (recentf-max-saved-items 2000))
;; smart M-x enhancement (needed by counsel for history)
-(use-package smex
- :config
- (setq smex-save-file (b/var "smex-save.el")))
+(use-package smex)
(use-package ivy
:defer 0.3
("C-z" . helm-select-action)) ; List actions
:config (helm-mode 1)))
-(use-package eshell
+(use-feature eshell
:defer 0.5
:commands eshell
:bind ("C-c a s e" . eshell)
: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-package ibuffer
+(use-feature ibuffer
:bind
(("C-x C-b" . ibuffer)
:map ibuffer-mode-map
" " filename)))
:hook (ibuffer . (lambda () (ibuffer-switch-to-saved-filter-groups "default"))))
-(use-package outline
+(use-feature outline
:disabled
:hook (prog-mode . outline-minor-mode)
:delight (outline-minor-mode " outl")
("h" . outline-hide-subtree)
("s" . outline-show-subtree)))
-(use-package ls-lisp
+(use-feature ls-lisp
:custom (ls-lisp-dirs-first t))
-(use-package dired
+(use-feature dired
:config
(setq dired-listing-switches "-alh"
ls-lisp-use-insert-directory-program nil)
(b/dired-start-process "zathura"))))
:hook (dired-mode . dired-hide-details-mode))
-(use-package help
+(use-feature help
:config
(temp-buffer-resize-mode)
(setq help-window-select t))
-(use-package tramp
+(use-feature tramp
:config
(add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:"))
(add-to-list 'tramp-default-proxies-alist '("localhost" nil nil))
(use-package dash
:config (dash-enable-font-lock))
-(use-package doc-view
+(use-feature doc-view
:bind (:map doc-view-mode-map
("M-RET" . image-previous-line)))
:hook (magit-post-refresh . diff-hl-magit-post-refresh))
;; display Lisp objects at point in the echo area
-(use-package eldoc
+(use-feature eldoc
:when (version< "25" emacs-version)
:delight " eldoc"
:config (global-eldoc-mode))
;; highlight matching parens
-(use-package paren
+(use-feature paren
:demand
:config (show-paren-mode))
-(use-package elec-pair
+(use-feature elec-pair
:demand
:config (electric-pair-mode))
-(use-package simple
+(use-feature simple
:delight (auto-fill-function " fill")
- :config (column-number-mode))
+ :config (column-number-mode)
+ :custom
+ ;; Save what I copy into clipboard from other applications into Emacs'
+ ;; kill-ring, which would allow me to still be able to easily access
+ ;; it in case I kill (cut or copy) something else inside Emacs before
+ ;; yanking (pasting) what I'd originally intended to.
+ (save-interprogram-paste-before-kill t))
;; save minibuffer history
-(use-package savehist
+(use-feature savehist
+ :demand
:config
(savehist-mode)
- :custom
- (savehist-file (b/var "savehist.el")))
+ (add-to-list 'savehist-additional-variables 'kill-ring))
;; automatically save place in files
-(use-package saveplace
+(use-feature saveplace
:when (version< "25" emacs-version)
- :config (save-place-mode)
- :custom
- (save-place-file (b/var "save-place.el")))
+ :config (save-place-mode))
-(use-package prog-mode
+(use-feature 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-package text-mode
+(use-feature text-mode
:hook (text-mode . indicate-buffer-boundaries-left))
-(use-package conf-mode
+(use-feature conf-mode
:mode "\\.*rc$")
-(use-package sh-mode
+(use-feature sh-mode
:mode "\\.bashrc$")
(use-package company
(setq flycheck-check-syntax-automatically '(mode-enabled save))
:custom (flycheck-mode-line-prefix "flyc"))
-(use-package flyspell
+(use-feature flyspell
:delight " flysp")
;; http://endlessparentheses.com/ispell-and-apostrophes.html
-(use-package ispell
+(use-feature ispell
:defer 0.6
:config
;; ’ can be part of a word
(advice-add #'ispell-parse-output :filter-args
#'endless/replace-quote))
-(use-package abbrev
+(use-feature abbrev
:delight " abbr"
- :hook (text-mode . abbrev-mode)
- :custom
- (abbrev-file-name (b/var "abbrev.el")))
+ :hook (text-mode . abbrev-mode))
\f
;;; Programming modes
-(use-package lisp-mode
+(use-feature lisp-mode
:config
(defun indent-spaces-mode ()
(setq indent-tabs-mode nil))
(add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode))
-(use-package reveal
+(use-feature reveal
:delight (reveal-mode " reveal")
:hook (emacs-lisp-mode . reveal-mode))
-(use-package elisp-mode
+(use-feature elisp-mode
:delight (emacs-lisp-mode "Elisp" :major))
-(comment
- ;; TODO
- (use-package alloy-mode
- :straight (:host github :repo "dwwmmn/alloy-mode")
- :mode "\\.als\\'"
- :config (setq alloy-basic-offset 2))
+(use-package alloy-mode
+ :straight (:host github :repo "dwwmmn/alloy-mode")
+ :mode "\\.als\\'"
+ :config (setq alloy-basic-offset 2))
+
+(eval-when-compile (defvar lean-mode-map))
+(use-package lean-mode
+ :straight (:host github :repo "leanprover/lean-mode"
+ :fork (:repo "notbandali/lean-mode" :branch "remove-cl"))
+ :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))
+
+(comment
(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
;; alternative: hs-lint https://github.com/ndmitchell/hlint/blob/20e116a043f2073c57b17b24ae6364b5e433ba7e/data/hs-lint.el
)
-(use-package sgml-mode
+(use-feature sgml-mode
:config
(setq sgml-basic-offset 2))
-(use-package css-mode
+(use-feature css-mode
:config
(setq css-indent-offset 2))
(eclim-executable "~/.p2/pool/plugins/org.eclim_2.8.0/bin/eclim")
(eclim-eclipse-dirs '("~/usr/eclipse/dsl-2018-09/eclipse"))))
-(use-package geiser
- :config
- (make-directory (b/var "geiser/") t)
- (setq geiser-repl-history-filename (b/var "geiser/repl-history")))
+(use-package geiser)
-(use-package geiser-guile
+(use-feature geiser-guile
:config
(setq geiser-guile-load-path "~/src/git/guix"))
:hook
(po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit))))
-(use-package tex-mode
+(use-feature tex-mode
:config
(cl-delete-if
(lambda (p) (string-match "^---?" (car p)))
- tex--prettify-symbols-alist))
+ tex--prettify-symbols-alist)
+ :hook ((tex-mode . auto-fill-mode)
+ (tex-mode . flyspell-mode)
+ (tex-mode . (lambda () (electric-indent-local-mode -1)))))
\f
;;; Theme
(sml/setup)
(smart-mode-line-enable))
-(comment
- ;; TODO
- (use-package doom-themes))
+(use-package doom-themes)
(defvar b/org-mode-font-lock-keywords
'(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
"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 b/org-mode-font-lock-keywords t))
;; prefixes for major modes
(which-key-add-major-mode-key-based-replacements 'message-mode
- "C-c f" "footnote")
+ "C-c f n" "footnote")
(which-key-add-major-mode-key-based-replacements 'org-mode
"C-c C-v" "org-babel")
(which-key-add-major-mode-key-based-replacements 'web-mode
(use-package crux ; results in Waiting for git... [2 times]
:defer 0.4
- :bind (("C-c b k" . crux-kill-other-buffers)
- ("C-c d" . crux-duplicate-current-line-or-region)
+ :bind (("C-c d" . crux-duplicate-current-line-or-region)
("C-c D" . crux-duplicate-and-comment-current-line-or-region)
("C-c f c" . crux-copy-file-preserve-attributes)
("C-c f d" . crux-delete-file-and-buffer)
:defer 0.5
:bind-keymap ("C-c P" . projectile-command-map)
:config
- (make-directory (b/var "projectile/") t)
(projectile-mode)
(defun b/projectile-mode-line-fun ()
(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
("c" . mc/edit-lines)
("n" . mc/mark-next-like-this)
("p" . mc/mark-previous-like-this)
- ("a" . mc/mark-all-like-this)))
- :config
- (setq mc/list-file (b/var "mc-list.el")))
+ ("a" . mc/mark-all-like-this))))
(comment
;; TODO
: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)
- (define-key yas-minor-mode-map (kbd "SPC") yas-maybe-expand)
+
+ (defun b/yas--maybe-expand-key-filter (cmd)
+ (when (and (yas--maybe-expand-key-filter cmd)
+ (not (bound-and-true-p git-commit-mode)))
+ cmd))
+ (defconst b/yas-maybe-expand
+ '(menu-item "" yas-expand :filter b/yas--maybe-expand-key-filter))
+ (define-key yas-minor-mode-map
+ (kbd "SPC") b/yas-maybe-expand)
+
(yas-global-mode))
-(use-package debbugs)
+(use-package debbugs
+ :straight (debbugs
+ :host github
+ :repo "emacs-straight/debbugs"
+ :files (:defaults "Debbugs.wsdl")))
(use-package org-ref
:init
;; (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-package window
+(use-feature window
:bind
(("C-c w <right>" . split-window-right)
("C-c w <down>" . split-window-below)
:custom
(split-width-threshold 150))
-(use-package windmove
+(use-feature windmove
:defer 0.6
:bind
(("C-c w h" . windmove-left)
(use-package pdf-tools
:defer 0.5
:bind (:map pdf-view-mode-map
- ("M-RET" . image-previous-line))
- :config (pdf-tools-install nil t))
+ ("<C-XF86Back>" . pdf-history-backward)
+ ("<mouse-8>" . pdf-history-backward)
+ ("<drag-mouse-8>" . pdf-history-backward)
+ ("<C-XF86Forward>" . pdf-history-forward)
+ ("<mouse-9>" . pdf-history-forward)
+ ("<drag-mouse-9>" . pdf-history-forward)
+ ("M-RET" . image-previous-line))
+ :config (pdf-tools-install nil t)
+ :custom (pdf-view-resize-factor 1.05))
(use-package biblio)
-(use-package reftex
+(use-feature reftex
:hook (latex-mode . reftex-mode))
-(use-package reftex-cite
+(use-feature reftex-cite
:after reftex
:disabled ; enable to disable
; reftex-cite's default choice
mail-user-agent 'gnus-user-agent
read-mail-command 'gnus)
-(use-package gnus
+(use-feature gnus
:bind (("s-m" . gnus)
("s-M" . gnus-unplugged)
("C-c a m" . gnus)
(with-eval-after-load 'recentf
(add-to-list 'recentf-exclude gnus-home-directory)))
-(use-package gnus-art
+(use-feature gnus-art
:config
(setq
gnus-buttonized-mime-types '("multipart/\\(signed\\|encrypted\\)")
:map gnus-article-mode-map
("M-L" . org-store-link)))
-(use-package gnus-sum
+(use-feature gnus-sum
:bind (:map gnus-summary-mode-map
:prefix-map b/gnus-summary-prefix-map
:prefix "v"
(bind-keys
:map gnus-summary-mode-map
("M-L" . org-store-link))
- :hook (gnus-summary-mode . b/no-mouse-autoselect-window))
+ :hook (gnus-summary-mode . b/no-mouse-autoselect-window)
+ :custom
+ (gnus-thread-sort-functions '(gnus-thread-sort-by-number
+ gnus-thread-sort-by-subject
+ gnus-thread-sort-by-date)))
-(use-package gnus-msg
+(use-feature gnus-msg
:config
(defvar b/signature "Amin Bandali
Free Software Activist | GNU Webmaster & Volunteer
(signature b/csc-signature)
(gcc "nnimap+csc:Sent")))))
-(use-package gnus-topic
+(use-feature gnus-topic
:hook (gnus-group-mode . gnus-topic-mode)
:config (setq gnus-topic-line-format "%i[ %A: %(%{%n%}%) ]%v\n"))
-(use-package gnus-agent
+(use-feature gnus-agent
:config
(setq gnus-agent-synchronize-flags 'ask)
:hook (gnus-group-mode . gnus-agent-mode))
-(use-package gnus-group
+(use-feature gnus-group
:config
(setq gnus-permanently-visible-groups "\\(:INBOX$\\|:gnu$\\)"))
(comment
;; problematic with ebdb's popup, *EBDB-Gnus*
- (use-package gnus-win
+ (use-feature gnus-win
:config
(setq gnus-use-full-window nil)))
-(use-package gnus-dired
+(use-feature gnus-dired
:commands gnus-dired-mode
:init
(add-hook 'dired-mode-hook 'gnus-dired-mode))
-(use-package mm-decode
+(use-feature mm-decode
:config
(setq mm-discouraged-alternatives '("text/html" "text/richtext")
mm-decrypt-option 'known
mm-verify-option 'known))
-(use-package sendmail
+(use-feature sendmail
:config
(setq sendmail-program (executable-find "msmtp")
;; message-sendmail-extra-arguments '("-v" "-d")
mail-specify-envelope-from t
mail-envelope-from 'header))
-(use-package message
+(use-feature message
:config
;; redefine for a simplified In-Reply-To header
;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67)
;; (message-header-cc ((t (:foreground "#333" :weight normal))))
)
-(use-package mml
+(use-feature mml
:delight " mml")
-(use-package mml-sec
+(use-feature mml-sec
:custom
(mml-secure-openpgp-encrypt-to-self t)
(mml-secure-openpgp-sign-with-sender t))
-(use-package footnote
+(use-feature footnote
:after message
;; :config
;; (setq footnote-start-tag ""
:bind
(:map message-mode-map
:prefix-map b/footnote-prefix-map
- :prefix "C-c f"
+ :prefix "C-c f n"
("a" . footnote-add-footnote)
("b" . footnote-back-to-message)
("c" . footnote-cycle-style)
(with-eval-after-load 'swiper
(add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
-(use-package ebdb-com
+(use-feature ebdb-com
:after ebdb)
;; (use-package ebdb-complete
:config
(defun company-ebdb--post-complete (_) nil))
-(use-package ebdb-gnus
+(use-feature ebdb-gnus
:after ebdb
:custom
- (ebdb-gnus-window-configuration
- '(article
- (vertical 1.0
- (summary 0.25 point)
- (horizontal 1.0
- (article 1.0)
- (ebdb-gnus 0.3))))))
-
-(use-package ebdb-mua
+ (ebdb-gnus-window-size 0.3))
+
+(use-feature ebdb-mua
:after ebdb
;; :custom (ebdb-mua-pop-up nil)
)
(gnus-harvest-install 'message-x)
(gnus-harvest-install))))
+(use-feature gnus-article-treat-patch
+ :disabled
+ :demand
+ :load-path "lisp/"
+ :config
+ (setq ft/gnus-article-patch-conditions
+ '("^@@ -[0-9]+,[0-9]+ \\+[0-9]+,[0-9]+ @@")))
+
\f
;;; IRC (with ERC and ZNC)
-(use-package erc
+(use-feature erc
:bind (("C-c b e" . erc-switch-to-buffer)
:map erc-mode-map
("M-a" . erc-track-switch-buffer))
(puthash sender (current-time)
(gethash server erc-lurker-state))))))))
-(use-package erc-fill
+(use-feature erc-fill
:after erc
:custom
(erc-fill-column 77)
(erc-fill-function 'erc-fill-static)
(erc-fill-static-center 18))
-(use-package erc-pcomplete
+(use-feature erc-pcomplete
:after erc
:custom
(erc-pcomplete-nick-postfix ","))
-(use-package erc-track
+(use-feature erc-track
:after erc
:bind (("C-c a e t d" . erc-track-disable)
("C-c a e t e" . erc-track-enable))
:after erc)
(use-package znc
- :load-path "lisp/znc.el/"
+ :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