;;; 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:
(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 b/before-user-init-time
- before-init-time)))
+(defvar b/emacs-initialized nil
+ "Whether Emacs has been initialized.")
+
+(when (not (bound-and-true-p b/emacs-initialized))
+ (message "Loading Emacs...done (%.3fs)"
+ (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
;; set them back to their defaults once we're done initializing
(defun b/post-init ()
- (setq gc-cons-threshold b/gc-cons-threshold
- gc-cons-percentage b/gc-cons-percentage
+ "My post-initialize function, run after loading `user-init-file'."
+ (setq b/emacs-initialized t
+ 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)
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 `user-init-file'."
+ (interactive)
+ (setq b/before-user-init-time (current-time)
+ 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
(setq use-package-always-defer t)
(require 'bind-key)
-(use-package delight)
-
\f
;;; 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))
+(defvar b/exwm-p (string= (system-name) "jirud")
+ "Whether or not we will be using `exwm'.")
-(setq
- auto-save-list-file-prefix (b/var "auto-save/sessions/")
- nsm-settings-file (b/var "nsm-settings.el"))
+;; keep ~/.emacs.d clean
+(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;;; "))
+
+;; (defvar b/fill-column 47
+;; "My custom `fill-column'.")
+
+(defconst b/asterism "* * *")
+
+(defun b/insert-asterism ()
+ "Insert a centred asterism."
+ (interactive)
+ (insert
+ (concat
+ "\n\n"
+ (make-string (floor (/ (- fill-column (length b/asterism)) 2))
+ ?\s)
+ b/asterism
+ "\n\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
- :custom
- ((epg-gpg-program (executable-find "gpg"))
- (epg-pinentry-mode 'loopback)))
-
-(use-package epg
- :after epg-config)
-
-(use-package pinentry
+ ;; 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
- :after (epa epg server)
- :config
- (setq pinentry--socket-dir server-socket-dir)
- (pinentry-start))
-
-;; useful libraries
-(require 'cl-lib)
-(require 'subr-x)
-
-\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)))))
-
-(defun b/add-elisp-section ()
- (interactive)
- (insert "\n")
- (previous-line)
- (insert "\n\f\n;;; "))
-
-\f
-;;; Defaults
+ :custom
+ ;; backups (C-h v make-backup-files RET)
+ (backup-by-copying t)
+ (version-control t)
+ (delete-old-versions t)
-;; time and battery in mode-line
-(comment
- (use-package time
- :init
- (setq display-time-default-load-average nil)
- :config
- (display-time-mode))
+ ;; auto-save
+ (auto-save-file-name-transforms
+ `((".*" ,(b/var "auto-save/") t)))
- (use-package battery
- :config
- (display-battery-mode)))
+ ;; insert newline at the end of files
+ (require-final-newline t)
-;; smaller fringe
-;; (fringe-mode '(3 . 1))
-(fringe-mode nil)
+ ;; open read-only file buffers in view-mode
+ ;; (enables niceties like `q' for quit)
+ (view-read-only t))
;; 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"))))
+;; 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))
-;; 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)
+;; time and battery in mode-line
+(use-feature time
+ :if b/exwm-p
+ :demand
+ :config
+ (display-time-mode)
+ :custom
+ (display-time-default-load-average nil)
+ (display-time-format "%a %b %-e, %-l:%M%P"))
-;; 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)
+(use-feature battery
+ :if b/exwm-p
+ :demand
+ :config
+ (display-battery-mode)
+ :custom
+ (battery-mode-line-format " %p%% %t"))
-;; 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 vc-git
+ :after vc
+ :custom
+ (vc-git-print-log-follow t))
+
+(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"))))
+
+(use-feature auth-source
+ :custom
+ (auth-sources '("~/.authinfo.gpg"))
+ (authinfo-hidden (regexp-opt '("password" "client-secret" "token"))))
\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)
+ ;; ("<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))
+ ;; ("<drag-mouse-9>" . next-buffer)
+ ;; ("<drag-mouse-2>" . kill-this-buffer)
+ ;; ("<drag-mouse-3>" . switch-to-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-package exwm
+ :if b/exwm-p
+ :demand
+ :config
+ ;; make class name the buffer name, truncating beyond 60 characters
+ (defun b/exwm-rename-buffer ()
+ (interactive)
+ (exwm-workspace-rename-buffer
+ (concat exwm-class-name ":"
+ (if (<= (length exwm-title) 60) exwm-title
+ (concat (substring exwm-title 0 59) "...")))))
+ ;; Enable EXWM
+ (exwm-enable)
+ :hook ((exwm-update-class . b/exwm-rename-buffer)
+ (exwm-update-title . b/exwm-rename-buffer)))
+
+(use-feature exwm-config
+ :demand
+ :after exwm
+ :hook (exwm-init . exwm-config--fix/ido-buffer-window-other-frame))
+
+(use-feature exwm-input
+ :demand
+ :after exwm
+ :config
+ (defun b/exwm-ws-prev-index ()
+ "Return the index for the previous EXWM workspace, wrapping
+around if needed."
+ (if (= exwm-workspace-current-index 0)
+ (1- exwm-workspace-number)
+ (1- exwm-workspace-current-index)))
+
+ (defun b/exwm-ws-next-index ()
+ "Return the index for the next EXWM workspace, wrapping
+around if needed."
+ (if (= exwm-workspace-current-index
+ (1- exwm-workspace-number))
+ 0
+ (1+ exwm-workspace-current-index)))
+
+ ;; shorten 'C-c C-q' to 'C-q'
+ (define-key exwm-mode-map [?\C-q] #'exwm-input-send-next-key)
+
+ (setq exwm-workspace-number 4
+ exwm-input-global-keys
+ `(([?\s-R] . exwm-reset)
+ ([?\s-\\] . exwm-workspace-switch)
+ ([?\s-\s] . dmenu)
+ ([?\S-\s-\s] . (lambda (command)
+ (interactive
+ (list (read-shell-command "➜ ")))
+ (start-process-shell-command
+ command nil command)))
+ ([s-return] . (lambda ()
+ (interactive)
+ (start-process "" nil "urxvt")))
+ ([?\C-\s-\s] . counsel-linux-app)
+ ([?\M-\s-\s] . (lambda ()
+ (interactive)
+ (start-process-shell-command
+ "rofi-pass" nil "rofi-pass")))
+ ([?\s-h] . windmove-left)
+ ([?\s-j] . windmove-down)
+ ([?\s-k] . windmove-up)
+ ([?\s-l] . windmove-right)
+ ([?\s-H] . windmove-swap-states-left)
+ ([?\s-J] . windmove-swap-states-down)
+ ([?\s-K] . windmove-swap-states-up)
+ ([?\s-L] . windmove-swap-states-right)
+ ([?\M-\s-h] . shrink-window-horizontally)
+ ([?\M-\s-l] . enlarge-window-horizontally)
+ ([?\M-\s-k] . shrink-window)
+ ([?\M-\s-j] . enlarge-window)
+ ([?\s-\[] . (lambda ()
+ (interactive)
+ (exwm-workspace-switch-create
+ (b/exwm-ws-prev-index))))
+ ([?\s-\]] . (lambda ()
+ (interactive)
+ (exwm-workspace-switch-create
+ (b/exwm-ws-next-index))))
+ ([?\s-{] . (lambda ()
+ (interactive)
+ (exwm-workspace-move-window
+ (b/exwm-ws-prev-index))))
+ ([?\s-}] . (lambda ()
+ (interactive)
+ (exwm-workspace-move-window
+ (b/exwm-ws-next-index))))
+ ,@(mapcar (lambda (i)
+ `(,(kbd (format "s-%d" i)) .
+ (lambda ()
+ (interactive)
+ (exwm-workspace-switch-create ,i))))
+ (number-sequence 0 (1- exwm-workspace-number)))
+ ([?\s-t] . exwm-floating-toggle-floating)
+ ([?\s-f] . exwm-layout-toggle-fullscreen)
+ ([?\s-W] . (lambda ()
+ (interactive)
+ (kill-buffer (current-buffer))))
+ ([?\s-Q] . (lambda ()
+ (interactive)
+ (exwm-manage--kill-client)))
+ ([?\s-\'] . (lambda ()
+ (interactive)
+ (start-process-shell-command
+ "rofi-light" nil "rofi-light")))
+ ([XF86AudioMute] .
+ (lambda ()
+ (interactive)
+ (start-process "" nil "pamixer" "--toggle-mute")))
+ ([XF86AudioLowerVolume] .
+ (lambda ()
+ (interactive)
+ (start-process
+ "" nil "pamixer" "--allow-boost" "--decrease" "5")))
+ ([XF86AudioRaiseVolume] .
+ (lambda ()
+ (interactive)
+ (start-process
+ "" nil "pamixer" "--allow-boost" "--increase" "5")))
+ ([XF86AudioPlay] .
+ (lambda ()
+ (interactive)
+ (start-process "" nil "mpc" "toggle")))
+ ([XF86AudioPrev] .
+ (lambda ()
+ (interactive)
+ (start-process "" nil "mpc" "prev")))
+ ([XF86AudioNext] .
+ (lambda ()
+ (interactive)
+ (start-process "" nil "mpc" "next")))
+ ([XF86ScreenSaver] .
+ (lambda ()
+ (interactive)
+ (start-process "" nil "dm-tool" "lock")))
+ ([\s-XF86Back] . previous-buffer)
+ ([\s-XF86Forward] . next-buffer)))
+
+ ;; Line-editing shortcuts
+ (setq exwm-input-simulation-keys
+ '(;; movement
+ ([?\C-b] . [left])
+ ([?\M-b] . [C-left])
+ ([?\C-f] . [right])
+ ([?\M-f] . [C-right])
+ ([?\C-p] . [up])
+ ([?\C-n] . [down])
+ ([?\C-a] . [home])
+ ([?\C-e] . [end])
+ ([?\M-v] . [prior])
+ ([?\C-v] . [next])
+ ([?\C-d] . [delete])
+ ([?\C-k] . [S-end ?\C-x])
+ ([?\M-<] . C-home)
+ ([?\M->] . C-end)
+ ;; cut/copy/paste
+ ([?\C-w] . [?\C-x])
+ ([?\M-w] . [?\C-c])
+ ([?\C-y] . [?\C-v])
+ ([?\M-d] . [C-S-right ?\C-x])
+ ([?\M-\d] . [C-S-left ?\C-x])
+ ;; window
+ ([?\s-w] . [?\C-w])
+ ([?\s-q] . [?\C-q])
+ ;; misc
+ ([?\C-s] . [?\C-f])
+ ([?\s-s] . [?\C-s])
+ ([?\C-g] . [escape]))))
+
+(use-feature exwm-manage
+ :demand
+ :after exwm
+ :hook
+ (exwm-manage-finish . (lambda ()
+ (when exwm-class-name
+ (cond
+ ((string= exwm-class-name "Abrowser")
+ (exwm-input-set-local-simulation-keys
+ `(,@exwm-input-simulation-keys
+ ([?\C-\S-d] . [?\C-d]))))
+ ((string= exwm-class-name "URxvt")
+ (exwm-input-set-local-simulation-keys
+ '(([?\C-c ?\C-c] . [?\C-c])
+ ([?\C-c ?\C-u] . [?\C-u]))))
+ ((string= exwm-class-name "Zathura")
+ (exwm-input-set-local-simulation-keys
+ '(([?\C-p] . [C-up])
+ ([?\C-n] . [C-down])))))))))
+
+(use-feature exwm-randr
+ :demand
+ :after exwm
+ :config
+ (exwm-randr-enable)
+ :custom
+ (exwm-randr-workspace-monitor-plist '(1 "VGA-1")))
+
+(use-feature exwm-systemtray
+ :demand
+ :after exwm
+ :config
+ (exwm-systemtray-enable))
+
+(use-feature exwm-workspace)
+
+(use-package exwm-edit
+ :demand
+ :after exwm)
+
+;; 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
(("C-c a o a" . org-agenda)
:map org-mode-map
("M-L" . org-insert-last-stored-link)
- ("M-O" . org-toggle-link-display)
- ("s-T" . org-todo))
+ ("M-O" . org-toggle-link-display))
:hook ((org-mode . org-indent-mode)
(org-mode . auto-fill-mode)
(org-mode . flyspell-mode))
'(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-x g" . magit-status)
- ("s-g s" . magit-status)
- ("s-g l" . magit-log-buffer-file))
+ :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-add-section-hook 'magit-status-sections-hook
'magit-insert-modules
'magit-insert-stashes
'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
+ (magit-diff-refine-hunk t)
+ (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
+ ;; (magit-completing-read-function 'magit-ido-completing-read)
: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\\)?:")
+ :config
+ (recentf-mode)
: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
+;; (use-package smex)
+
+(bind-keys
+ ("C-c f ." . find-file)
+ ("C-c f l" . find-library)
+ ("C-c f r" . recentf-open-files)
+ ("C-c x" . execute-extended-command))
+
+(comment
+ (use-feature ido
+ :demand
+ :bind
+ (:map ido-common-completion-map
+ ([escape] . minibuffer-keyboard-quit)
+ ("DEL" . b/ido-backspace))
+ :config
+ (require 'delsel)
+ (defun b/ido-backspace ()
+ "Forward to `backward-delete-char'. On error (read-only), quit."
+ (interactive)
+ (condition-case nil
+ (backward-delete-char 1)
+ (error
+ (minibuffer-keyboard-quit))))
+ (ido-mode 1)
+ (ido-everywhere 1)
+ :custom
+ (ido-enable-flex-matching t)
+ ;; (ido-enable-regexp t)
+ ;; (ido-enable-prefix t)
+ (ido-max-window-height 10)
+ (ido-use-virtual-buffers t))
+
+ (use-package ido-vertical-mode
+ :defer 0.3
+ :config
+ (ido-vertical-mode 1)
+ :custom
+ (ido-vertical-define-keys 'C-n-C-p-up-and-down)
+ (ido-vertical-show-count t))
+
+ (use-package ido-completing-read+
+ :defer 0.3
+ :after ido
+ :config
+ (ido-ubiquitous-mode 1))
+
+ (use-package crm-custom
+ :defer 0.3
+ :config
+ (crm-custom-mode 1))
+
+ (use-feature icomplete
+ :defer 0.3
+ :config
+ (icomplete-mode 1)))
+
+(use-package amx
+ :defer 0.3
:config
- (setq smex-save-file (b/var "smex-save.el")))
+ (amx-mode))
(use-package ivy
:defer 0.3
- :delight ;; " 🙒"
:bind
(:map ivy-minibuffer-map
([escape] . keyboard-escape-quit)
("DEL" . ivy-backward-delete-char))
:config
(setq ivy-wrap t
- ivy-height 14
+ ;; ivy-height 14
ivy-use-virtual-buffers t
ivy-virtual-abbreviate 'abbreviate
ivy-count-format "%d/%d ")
+
+ (defvar b/ivy-ignore-buffer-modes '(magit-mode erc-mode dired-mode))
+ (defun b/ivy-ignore-buffer-p (str)
+ "Return non-nil if str names a buffer with a major mode
+derived from one of `b/ivy-ignore-buffer-modes'.
+
+This function is intended for use with `ivy-ignore-buffers'."
+ (let* ((buf (get-buffer str))
+ (mode (and buf (buffer-local-value 'major-mode buf))))
+ (and mode
+ (apply #'provided-mode-derived-p mode b/ivy-ignore-buffer-modes))))
+ (add-to-list 'ivy-ignore-buffers 'b/ivy-ignore-buffer-p)
+
(ivy-mode 1)
- ;; :custom-face
- ;; (ivy-minibuffer-match-face-2 ((t (:background "#e99ce8" :weight semi-bold))))
- ;; (ivy-minibuffer-match-face-3 ((t (:background "#bbbbff" :weight semi-bold))))
- ;; (ivy-minibuffer-match-face-4 ((t (:background "#ffbbff" :weight semi-bold))))
-)
+ :custom-face
+ (ivy-minibuffer-match-face-1 ((t (:background "#eeeeee"))))
+ (ivy-minibuffer-match-face-2 ((t (:background "#e7e7e7" :weight bold))))
+ (ivy-minibuffer-match-face-3 ((t (:background "light goldenrod" :weight semi-bold))))
+ (ivy-minibuffer-match-face-4 ((t (:background "misty rose" :weight semi-bold))))
+ (ivy-current-match ((((class color) (background light))
+ :background "#d7d7d7" :foreground "black")
+ (((class color) (background dark))
+ :background "#65a7e2" :foreground "black"))))
(use-package swiper
+ :demand
:after ivy
- :bind (("C-s" . swiper-isearch)
- ("C-r" . swiper)
- ("C-S-s" . isearch-forward)))
+ :bind (("C-S-s" . swiper-isearch)))
(use-package counsel
+ :demand
:after ivy
- :delight
- :bind (([remap execute-extended-command] . counsel-M-x)
- ([remap find-file] . counsel-find-file)
- ("C-c b b" . ivy-switch-buffer)
- ("C-c f ." . counsel-find-file)
- ("C-c f l" . counsel-find-library)
- ("C-c f r" . counsel-recentf)
- ("C-c x" . counsel-M-x)
- ("s-." . counsel-find-file)
+ :bind (("C-c f r" . counsel-recentf)
:map minibuffer-local-map
("C-r" . counsel-minibuffer-history))
:config
("C-x C-b" . helm-buffers-list)
("C-x C-f" . helm-find-files)
("C-h r" . helm-info-emacs)
- ("s-r" . helm-recentf)
("C-s-r" . helm-resume)
:map helm-map
("<tab>" . helm-execute-persistent-action)
("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)
("C-d" . b/eshell-quit-or-delete-char)
("C-S-l" . b/eshell-clear)
("M-r" . counsel-esh-history)
- ([tab] . company-complete)))
+ ;; ([tab] . company-complete)
+ :map eshell-hist-mode-map
+ ("M-r" . counsel-esh-history)))
: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
(or
(name . "^\\*scratch\\*$")
(name . "^\\*Messages\\*$")))
+ ("exwm" (mode . exwm-mode))
("erc" (mode . erc-mode)))))
(ibuffer-formats
'((mark modified read-only locked " "
- (name 18 18 :left :elide)
+ (name 72 72 :left :elide)
" "
(size-h 9 -1 :right)
" "
" " 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")
:bind
(:map
outline-minor-mode-map
("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"
+ (setq dired-dwim-target t
+ dired-listing-switches "-alh"
ls-lisp-use-insert-directory-program nil)
;; easily diff 2 marked files
(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
- :delight (auto-fill-function " fill")
- :config (column-number-mode))
+(use-feature simple
+ :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
- :hook (text-mode . indicate-buffer-boundaries-left))
+(use-feature text-mode
+ :bind (:map text-mode-map ("C-*" . b/insert-asterism))
+ :hook ((text-mode . indicate-buffer-boundaries-left)
+ (text-mode . flyspell-mode)))
-(use-package conf-mode
+(use-feature conf-mode
:mode "\\.*rc$")
-(use-package sh-mode
+(use-feature sh-mode
:mode "\\.bashrc$")
(use-package company
- :defer 0.6
- :delight " comp"
:bind
(:map company-active-map
([tab] . company-complete-common-or-cycle)
- ([escape] . company-abort))
+ ([escape] . company-abort)
+ ("C-p" . company-select-previous-or-abort)
+ ("C-n" . company-select-next-or-abort))
:custom
(company-minimum-prefix-length 1)
(company-selection-wrap-around t)
(company-dabbrev-char-regexp "\\sw\\|\\s_\\|[-_]")
(company-dabbrev-downcase nil)
(company-dabbrev-ignore-case nil)
- :config
- (global-company-mode t))
+ ;; :config
+ ;; (global-company-mode t)
+ )
(use-package flycheck
:defer 0.6
(setq flycheck-check-syntax-automatically '(mode-enabled save))
:custom (flycheck-mode-line-prefix "flyc"))
-(use-package flyspell
- :delight " flysp")
+(use-feature flyspell)
;; 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
- :delight " abbr"
- :hook (text-mode . abbrev-mode)
- :custom
- (abbrev-file-name (b/var "abbrev.el")))
+(use-feature abbrev
+ :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
- :delight (reveal-mode " reveal")
+(use-feature reveal
:hook (emacs-lisp-mode . reveal-mode))
-(use-package elisp-mode
- :delight (emacs-lisp-mode "Elisp" :major))
+(use-feature elisp-mode)
-(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)
+ ;; (defun b/alloy-simple-indent (start end)
+ ;; (interactive "r")
+ ;; ;; (if (region-active-p)
+ ;; ;; (indent-rigidly start end alloy-basic-offset)
+ ;; ;; (if (bolp)
+ ;; ;; (indent-rigidly (line-beginning-position)
+ ;; ;; (line-end-position)
+ ;; ;; alloy-basic-offset)))
+ ;; (indent-to (+ (current-column) alloy-basic-offset)))
+ :bind (:map alloy-mode-map
+ ("RET" . electric-newline-and-maybe-indent)
+ ;; ("TAB" . b/alloy-simple-indent)
+ ("TAB" . indent-for-tab-command))
+ :hook (alloy-mode . (lambda () (setq-local indent-tabs-mode nil))))
+
+(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))
+(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))
(b/setq-every 2
web-mode-code-indent-offset
web-mode-css-indent-offset
- web-mode-markup-indent-offset))
+ web-mode-markup-indent-offset)
+ :custom
+ (web-mode-enable-auto-indentation nil))
(use-package emmet-mode
:after (:any web-mode css-mode sgml-mode)
(use-package lsp-java
:config
(add-hook 'java-mode-hook
- (lambda ()
- (setq-local company-backends (list 'company-lsp))))
+ (lambda ()
+ (setq-local company-backends (list 'company-lsp))))
(add-hook 'java-mode-hook 'lsp-java-enable)
(add-hook 'java-mode-hook 'flycheck-mode)
(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)))
+
+(use-package george-mode
+ :straight (:host nil :repo "https://git.shemshak.org/amin/george-mode")
+ :mode "\\.grg\\'")
\f
;;; Theme
:commands (sml/apply-theme)
:demand
:config
+ (setq sml/theme 'tangomod)
(sml/setup)
(smart-mode-line-enable))
-(comment
- ;; TODO
- (use-package doom-themes))
+(use-package doom-modeline
+ :disabled
+ :demand
+ :hook (after-init . doom-modeline-init)
+ :custom
+ (doom-modeline-buffer-file-name-style 'relative-to-project))
+
+(use-package doom-themes)
+
+(use-package solarized-theme
+ :disabled
+ :config
+ (load-theme 'solarized-light t))
+
+(use-package moody
+ :disabled
+ :demand
+ :config
+ (setq x-underline-at-descent-line t)
+ (let ((line (face-attribute 'mode-line :underline)))
+ (set-face-attribute 'mode-line nil :overline line)
+ (set-face-attribute 'mode-line-inactive nil :overline line)
+ (set-face-attribute 'mode-line-inactive nil :underline line)
+ (set-face-attribute 'mode-line nil :box nil)
+ (set-face-attribute 'mode-line-inactive nil :box nil)
+ (set-face-attribute 'mode-line-inactive nil :background "#e1e1e1")) ; d3d7cf
+ (moody-replace-mode-line-buffer-identification)
+ (moody-replace-vc-mode))
+
+(use-package mini-modeline
+ :disabled
+ :demand
+ :config (mini-modeline-mode))
(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
+ (4 '(:foreground "#c5c8c6") t))) ; title
+ "For use with the `doom-tomorrow-night' theme.")
(defun b/lights-on ()
"Enable my favourite light theme."
(interactive)
(mapc #'disable-theme custom-enabled-themes)
(load-theme 'tangomod t)
- (sml/apply-theme 'automatic)
+ (sml/apply-theme 'tangomod)
(font-lock-remove-keywords
- 'org-mode b/org-mode-font-lock-keywords))
+ 'org-mode b/org-mode-font-lock-keywords)
+ (when (featurep 'erc-hl-nicks)
+ (erc-hl-nicks-reset-face-table))
+ (when (featurep 'exwm-systemtray)
+ (exwm-systemtray--refresh)))
(defun b/lights-off ()
"Go dark."
(interactive)
(mapc #'disable-theme custom-enabled-themes)
- ;; (load-theme 'doom-tomorrow-night t)
+ (load-theme 'doom-one t)
(sml/apply-theme 'automatic)
(font-lock-add-keywords
- 'org-mode b/org-mode-font-lock-keywords t))
+ 'org-mode b/org-mode-font-lock-keywords t)
+ (when (featurep 'erc-hl-nicks)
+ (erc-hl-nicks-reset-face-table))
+ (when (featurep 'exwm-systemtray)
+ (exwm-systemtray--refresh)))
(bind-keys
- ("s-t d" . b/lights-off)
- ("s-t l" . b/lights-on))
+ ("C-c t d" . b/lights-off)
+ ("C-c t l" . b/lights-on))
\f
;;; Emacs enhancements & auxiliary packages
(use-package which-key
:defer 0.4
- :delight
:config
(which-key-add-key-based-replacements
;; prefixes for global prefixes and minor modes
"C-c @" "outline"
"C-c !" "flycheck"
- "C-c 8" "typo"
- "C-c 8 -" "typo/dashes"
- "C-c 8 <" "typo/left-brackets"
- "C-c 8 >" "typo/right-brackets"
+ ;; "C-c 8" "typo"
+ ;; "C-c 8 -" "typo/dashes"
+ ;; "C-c 8 <" "typo/left-brackets"
+ ;; "C-c 8 >" "typo/right-brackets"
+ "C-x RET" "coding system"
"C-x 8" "unicode"
+ "C-x @" "event modifiers"
"C-x a" "abbrev/expand"
"C-x r" "rectangle/register/bookmark"
+ "C-x t" "tabs"
"C-x v" "version control"
+ "C-x X" "edebug"
+ "C-x C-a" "edebug"
+ "C-x C-k" "kmacro"
;; prefixes for my personal bindings
+ "C-c &" "yasnippet"
"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 s" "straight.el"
- "C-c psa" "all"
- "C-c psp" "package"
+ "C-c b" "buffers"
"C-c c" "compile-and-comments"
"C-c e" "eval"
"C-c f" "files"
"C-c F" "frames"
+ "C-c g" "magit"
"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" "package management"
+ "C-c ps" "straight"
+ "C-c psa" "all"
+ "C-c psp" "package"
"C-c q" "boxquote"
- "s-g" "magit"
- "s-O" "outline"
- "s-t" "themes")
+ "C-c t" "themes"
+ ;; "s-O" "outline"
+ )
;; 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)
- ("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)
- ("C-c f r" . crux-rename-file-and-buffer)
+ :bind (("C-c d" . crux-duplicate-current-line-or-region)
+ ("C-c M-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)
+ ("C-c f R" . crux-rename-file-and-buffer)
("C-c j" . crux-top-join-line)
("C-S-j" . crux-top-join-line)))
: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
;; easily type pretty quotes & other typography, like ‘’“”-–—«»‹›
(use-package typo
+ :disabled
:defer 0.5
- :delight " typo"
:config
(typo-global-mode 1)
- :hook ((text-mode erc-mode) . typo-mode))
+ :hook (((text-mode erc-mode web-mode) . typo-mode)
+ (tex-mode . (lambda ()(typo-mode -1)))))
+
+(use-feature electric
+ :disabled
+ :demand
+ :config
+ (electric-quote-mode))
;; highlight TODOs in buffers
(use-package hl-todo
:defer 0.5
:after eshell
:config
- (defvar user-@-host (concat (user-login-name) "@" (system-name) " "))
+ (defvar user-@-host (concat (user-login-name) "@" (system-name) ":"))
(defun +eshell/prompt ()
- (let ((base/dir (shrink-path-prompt default-directory)))
- (concat (propertize user-@-host 'face 'default)
- (propertize (car base/dir)
- 'face 'font-lock-comment-face)
- (propertize (cdr base/dir)
- 'face 'font-lock-constant-face)
- (propertize "> " 'face 'default))))
- (setq eshell-prompt-regexp (concat user-@-host ".*> ")
+ (concat (propertize user-@-host 'face 'default)
+ (propertize (abbreviate-file-name default-directory)
+ 'face 'font-lock-comment-face)
+ (propertize "\n" 'face 'default)
+ (if (= (user-uid) 0)
+ (propertize "#" 'face 'red)
+ (propertize "$" 'face 'default))
+ (propertize " " 'face 'default)))
+ (setq eshell-prompt-regexp "\\(.*\n\\)*[$#] "
eshell-prompt-function #'+eshell/prompt))
(use-package eshell-up
:commands eshell-up)
(use-package multi-term
+ :disabled
:defer 0.6
:bind (("C-c a s m m" . multi-term)
("C-c a s m d" . multi-term-dedicated-toggle)
(use-package page-break-lines
:defer 0.5
- :delight " pgln"
:custom
(page-break-lines-max-width fill-column)
:config
("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
- (use-package forge
- :after magit
- :demand))
+(use-package forge
+ :demand
+ :after magit)
(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)
+
+ (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"))
+ :bind
+ (("C-c D d" . debbugs-gnu)
+ ("C-c D e" .
+ (lambda ()
+ (interactive)
+ (setq debbugs-gnu-current-suppress t)
+ (debbugs-gnu debbugs-gnu-default-severities '("emacs"))))
+ ("C-c D g" .
+ (lambda ()
+ (interactive)
+ (setq debbugs-gnu-current-suppress t)
+ (debbugs-gnu debbugs-gnu-default-severities '("gnuzilla"))))
+ ("C-c D G" .
+ (lambda ()
+ (interactive)
+ (setq debbugs-gnu-current-suppress t)
+ (debbugs-gnu debbugs-gnu-default-severities '("guix"))))))
(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/"))
+ :disabled
:hook (erc-mode . emojify-mode))
-(use-package window
+(use-feature window
:bind
- (("s-o" . other-window)
- ("s-/ ." . split-window-right)
- ("s-/ ," . split-window-below)
- ("s-/ 0" . delete-window)
- ("s-q" . delete-window))
+ (("C-c w e" . (lambda ()
+ (interactive)
+ (split-window-right)
+ (other-window 1)
+ (erc-switch-to-buffer)))
+ ("C-c w s l" . (lambda ()
+ (interactive)
+ (split-window-right)
+ (other-window 1)))
+ ("C-c w s j" . (lambda ()
+ (interactive)
+ (split-window-below)
+ (other-window 1)))
+ ("C-c w q" . quit-window))
:custom
(split-width-threshold 150))
-(use-package windmove
+(use-feature windmove
:defer 0.6
:bind
- (("s-h" . windmove-left)
- ("s-j" . windmove-down)
- ("s-k" . windmove-up)
- ("s-l" . windmove-right)
- ("s-H" . windmove-swap-states-left)
- ("s-J" . windmove-swap-states-down)
- ("s-K" . windmove-swap-states-up)
- ("s-L" . windmove-swap-states-right)))
+ (("C-c w h" . windmove-left)
+ ("C-c w j" . windmove-down)
+ ("C-c w k" . windmove-up)
+ ("C-c w l" . windmove-right)
+ ("C-c w H" . windmove-swap-states-left)
+ ("C-c w J" . windmove-swap-states-down)
+ ("C-c w K" . windmove-swap-states-up)
+ ("C-c w L" . windmove-swap-states-right)))
(use-package pass
:commands pass
(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)
+ ("C-s" . isearch-forward)
+ ("s s" . isearch-forward))
+ :config (pdf-tools-install nil t)
+ :custom (pdf-view-resize-factor 1.05))
+
+(use-package org-pdftools
+ :straight (:host github :repo "fuxialexander/org-pdftools")
+ :demand
+ :after org
+ :config
+ (with-eval-after-load 'org
+ (require 'org-pdftools)))
(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
(goto-char (cdr macro)))
(reftex-this-word)))))
+(use-package minions
+ :demand
+ :config (minions-mode))
+
+(use-package dmenu
+ :custom
+ (dmenu-prompt-string "run: ")
+ (dmenu-save-file (b/var "dmenu-items")))
+
+(use-package eosd
+ ;; TODO: fix build by properly building the eosd-pixbuf.c module
+ ;; e.g. see https://github.com/raxod502/straight.el/issues/386
+ :disabled
+ :straight (:host github :repo "clarete/eosd")
+ :demand
+ :after exwm
+ :config
+ (eosd-start))
+
+(use-package nnreddit
+ :disabled
+ :demand
+ :after gnus
+ :custom
+ (nnreddit-python-command "python3"))
+
+(use-package hyperbole
+ :disabled
+ :straight (hyperbole
+ :host github :repo "rswgnu/hyperbole"
+ :files ("*.el" ("kotl" "kotl/*.el")
+ "DEMO" "man/*.info" "man/*.texi")))
+
+(use-package oddmuse-curl
+ :straight (:host github :repo "kensanata/oddmuse-curl")
+ :config
+ (setq
+ oddmuse-wikis
+ (append
+ '(("EmacsConf" "https://emacsconf.org" utf-8 "question" nil)
+ ("EmacsConf 2019" "https://emacsconf.org/2019" utf-8 "question" nil))
+ oddmuse-wikis))
+ :custom
+ (oddmuse-username "bandali"))
+
+(use-package debpaste
+ :custom
+ (debpaste-paste-is-hidden t))
+
+(use-package scpaste
+ :disabled
+ :config
+ (setq scpaste-http-destination "https://p.bndl.org"
+ scpaste-scp-destination "nix:/var/www/p.bndl.org"))
+
\f
;;; Email (with Gnus)
mail-user-agent 'gnus-user-agent
read-mail-command 'gnus)
-(use-package gnus
- :bind (("s-m" . gnus)
- ("s-M" . gnus-unplugged))
+(use-feature gnus
+ :bind (("s-m" . gnus)
+ ("s-M" . gnus-unplugged)
+ ("C-c a m" . gnus)
+ ("C-c a M" . gnus-unplugged))
:init
(setq
gnus-select-method '(nnnil "")
gnus-secondary-select-methods
'((nnimap "shemshak"
- (nnimap-stream plain)
- (nnimap-address "127.0.0.1")
- (nnimap-server-port 143)
- (nnimap-authenticator plain)
- (nnimap-user "amin@shemshak.local"))
+ (nnimap-stream plain)
+ (nnimap-address "127.0.0.1")
+ (nnimap-server-port 143)
+ (nnimap-authenticator plain)
+ (nnimap-user "amin@shemshak.local"))
(nnimap "gnu"
- (nnimap-stream plain)
- (nnimap-address "127.0.0.1")
- (nnimap-server-port 143)
- (nnimap-authenticator plain)
- (nnimap-user "bandali@gnu.local")
- (nnimap-inbox "INBOX")
- (nnimap-split-methods 'nnimap-split-fancy)
- (nnimap-split-fancy (|
- ;; (: gnus-registry-split-fancy-with-parent)
- ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
- ;; gnu
- (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
- ;; *@lists.sr.ht, omitting one dot if present
- ;; add more \\.?\\([^.@]*\\) if needed
- (list ".*<~\\(.*\\)/\\([^.@]*\\)\\.?\\([^.@]*\\)@lists.sr.ht>.*" "l.~\\1.\\2\\3")
- ;; webmasters
- (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
- ;; other
- (list ".*atreus.freelists.org" "l.atreus")
- (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
- ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
- (list ".*haskell-cafe.haskell.org" "l.haskell-cafe")
- ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
- ;; (list ".*dev.lists.parabola.nu" "l.parabola-dev") ;u
- ;; ----------------------------------
- ;; legend: (u)nsubscribed | (d)ead
- ;; ----------------------------------
- ;; otherwise, leave mail in INBOX
- "INBOX")))
+ (nnimap-stream plain)
+ (nnimap-address "127.0.0.1")
+ (nnimap-server-port 143)
+ (nnimap-authenticator plain)
+ (nnimap-user "bandali@gnu.local")
+ (nnimap-inbox "INBOX")
+ (nnimap-split-methods 'nnimap-split-fancy)
+ (nnimap-split-fancy (|
+ ;; (: gnus-registry-split-fancy-with-parent)
+ ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
+ ;; gnu
+ (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
+ ;; gnus
+ (list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1")
+ ;; *.lists.sr.ht, omitting one dot if present
+ ;; add more \\.?\\([^.]*\\) if needed
+ (list ".*<~\\(.*\\)/\\([^.]*\\)\\.?\\([^.]*\\)\\.lists.sr.ht>.*" "l.~\\1.\\2\\3")
+ ;; webmasters
+ (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
+ ;; other
+ (list ".*atreus.freelists.org" "l.atreus")
+ (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
+ ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
+ (list ".*haskell-cafe.haskell.org" "l.haskell-cafe")
+ ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
+ ;; (list ".*dev.lists.parabola.nu" "l.parabola-dev") ;u
+ ;; ----------------------------------
+ ;; legend: (u)nsubscribed | (d)ead
+ ;; ----------------------------------
+ ;; otherwise, leave mail in INBOX
+ "INBOX")))
(nnimap "uw"
(nnimap-stream plain)
(nnimap-address "127.0.0.1")
(nnimap-server-port 143)
(nnimap-authenticator plain)
(nnimap-user "abandali@csc.uw.local")))
- gnus-message-archive-group "nnimap+shemshak:Sent"
+ gnus-message-archive-group "nnimap+gnu:INBOX"
gnus-parameters
'(("l\\.atreus"
(to-address . "atreus@freelists.org")
("l\\.emacs-tangents"
(to-address . "emacs-tangents@gnu.org")
(to-list . "emacs-tangents@gnu.org"))
+ ("l\\.emacsconf-committee"
+ (to-address . "emacsconf-committee@gnu.org")
+ (to-list . "emacsconf-committee@gnu.org"))
("l\\.emacsconf-discuss"
(to-address . "emacsconf-discuss@gnu.org")
(to-list . "emacsconf-discuss@gnu.org"))
(to-list . "webmasters@gnu.org"))
("gnu.*"
(gcc-self . t))
- ("gnu\\."
+ ("l\\."
(subscribed . t))
("nnimap\\+uw:.*"
(gcc-self . t)))
gnus-interactive-exit nil
gnus-gcc-mark-as-read t)
:config
- (require 'ebdb)
- (require 'ebdb-mua)
- (require 'ebdb-gnus)
-
(when (version< emacs-version "27")
(add-to-list
'nnmail-split-abbrev-alist
(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\\)")
- gnus-visible-headers
- (concat gnus-visible-headers "\\|^List-Id:\\|^X-RT-Originator:\\|^User-Agent:")
- gnus-sorted-header-list
- '("^From:" "^Subject:" "^Summary:" "^Keywords:"
- "^Followup-To:" "^To:" "^Cc:" "X-RT-Originator"
- "^Newsgroups:" "List-Id:" "^Organization:"
- "^User-Agent:" "^Date:")
+ gnus-sorted-header-list '("^From:"
+ "^X-RT-Originator"
+ "^Newsgroups:"
+ "^Subject:"
+ "^Date:"
+ "^Envelope-To:"
+ "^Followup-To:"
+ "^Reply-To:"
+ "^Organization:"
+ "^Summary:"
+ "^Abstract:"
+ "^Keywords:"
+ "^To:"
+ "^[BGF]?Cc:"
+ "^Posted-To:"
+ "^Mail-Copies-To:"
+ "^Mail-Followup-To:"
+ "^Apparently-To:"
+ "^Resent-From:"
+ "^User-Agent:"
+ "^X-detected-operating-system:"
+ "^Message-ID:"
+ ;; "^References:"
+ "^List-Id:"
+ "^Gnus-Warning:")
+ gnus-visible-headers (mapconcat 'identity
+ gnus-sorted-header-list
+ "\\|")
;; local-lapsed article dates
;; from https://www.emacswiki.org/emacs/GnusFormatting#toc11
gnus-article-date-headers '(user-defined)
: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
-GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103
-https://shemshak.org/~amin")
(defvar b/gnu-signature "Amin Bandali
-Free Software Activist | GNU Webmaster & Volunteer
+Free Software Activist | GNU Maintainer & Webmaster
GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103
https://bandali.eu.org")
+ (defvar b/shemshak-signature "Amin Bandali
+https://shemshak.org/~amin")
(defvar b/uw-signature "Amin Bandali, MMath Student
Cheriton School of Computer Science
University of Waterloo
Systems Committee
Computer Science Club, University of Waterloo
https://csclub.uwaterloo.ca/~abandali")
- (setq gnus-posting-styles
+ (setq gnus-message-replysign t
+ gnus-posting-styles
'((".*"
- (address "amin@shemshak.org")
- (body "\nBest,\n")
- (signature b/signature)
- (eval (setq b/message-cite-say-hi t)))
- ("nnimap\\+gnu:.*"
(address "bandali@gnu.org")
- (signature b/gnu-signature)
- (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org")))
+ (signature b/gnu-signature))
+ ("nnimap\\+gnu:l\\..*"
+ (signature nil))
((header "subject" "ThankCRM")
(to "webmasters-comment@gnu.org")
(body "")
(eval (setq b/message-cite-say-hi nil)))
+ ("nnimap\\+shemshak:.*"
+ (address "amin@shemshak.org")
+ (body "\nBest,\n")
+ (signature b/shemshak-signature)
+ (gcc "nnimap+shemshak:Sent")
+ (eval (setq b/message-cite-say-hi t)))
("nnimap\\+uw:.*"
- (address "abandali@uwaterloo.ca")
+ (address "bandali@uwaterloo.ca")
+ (body "\nBest,\n")
(signature b/uw-signature))
("nnimap\\+uw:INBOX"
(gcc "\"nnimap+uw:Sent Items\""))
("nnimap\\+csc:.*"
- (address "abandali@csclub.uwaterloo.ca")
+ (address "bandali@csclub.uwaterloo.ca")
(signature b/csc-signature)
- (gcc "nnimap+csc:Sent")))))
+ (gcc "nnimap+csc:Sent"))))
+ :hook (gnus-message-setup . (lambda ()
+ (unless (mml-secure-is-encrypted-p)
+ (mml-secure-message-sign)))))
-(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
+(comment
+ (use-feature gnus-utils
+ :custom
+ (gnus-completing-read-function 'gnus-ido-completing-read)))
+
+(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 mm-uu
+ :custom
+ (mm-uu-diff-groups-regexp
+ "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)"))
+
+(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
+ :bind (:map message-mode-map ("<C-return>" . b/insert-asterism))
:config
;; redefine for a simplified In-Reply-To header
;; (see https://todo.sr.ht/~sircmpwn/lists.sr.ht/67)
"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)))
+ (msg-id (mail-header-id message-reply-headers)))
(when from
msg-id))))
message-subscribed-address-functions
'(gnus-find-subscribed-addresses)
message-dont-reply-to-names
- "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")
- (require 'company-ebdb)
+ "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\)")
+ ;; (require 'company-ebdb)
:hook (;; (message-setup . mml-secure-message-sign-pgpmime)
(message-mode . flyspell-mode)
(message-mode . (lambda ()
- ;; (setq fill-column 65
- ;; message-fill-column 65)
+ ;; (setq-local fill-column b/fill-column
+ ;; message-fill-column b/fill-column)
(make-local-variable 'company-idle-delay)
(setq company-idle-delay 0.2))))
;; :custom-face
;; (message-header-subject ((t (:foreground "#111" :weight semi-bold))))
;; (message-header-to ((t (:foreground "#111" :weight normal))))
;; (message-header-cc ((t (:foreground "#333" :weight normal))))
- )
+ :custom
+ (message-elide-ellipsis "[...]\n"))
-(use-package mml
- :delight " mml")
+(use-feature 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)
("r" . footnote-renumber-footnotes)
("s" . footnote-set-style)))
+(use-package bbdb
+ :disabled
+ :demand
+ :after gnus
+ :bind (:map gnus-group-mode-map ("e" . bbdb))
+ :config
+ (bbdb-initialize 'gnus 'message)
+ :custom
+ (bbdb-complete-mail-allow-cycling t)
+ (bbdb-user-mail-address-re message-dont-reply-to-names))
+
(use-package ebdb
+ :demand
:after gnus
:bind (:map gnus-group-mode-map ("e" . ebdb))
:config
(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
-;; :after ebdb
-;; :config
-;; (ebdb-complete-enable))
-
-(use-package company-ebdb
+(use-feature ebdb-complete
+ :after ebdb
:config
- (defun company-ebdb--post-complete (_) nil))
+ ;; (setq ebdb-complete-mail 'capf)
+ (ebdb-complete-enable))
-(use-package ebdb-gnus
+(use-feature ebdb-message
+ :demand
+ :after ebdb)
+
+;; (use-package company-ebdb
+;; :config
+;; (defun company-ebdb--post-complete (_) nil))
+
+(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
+ :demand
:after ebdb
- ;; :custom (ebdb-mua-pop-up nil)
- )
+ :custom (ebdb-mua-pop-up t))
;; (use-package ebdb-message
;; :after ebdb)
(gnus-harvest-install 'message-x)
(gnus-harvest-install))))
+(use-feature gnus-article-treat-patch
+ :disabled
+ :demand
+ :load-path "lisp/"
+ :config
+ ;; note: be sure to customize faces with `:foreground "white"' when
+ ;; using a theme with a white/light background :)
+ (setq ft/gnus-article-patch-conditions
+ '("^@@ -[0-9]+,[0-9]+ \\+[0-9]+,[0-9]+ @@")))
+
\f
;;; IRC (with ERC and ZNC)
-(use-package erc
- :bind (("C-c b e" . erc-switch-to-buffer)
+(use-feature erc
+ :bind (("C-c b b" . erc-switch-to-buffer)
:map erc-mode-map
("M-a" . erc-track-switch-buffer))
:custom
(erc-server-reconnect-attempts 5)
(erc-server-reconnect-timeout 3)
:config
- (with-eval-after-load 'ivy
- ;; ignore channel buffer names
- (add-to-list 'ivy-ignore-buffers "^#"))
(defun erc-cmd-OPME ()
"Request chanserv to op me."
(erc-message "PRIVMSG"
(add-to-list 'erc-modules 'notifications)
(add-to-list 'erc-modules 'spelling)
(add-to-list 'erc-modules 'scrolltoplace)
- (erc-update-modules)
-
- (when (and (version<= "24.4" emacs-version)
- (version< emacs-version "27"))
- ;; fix erc-lurker bug
- ;; patch submitted: https://bugs.gnu.org/36843#10
- ;; TODO: remove when patch is merged and emacs 27 is released
- (defvar erc-message-parsed)
- (defun erc-display-message (parsed type buffer msg &rest args)
- "Display MSG in BUFFER.
-
-ARGS, PARSED, and TYPE are used to format MSG sensibly.
-
-See also `erc-format-message' and `erc-display-line'."
- (let ((string (if (symbolp msg)
- (apply #'erc-format-message msg args)
- msg))
- (erc-message-parsed parsed))
- (setq string
- (cond
- ((null type)
- string)
- ((listp type)
- (mapc (lambda (type)
- (setq string
- (erc-display-message-highlight type string)))
- type)
- string)
- ((symbolp type)
- (erc-display-message-highlight type string))))
-
- (if (not (erc-response-p parsed))
- (erc-display-line string buffer)
- (unless (erc-hide-current-message-p parsed)
- (erc-put-text-property 0 (length string) 'erc-parsed parsed string)
- (erc-put-text-property 0 (length string) 'rear-sticky t string)
- (when (erc-response.tags parsed)
- (erc-put-text-property 0 (length string) 'tags (erc-response.tags parsed)
- string))
- (erc-display-line string buffer)))))
-
- (defun erc-lurker-update-status (_message)
- "Update `erc-lurker-state' if necessary.
-
-This function is called from `erc-insert-pre-hook'. If the
-current message is a PRIVMSG, update `erc-lurker-state' to
-reflect the fact that its sender has issued a PRIVMSG at the
-current time. Otherwise, take no action.
-
-This function depends on the fact that `erc-display-message'
-lexically binds `erc-message-parsed', which is used to check if
-the current message is a PRIVMSG and to determine its sender.
-See also `erc-lurker-trim-nicks' and `erc-lurker-ignore-chars'.
-
-In order to limit memory consumption, this function also calls
-`erc-lurker-cleanup' once every `erc-lurker-cleanup-interval'
-updates of `erc-lurker-state'."
- (when (and (boundp 'erc-message-parsed)
- (erc-response-p erc-message-parsed))
- (let* ((command (erc-response.command erc-message-parsed))
- (sender
- (erc-lurker-maybe-trim
- (car (erc-parse-user (erc-response.sender erc-message-parsed)))))
- (server
- (erc-canonicalize-server-name erc-server-announced-name)))
- (when (equal command "PRIVMSG")
- (when (>= (cl-incf erc-lurker-cleanup-count)
- erc-lurker-cleanup-interval)
- (setq erc-lurker-cleanup-count 0)
- (erc-lurker-cleanup))
- (unless (gethash server erc-lurker-state)
- (puthash server (make-hash-table :test 'equal) erc-lurker-state))
- (puthash sender (current-time)
- (gethash server erc-lurker-state))))))))
-
-(use-package erc-fill
+ (erc-update-modules))
+
+(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 ","))
+ (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))
:custom
(erc-track-enable-keybindings nil)
(erc-track-exclude-types '("JOIN" "MODE" "NICK" "PART" "QUIT"
"324" "329" "332" "333" "353" "477"))
+ (erc-track-position-in-mode-line t)
(erc-track-priority-faces-only 'all)
(erc-track-shorten-function nil))
: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
projects / ~bandali / configs / blobdiff