- [[#header][Header]]
- [[#initial-setup][Initial setup]]
- [[#core][Core]]
+- [[#borg-essentials][Borg's =layer/essentials=]]
+- [[#editing][Editing]]
+- [[#syntax-spell-checking][Syntax and spell checking]]
+- [[#programming-modes][Programming modes]]
+- [[#emacs-enhancements][Emacs enhancements]]
+- [[#email][Email]]
+- [[#blogging][Blogging]]
- [[#post-initialization][Post initialization]]
- [[#footer][Footer]]
** First line
#+begin_src emacs-lisp :comments none
-;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t ; eval: (view-mode 1)-*-
+;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t; eval: (view-mode 1) -*-
#+end_src
Enable =view-mode=, which both makes the file read-only (as a reminder
#+begin_src emacs-lisp :comments none
;;; Commentary:
-;; Emacs configuration of Amin Bandali, computer scientist and functional
-;; programmer.
+;; Emacs configuration of Amin Bandali, computer scientist, functional
+;; programmer, and free software advocate.
;; THIS FILE IS AUTO-GENERATED FROM `init.org'.
#+end_src
-** Naming conventions
-
-The conventions below were inspired by [[https://github.com/hlissner/doom-emacs][Doom]]'s, found [[https://github.com/hlissner/doom-emacs/blob/5dacbb7cb1c6ac246a9ccd15e6c4290def67757c/core/core.el#L3-L17][here]].
-
-#+begin_src emacs-lisp :comments none
-;; Naming conventions:
-;;
-;; amin-... public variables or non-interactive functions
-;; amin--... private anything (non-interactive), not safe for direct use
-;; amin/... an interactive function; safe for M-x or keybinding
-;; amin:... an evil operator, motion, or command
-;; amin|... a hook function
-;; amin*... an advising function
-;; amin@... a hydra command
-;; ...! a macro
-#+end_src
-
* Initial setup
:PROPERTIES:
:CUSTOM_ID: initial-setup
:END:
-#+begin_src emacs-lisp :comments none
-;;; Code:
-#+end_src
-
** Emacs initialization
I'd like to do a couple of measurements of Emacs' startup time. First,
=init.el=, i.e. =user-init-file=:
#+begin_src emacs-lisp
-(defvar amin--before-user-init-time (current-time)
+(defvar a/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 amin--before-user-init-time
+ (float-time (time-subtract a/before-user-init-time
before-init-time)))
#+end_src
startup time as well.
#+begin_src emacs-lisp
-(defvar amin--gc-cons-threshold gc-cons-threshold)
-(defvar amin--gc-cons-percentage gc-cons-percentage)
-(defvar amin--file-name-handler-alist file-name-handler-alist)
+(defvar a/gc-cons-threshold gc-cons-threshold)
+(defvar a/gc-cons-percentage gc-cons-percentage)
+(defvar a/file-name-handler-alist file-name-handler-alist)
(setq gc-cons-threshold (* 400 1024 1024) ; 400 MiB
gc-cons-percentage 0.6
file-name-handler-alist nil
(add-hook
'after-init-hook
(lambda ()
- (setq gc-cons-threshold amin--gc-cons-threshold
- gc-cons-percentage amin--gc-cons-percentage
- file-name-handler-alist amin--file-name-handler-alist)))
+ (setq gc-cons-threshold a/gc-cons-threshold
+ gc-cons-percentage a/gc-cons-percentage
+ file-name-handler-alist a/file-name-handler-alist)))
#+end_src
Increase the number of lines kept in message logs (the =*Messages*=
#+begin_src emacs-lisp
(setq user-full-name "Amin Bandali"
- user-mail-address "amin@bandali.me")
+ user-mail-address "amin@aminb.org")
#+end_src
** Package management
("C-c b a" . borg-assimilate)
("C-c b b" . borg-build)
("C-c b c" . borg-clone)
- ("C-c b m" . borg-insert-update-message)
("C-c b r" . borg-remove)))
#+end_src
:bind
(("C-c b d" . epkg-describe-package)
("C-c b p" . epkg-list-packages)
- ("C-c b u" . epkg-update)))
+ ("C-c b u" . epkg-update))
+ :config
+ (eval-when-compile (defvar ivy-initial-inputs-alist))
+ (with-eval-after-load 'ivy
+ (add-to-list
+ 'ivy-initial-inputs-alist '(epkg-describe-package . "^") t)))
#+end_src
** No littering in =~/.emacs.d=
Font stack with better unicode support, around =Ubuntu Mono= and
=Hack=.
-#+begin_src emacs-lisp :tangle no
+#+begin_src emacs-lisp
(dolist (ft (fontset-list))
(set-fontset-font
ft
(setq text-scale-mode-step 1.05)
#+end_src
-** Libraries
+** Focus follows mouse
+
+I’d like focus to follow the mouse when I move the cursor from one
+window to the next.
#+begin_src emacs-lisp
-(require 'cl-lib)
-(require 'subr-x)
+(setq mouse-autoselect-window t)
#+end_src
-** Useful utilities
+Let’s define a function to conveniently disable this for certain
+buffers and/or modes.
#+begin_src emacs-lisp
-(defun amin-enlist (exp)
- "Return EXP wrapped in a list, or as-is if already a list."
-(if (listp exp) exp (list exp)))
+(defun a/no-mouse-autoselect-window ()
+ (make-local-variable 'mouse-autoselect-window)
+ (setq mouse-autoselect-window nil))
+#+end_src
-; from https://github.com/hlissner/doom-emacs/commit/589108fdb270f24a98ba6209f6955fe41530b3ef
-(defmacro after! (features &rest body)
- "A smart wrapper around `with-eval-after-load'. Supresses warnings during
-compilation."
- (declare (indent defun) (debug t))
- (list (if (or (not (bound-and-true-p byte-compile-current-file))
- (dolist (next (amin-enlist features))
- (if (symbolp next)
- (require next nil :no-error)
- (load next :no-message :no-error))))
- #'progn
- #'with-no-warnings)
- (cond ((symbolp features)
- `(eval-after-load ',features '(progn ,@body)))
- ((and (consp features)
- (memq (car features) '(:or :any)))
- `(progn
- ,@(cl-loop for next in (cdr features)
- collect `(after! ,next ,@body))))
- ((and (consp features)
- (memq (car features) '(:and :all)))
- (dolist (next (cdr features))
- (setq body `(after! ,next ,@body)))
- body)
- ((listp features)
- `(after! (:all ,@features) ,@body)))))
+** Libraries
+
+#+begin_src emacs-lisp
+(require 'cl-lib)
+(require 'subr-x)
#+end_src
+** Useful utilities
+
Convenience macro for =setq='ing multiple variables to the same value:
#+begin_src emacs-lisp
-(defmacro setq-every! (value &rest vars)
+(defmacro a/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)))
#+end_src
+The following process-related stuff from [[https://github.com/alezost/emacs-config][alezost's emacs-config]].
+
+#+begin_src emacs-lisp
+(defun a/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 a/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 #'a/start-process
+ program
+ (remove nil (list args (dired-get-file-for-visit)))))
+#+end_src
+
* Core
:PROPERTIES:
:CUSTOM_ID: core
(winner-mode 1)
#+end_src
-*** Close =*compilation*= on success
+*** Don’t display =*compilation*= on success
+
+Based on https://stackoverflow.com/a/17788551, with changes to use
+=cl-letf= instead of the now obsolete =flet=.
#+begin_src emacs-lisp
-(setq compilation-exit-message-function
- (lambda (status code msg)
- "Close the compilation window if successful."
- ;; if M-x compile exits with 0
- (when (and (eq status 'exit) (zerop code))
- (bury-buffer)
- (delete-window (get-buffer-window (get-buffer "*compilation*"))))
- ;; return the result of compilation-exit-message-function
- (cons msg code)))
+(with-eval-after-load 'compile
+ (defun a/compilation-finish-function (buffer outstr)
+ (unless (string-match "finished" outstr)
+ (switch-to-buffer-other-window buffer))
+ t)
+
+ (setq compilation-finish-functions #'a/compilation-finish-function)
+
+ (require 'cl-macs)
+
+ (defadvice compilation-start
+ (around inhibit-display
+ (command &optional mode name-function highlight-regexp))
+ (if (not (string-match "^\\(find\\|grep\\)" command))
+ (cl-letf (((symbol-function 'display-buffer) #'ignore))
+ (save-window-excursion ad-do-it))
+ ad-do-it))
+ (ad-activate 'compilation-start))
#+end_src
*** Search for non-ASCII characters
;; (setq replace-char-fold t)
#+end_src
+*** Cursor shape
+
+#+begin_src emacs-lisp
+(setq-default cursor-type 'bar)
+#+end_src
+
** Bindings
#+begin_src emacs-lisp
(bind-keys
- ("s-c e b" . eval-buffer)
- ("s-c e r" . eval-region)
+ ("C-c a i" . ielm)
+
+ ("C-c e b" . eval-buffer)
+ ("C-c e r" . eval-region)
+
+ ("C-c F m" . make-frame-command)
+ ("C-c F d" . delete-frame)
+ ("C-c F D" . delete-other-frames)
+
+ ("C-c o" . other-window)
+
+ ("C-c Q" . save-buffers-kill-terminal)
+
+ ("C-S-h C" . describe-char)
+ ("C-S-h F" . describe-face)
+
+ ("C-x K" . kill-this-buffer)
("s-p" . beginning-of-buffer)
("s-n" . end-of-buffer))
'auto-compile-inhibit-compile-detached-git-head))
#+end_src
-*** [[https://github.com/noctuid/general.el][general]]
-
-#+begin_src emacs-lisp
-(use-package general
- :demand t
- :config
- (general-evil-setup t)
- (general-override-mode)
-
- (general-create-definer
- amin--leader-keys
- :keymaps 'override
- :states '(emacs normal visual motion insert)
- :non-normal-prefix "M-m"
- :prefix "SPC"))
-#+end_src
-
-*** [[https://github.com/emacs-evil/evil][evil]]
-
-#+begin_src emacs-lisp
-(use-package evil
- :demand t
- ;; :hook (org-src-mode . evil-motion-state)
- :config
- (evil-mode 1)
- (general-swap-key nil '(normal motion) ";" ":")
-
- (setq evil-want-visual-char-semi-exclusive t
- evil-cross-lines t)
-
- ;; custom mode state mappings
- (dolist (mspair '((ebdb-mode . emacs)
- (term-mode . emacs)
- (helpful-mode . motion)
- (view-mode . motion)))
- (evil-set-initial-state (car mspair) (cdr mspair)))
-
- ;; fix tab and indentation in src blocks inside org-mode buffer
- ;; also see https://git.sr.ht/~bandali/dotfiles/commit/0e2ffd584aafdd4cf256bcdf2473f01c3aaaed55
- (unbind-key "TAB" evil-motion-state-map)
-
- (unbind-key "C-d" evil-insert-state-map)
- (unbind-key "C-v" evil-insert-state-map)
- (unbind-key "C-y" evil-insert-state-map)
- (unbind-key "C-a" evil-insert-state-map)
- (unbind-key "C-e" evil-insert-state-map)
- (unbind-key "C-p" evil-insert-state-map)
- (unbind-key "C-n" evil-insert-state-map)
- (unbind-key "C-k" evil-insert-state-map)
- (bind-keys
- :map evil-insert-state-map
- ("C-k" . kill-line)
- ("C-S-k" . evil-insert-digraph)
- :map evil-motion-state-map
- ([down-mouse-1] . nil)))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-escape
- :after evil
- :init
- (setq evil-escape-excluded-states '(normal visual multiedit emacs motion)
- evil-escape-excluded-major-modes '(neotree-mode)
- evil-escape-key-sequence "jk"
- evil-escape-delay 0.25)
- ;; :general
- ;; (:states '(insert replace visual operator)
- ;; "C-g" #'evil-escape)
- :config
- (evil-escape-mode 1)
- ;; no `evil-escape' in minibuffer
- (push #'minibufferp evil-escape-inhibit-functions))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-nerd-commenter
- :after evil
- :general
- (nmap
- "gc" 'evilnc-comment-operator
- "gy" 'evilnc-copy-and-comment-lines))
-#+end_src
-
-#+begin_src emacs-lisp
-(use-package evil-surround
- :after evil
- :general
- (omap
- "s" 'evil-surround-edit
- "S" 'evil-Surround-edit)
- (vmap
- "S" 'evil-surround-region
- "gS" 'evil-Surround-region))
-#+end_src
-
-#+begin_src emacs-lisp
-(amin--leader-keys
- "/" '(:ignore t :wk "search")
-
- "a" '(:ignore t :wk "apps")
- "a i" 'ielm
-
- "a s" '(:ignore t :wk "shells/terms")
-
- "b" '(:ignore t :wk "buffers")
- "b k" 'kill-this-buffer
- "b s" 'save-buffer
-
- "e" '(:ignore t :wk "eval")
- "e b" 'eval-buffer
- "e r" 'eval-region
-
- "f" '(:ignore t :wk "files")
-
- "F" '(:ignore t :wk "frames")
- "F m" 'make-frame-command
- "F d" 'delete-frame
- "F D" 'delete-other-frames
-
- "h" '(:ignore t :wk "help(ful)")
- "h c" 'describe-char
- "h f" 'describe-function
- "h F" 'describe-face
- "h H" 'view-hello-file
- "h i" 'info
- "h k" 'describe-key
- "h l" 'view-lossage
- "h v" 'describe-variable
-
- "o" 'other-window
-
- "w" '(:ignore t :wk "window")
- "w o" 'other-window
- "w 0" 'delete-window
- "w 1" 'delete-other-windows
- "w 2" 'split-window-below
- "w 3" 'split-window-right
- "w u" 'winner-undo
- "w r" 'winner-redo
-
- "q" '(:ignore t :wk "quit")
- "q q" 'save-buffers-kill-terminal)
-#+end_src
-
*** [[https://orgmode.org/][Org mode]]
#+begin_quote
#+begin_src emacs-lisp
(use-package org
:defer 1
- :general
- (amin--leader-keys
- :states 'normal
- :keymaps 'org-mode-map
- "'" 'org-edit-special)
- (amin--leader-keys
- :definer 'minor-mode
- :states 'normal
- :keymaps 'org-src-mode
- "'" 'org-edit-src-exit
- "k" 'org-edit-src-abort)
- (general-define-key
- :definer 'minor-mode
- :states 'normal
- :keymaps 'org-src-mode
- "q" 'org-edit-src-exit)
:config
(setq org-src-tab-acts-natively t
org-src-preserve-indentation nil
org-edit-src-content-indentation 0
org-email-link-description-format "Email %c: %s" ; %.30s
org-highlight-latex-and-related '(entities)
+ org-use-speed-commands t
+ org-startup-folded 'content
+ org-catch-invisible-edits 'show-and-error
org-log-done 'time)
(add-to-list 'org-structure-template-alist '("L" . "src emacs-lisp") t)
- (after! org-src
- (define-key org-src-mode-map [remap evil-write] 'org-edit-src-save)
- (define-key org-src-mode-map [remap evil-save-and-close]
- (lambda () (interactive)
- (org-edit-src-save)
- (org-edit-src-exit)))
- (define-key org-src-mode-map [remap evil-save-modified-and-close]
- (lambda () (interactive)
- (org-edit-src-save)
- (org-edit-src-exit)))
- (define-key org-src-mode-map [remap evil-quit] 'org-edit-src-abort))
(font-lock-add-keywords
'org-mode
'(("[ \t]*\\(#\\+\\(BEGIN\\|END\\|begin\\|end\\)_\\(\\S-+\\)\\)[ \t]*\\([^\n:]*\\)"
(use-package ox-beamer
:after ox)
-(use-package ob-tangle
- :general
- (amin--leader-keys
- :states 'normal
- :keymaps 'org-mode-map
- "b t" 'org-babel-tangle))
-
(use-package orgalist
:after message
:hook (message-mode . orgalist-mode))
**** asynchronous tangle
-=amin/async-babel-tangle= is a function closely inspired by [[https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles][dieggsy's
+=a/async-babel-tangle= is a function closely inspired by [[https://github.com/dieggsy/dotfiles/tree/cc10edf7701958eff1cd94d4081da544d882a28c/emacs.d#dotfiles][dieggsy's
d/async-babel-tangle]] which uses [[https://github.com/jwiegley/emacs-async][async]] to asynchronously tangle an org
file.
#+begin_src emacs-lisp
-(after! org
- (defvar amin-show-async-tangle-results nil
+(with-eval-after-load 'org
+ (defvar a/show-async-tangle-results nil
"Keep *emacs* async buffers around for later inspection.")
- (defvar amin-show-async-tangle-time nil
+ (defvar a/show-async-tangle-time nil
"Show the time spent tangling the file.")
- (defvar amin-async-tangle-post-compile "make ti"
+ (defvar a/async-tangle-post-compile "make ti"
"If non-nil, pass to `compile' after successful tangle.")
- (defun amin/async-babel-tangle ()
+ (defun a/async-babel-tangle ()
"Tangle org file asynchronously."
(interactive)
(let* ((file-tangle-start-time (current-time))
(file (buffer-file-name))
(file-nodir (file-name-nondirectory file))
- (async-quiet-switch "-q"))
+ ;; (async-quiet-switch "-q")
+ )
(async-start
`(lambda ()
(require 'org)
(org-babel-tangle-file ,file))
- (unless amin-show-async-tangle-results
+ (unless a/show-async-tangle-results
`(lambda (result)
(if result
(progn
(message "Tangled %s%s"
,file-nodir
- (if amin-show-async-tangle-time
+ (if a/show-async-tangle-time
(format " (%.3fs)"
(float-time (time-subtract (current-time)
',file-tangle-start-time)))
""))
- (when amin-async-tangle-post-compile
- (compile amin-async-tangle-post-compile)))
+ (when a/async-tangle-post-compile
+ (compile a/async-tangle-post-compile)))
(message "Tangling %s failed" ,file-nodir))))))))
(add-to-list
'safe-local-variable-values
- '(eval add-hook 'after-save-hook #'amin/async-babel-tangle 'append 'local))
+ '(eval add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local))
#+end_src
*** [[https://magit.vc/][Magit]]
#+begin_src emacs-lisp
(use-package magit
:defer 1
- :general (amin--leader-keys "g s" 'magit-status)
- :bind ("s-g" . magit-status)
+ :bind (("C-x g" . magit-status)
+ ("s-g s" . magit-status)
+ ("s-g l" . magit-log-buffer-file))
:config
(magit-add-section-hook 'magit-status-sections-hook
'magit-insert-modules
#+begin_src emacs-lisp
(use-package ivy
:defer 1
- :general (amin--leader-keys "," 'ivy-switch-buffer)
:bind
(:map ivy-minibuffer-map
([escape] . keyboard-escape-quit)
#+begin_src emacs-lisp
(use-package swiper
- :general (:states '(normal motion) "/" 'swiper)
- :bind (("C-s" . swiper)
- ("C-r" . swiper)))
+ :bind (("C-s" . swiper)
+ ("C-r" . swiper)
+ ("C-S-s" . isearch-forward)))
#+end_src
**** Counsel
#+begin_src emacs-lisp
(use-package counsel
:defer 1
- :general
- (amin--leader-keys
- "r" 'counsel-recentf
- "SPC" 'counsel-M-x
- "." 'counsel-find-file)
:bind (([remap execute-extended-command] . counsel-M-x)
([remap find-file] . counsel-find-file)
("s-r" . counsel-recentf)
(use-package eshell
:defer 1
:commands eshell
+ :bind ("C-c a s e" . eshell)
:config
(eval-when-compile (defvar eshell-prompt-regexp))
- (defun amin/eshell-quit-or-delete-char (arg)
+ (defun a/eshell-quit-or-delete-char (arg)
(interactive "p")
(if (and (eolp) (looking-back eshell-prompt-regexp nil))
(eshell-life-is-too-much)
(delete-char arg)))
- (defun amin/eshell-clear ()
+ (defun a/eshell-clear ()
(interactive)
(let ((inhibit-read-only t))
(erase-buffer))
(eshell-send-input))
- (defun amin|eshell-setup ()
+ (defun a/eshell-setup ()
(make-local-variable 'company-idle-delay)
+ (defvar company-idle-delay)
(setq company-idle-delay nil)
(bind-keys :map eshell-mode-map
- ("C-d" . amin/eshell-quit-or-delete-char)
- ("C-S-l" . amin/eshell-clear)
+ ("C-d" . a/eshell-quit-or-delete-char)
+ ("C-S-l" . a/eshell-clear)
("M-r" . counsel-esh-history)
([tab] . company-complete)))
- :hook (eshell-mode . amin|eshell-setup)
+ :hook (eshell-mode . a/eshell-setup)
:custom
(eshell-hist-ignoredups t)
(eshell-input-filter 'eshell-input-filter-initial-space))
#+begin_src emacs-lisp
(use-package ibuffer
:defer t
- :general (amin--leader-keys "b b" 'ibuffer-other-window)
:bind
(("C-x C-b" . ibuffer-other-window)
:map ibuffer-mode-map
'(("default"
("dired" (mode . dired-mode))
("org" (mode . org-mode))
+ ("gnus"
+ (or
+ (mode . gnus-group-mode)
+ (mode . gnus-summary-mode)
+ (mode . gnus-article-mode)
+ ;; not really, but...
+ (mode . message-mode)))
("web"
(or
(mode . web-mode)
("shell"
(or
(mode . eshell-mode)
- (mode . shell-mode)))
- ("notmuch" (name . "\*notmuch\*"))
+ (mode . shell-mode)
+ (mode . term-mode)))
("programming"
(or
(mode . python-mode)
+ (mode . c-mode)
(mode . c++-mode)
- (mode . emacs-lisp-mode)))
+ (mode . emacs-lisp-mode)
+ (mode . scheme-mode)
+ (mode . haskell-mode)
+ (mode . lean-mode)))
("emacs"
(or
(name . "^\\*scratch\\*$")
- (name . "^\\*Messages\\*$")))
- ("slack"
- (or
- (name . "^\\*Slack*"))))))
+ (name . "^\\*Messages\\*$"))))))
(ibuffer-formats
'((mark modified read-only locked " "
(name 18 18 :left :elide)
("<s-tab>" . outline-toggle-children)
("M-p" . outline-previous-visible-heading)
("M-n" . outline-next-visible-heading)
- :prefix-map amin--outline-prefix-map
+ :prefix-map a/outline-prefix-map
:prefix "s-o"
("TAB" . outline-toggle-children)
("a" . outline-hide-body)
#+end_src
* Borg's =layer/essentials=
+:PROPERTIES:
+:CUSTOM_ID: borg-essentials
+:END:
TODO: break this giant source block down into individual org sections.
(global-diff-hl-mode)
(add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh t))
+(use-package ls-lisp
+ :custom (ls-lisp-dirs-first t))
+
(use-package dired
:defer t
- :config (setq dired-listing-switches "-alh"))
+ :config
+ (setq dired-listing-switches "-alh"
+ ls-lisp-use-insert-directory-program nil)
+
+ ;; easily diff 2 marked files
+ ;; https://oremacs.com/2017/03/18/dired-ediff/
+ (defun dired-ediff-files ()
+ (interactive)
+ (defvar ediff-after-quit-hook-internal)
+ (let ((files (dired-get-marked-files))
+ (wnd (current-window-configuration)))
+ (if (<= (length files) 2)
+ (let ((file1 (car files))
+ (file2 (if (cdr files)
+ (cadr files)
+ (read-file-name
+ "file: "
+ (dired-dwim-target-directory)))))
+ (if (file-newer-than-file-p file1 file2)
+ (ediff-files file2 file1)
+ (ediff-files file1 file2))
+ (add-hook 'ediff-after-quit-hook-internal
+ (lambda ()
+ (setq ediff-after-quit-hook-internal nil)
+ (set-window-configuration wnd))))
+ (error "no more than 2 files should be marked"))))
+ :bind (:map dired-mode-map
+ ("e" . dired-ediff-files)
+ ("E" . dired-toggle-read-only)
+ ("\\" . dired-hide-details-mode)
+ ("z" . (lambda ()
+ (interactive)
+ (a/dired-start-process "zathura"))))
+ :hook (dired-mode . dired-hide-details-mode))
(use-package eldoc
:when (version< "25" emacs-version)
(add-to-list 'tramp-default-proxies-alist
(list (regexp-quote (system-name)) nil nil)))
-(use-package undo-tree
- :config
- (global-undo-tree-mode -1))
- ;; :bind (("C-?" . undo-tree-undo)
- ;; ("M-_" . undo-tree-redo))
- ;; :config
- ;; (global-undo-tree-mode)
- ;; (setq undo-tree-mode-lighter ""
- ;; undo-tree-auto-save-history t))
#+end_src
* Editing
+:PROPERTIES:
+:CUSTOM_ID: editing
+:END:
** Company
#+end_src
* Syntax and spell checking
+:PROPERTIES:
+:CUSTOM_ID: syntax-spell-checking
+:END:
+
#+begin_src emacs-lisp
(use-package flycheck
:defer 3
(advice-add #'ispell-parse-output :filter-args
#'endless/replace-quote))
#+end_src
+
* Programming modes
+:PROPERTIES:
+:CUSTOM_ID: programming-modes
+:END:
** [[http://alloytools.org][Alloy]] (with [[https://github.com/dwwmmn/alloy-mode][alloy-mode]])
:defer t
:mode "\\.html\\'"
:config
- (setq-every! 2
+ (a/setq-every 2
web-mode-code-indent-offset
web-mode-css-indent-offset
web-mode-markup-indent-offset))
:hook (web-mode css-mode html-mode sgml-mode))
#+end_src
-** Nix
-
-#+begin_src emacs-lisp
-(use-package nix-mode
- :defer t
- :mode "\\.nix\\'")
-#+end_src
-
-** Java
+** COMMENT Java
*** meghanada
-#+begin_src emacs-lisp :tangle no
+#+begin_src emacs-lisp
(use-package meghanada
:bind
(:map meghanada-mode-map
treemacs
#+end_comment
-#+begin_src emacs-lisp :tangle no
+#+begin_src emacs-lisp
(use-package treemacs
:config (setq treemacs-never-persist t))
:after (treemacs))
#+end_src
-* Emacs Enhancements
+** geiser
+
+#+begin_src emacs-lisp
+(use-package geiser)
+
+(use-package geiser-guile
+ :config
+ (setq geiser-guile-load-path "~/src/git/guix"))
+#+end_src
+
+** guix
+
+#+begin_src emacs-lisp
+(use-package guix
+ :load-path "lib/guix/elisp")
+#+end_src
+
+* Emacs enhancements
+:PROPERTIES:
+:CUSTOM_ID: emacs-enhancements
+:END:
** [[https://github.com/justbur/emacs-which-key][which-key]]
(load-theme 'tangomod t)
#+end_src
-** doom-modeline
+** smart-mode-line
#+begin_src emacs-lisp
-(use-package doom-modeline
- :demand t
- :config (setq doom-modeline-height 32)
- :hook (after-init . doom-modeline-init))
+(use-package smart-mode-line
+ :config
+ (sml/setup))
#+end_src
** doom-themes
** theme helper functions
#+begin_src emacs-lisp
-(defun amin/lights-on ()
+(defun a/lights-on ()
"Enable my favourite light theme."
(interactive)
- (progn
- (mapc #'disable-theme custom-enabled-themes)
- (load-theme 'tangomod t)))
+ (mapc #'disable-theme custom-enabled-themes)
+ (load-theme 'tangomod t)
+ (sml/apply-theme 'automatic))
-(defun amin/lights-off ()
+(defun a/lights-off ()
"Go dark."
(interactive)
- (progn
- (mapc #'disable-theme custom-enabled-themes)
- (load-theme 'doom-tomorrow-night t)))
+ (mapc #'disable-theme custom-enabled-themes)
+ (load-theme 'doom-tomorrow-night t)
+ (sml/apply-theme 'automatic))
-(amin--leader-keys
- "t" '(:ignore t :wk "theme")
- "t d" 'amin/lights-off
- "t l" 'amin/lights-on)
+(bind-keys
+ ("s-t d" . a/lights-off)
+ ("s-t l" . a/lights-on))
#+end_src
** [[https://github.com/bbatsov/crux][crux]]
#+begin_src emacs-lisp
(use-package crux
:defer 1
- :general
- (amin--leader-keys
- "b K" 'crux-kill-other-buffers
- "c d" 'crux-duplicate-current-line-or-region
- "c D" 'crux-duplicate-and-comment-current-line-or-region
- "f c" 'crux-copy-file-preserve-attributes
- "f d" 'crux-delete-file-and-buffer
- "f r" 'crux-rename-file-and-buffer)
- :bind (("C-c d" . crux-duplicate-current-line-or-region)
- ("C-c D" . crux-duplicate-and-comment-current-line-or-region)
- ("C-S-j" . crux-top-join-line)
- ("C-c j" . crux-top-join-line)))
+ :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)
+ ("C-c j" . crux-top-join-line)
+ ("C-S-j" . crux-top-join-line)))
#+end_src
** [[https://github.com/alezost/mwim.el][mwim]]
#+begin_src emacs-lisp
(use-package mwim
- :general
- (:states '(normal visual)
- "0" 'mwim-beginning-of-code-or-line
- "$" 'mwim-end-of-code-or-line)
:bind (("C-a" . mwim-beginning-of-code-or-line)
("C-e" . mwim-end-of-code-or-line)
("<home>" . mwim-beginning-of-line-or-code)
(advice-add 'magit-checkout
:after #'my-projectile-invalidate-cache)
(advice-add 'magit-branch-and-checkout
- :after #'my-projectile-invalidate-cache))))
+ :after #'my-projectile-invalidate-cache)))
+ :custom (projectile-completion-system 'ivy))
#+end_src
** [[https://github.com/Wilfred/helpful][helpful]]
#+begin_src emacs-lisp
(use-package helpful
:defer 1
- :general
- (amin--leader-keys
- "h h" '(:ignore t :wk "helpful")
- "h h c" 'helpful-command
- "h h f" 'helpful-callable ; helpful-function
- "h h v" 'helpful-variable
- "h h k" 'helpful-key
- "h h p" 'helpful-at-point))
-#+end_src
-
-** [[https://github.com/knu/shell-toggle.el][shell-toggle]]
-
-#+begin_src emacs-lisp
-(use-package shell-toggle
- :after eshell
- :general (amin--leader-keys "a s e" 'amin/shell-toggle)
- :bind ("C-c e" . amin/shell-toggle)
- :config
- (defun amin/shell-toggle (make-cd)
- "Toggle between the shell buffer and whatever buffer you are editing.
-With a prefix argument MAKE-CD also insert a \"cd DIR\" command
-into the shell, where DIR is the directory of the current buffer.
-
-When called in the shell buffer returns you to the buffer you were editing
-before calling this the first time.
-
-Options: `shell-toggle-goto-eob'"
- (interactive "P")
- ;; Try to decide on one of three possibilities:
- ;; If not in shell-buffer, switch to it.
- ;; If in shell-buffer, return to state before going to the shell-buffer
- (if (eq (current-buffer) shell-toggle-shell-buffer)
- (shell-toggle-buffer-return-from-shell)
- (progn
- (shell-toggle-buffer-goto-shell make-cd)
- (if shell-toggle-full-screen-window-only (delete-other-windows)))))
-
- ;; override to split horizontally instead
- (defun shell-toggle-buffer-switch-to-other-window ()
- "Switch to other window.
-If the current window is the only window in the current frame,
-create a new window and switch to it.
-
-\(This is less intrusive to the current window configuration than
-`switch-buffer-other-window')"
- (let ((this-window (selected-window)))
- (other-window 1)
- ;; If we did not switch window then we only have one window and need to
- ;; create a new one.
- (if (eq this-window (selected-window))
- (progn
- (split-window-horizontally)
- (other-window 1)))))
-
- :custom
- (shell-toggle-launch-shell 'shell-toggle-eshell))
+ :bind
+ (("C-S-h c" . helpful-command)
+ ("C-S-h f" . helpful-callable) ; helpful-function
+ ("C-S-h v" . helpful-variable)
+ ("C-S-h k" . helpful-key)
+ ("C-S-h p" . helpful-at-point)))
#+end_src
** [[https://github.com/EricCrosson/unkillable-scratch][unkillable-scratch]]
(use-package boxquote
:defer 3
:bind
- (:prefix-map amin--boxquote-prefix-map
+ (:prefix-map a/boxquote-prefix-map
:prefix "C-c q"
("b" . boxquote-buffer)
("B" . boxquote-insert-buffer)
Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
-** COMMENT [[https://github.com/DarthFennec/highlight-indent-guides][highlight-indent-guides]] :ARCHIVE:
-
-#+begin_src emacs-lisp
-(use-package highlight-indent-guides
- :defer 3
- :hook ((prog-mode . highlight-indent-guides-mode)
- ;; (org-mode . highlight-indent-guides-mode)
- )
- :config
- (setq highlight-indent-guides-character ?\|)
- (setq highlight-indent-guides-auto-enabled nil)
- (setq highlight-indent-guides-method 'character)
- (setq highlight-indent-guides-responsive 'top)
- (set-face-foreground 'highlight-indent-guides-character-face "gainsboro")
- (set-face-foreground 'highlight-indent-guides-top-character-face "grey40")) ; grey13 is nice too
-#+end_src
-
-** pdf-tools
-
-#+begin_src emacs-lisp
-(use-package pdf-tools
- :defer t
- :magic ("%PDF" . pdf-view-mode)
- :config
- (setq pdf-view-resize-factor 1.05)
- (pdf-tools-install)
- :bind
- (:map pdf-view-mode-map
- ("C-s" . isearch-forward)
- ("C-r" . isearch-backward)
- ("j" . pdf-view-next-line-or-next-page)
- ("k" . pdf-view-previous-line-or-previous-page)
- ("h" . image-backward-hscroll)
- ("l" . image-forward-hscroll)))
-#+end_src
-
-** anzu
-
-#+begin_src emacs-lisp
-(use-package anzu)
-#+end_src
-
** typo.el
#+begin_src emacs-lisp
:hook (text-mode . typo-mode))
#+end_src
-** slack
-
-Hopefully temporary.
-
-#+begin_src emacs-lisp
-(use-package slack
- :commands (slack-start)
- :init
- (eval-when-compile ; silence the byte-compiler
- (defvar url-http-data nil)
- (defvar url-http-extra-headers nil)
- (defvar url-http-method nil)
- (defvar url-callback-function nil)
- (defvar url-callback-arguments nil)
- (defvar oauth--token-data nil))
- (setq slack-buffer-emojify t
- slack-prefer-current-team t)
- :config
- (slack-register-team
- :name "uw-apv"
- :default t
- :client-id uw-apv-client-id
- :client-secret uw-apv-client-secret
- :token uw-apv-token
- :subscribed-channels '(general)
- :full-and-display-names t)
- (slack-register-team
- :name "watform"
- :default nil
- :client-id watform-client-id
- :client-secret watform-client-secret
- :token watform-token
- :subscribed-channels '(general)
- :full-and-display-names t)
- (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t)
- (setq lui-time-stamp-format "[%Y-%m-%d %H:%M:%S]"
- lui-time-stamp-only-when-changed-p t
- lui-time-stamp-position 'right)
- :bind
- (("C-c s s" . slack-start)
- ("C-c s u" . slack-select-unread-rooms)
- ("C-c s b" . slack-select-rooms)
- ("C-c s t" . slack-change-current-team)
- ("C-c s c" . slack-ws-close)
- :map slack-mode-map
- ("M-p" . slack-buffer-goto-prev-message)
- ("M-n" . slack-buffer-goto-next-message)
- ("C-c e" . slack-message-edit)
- ("C-c k" . slack-message-delete)
- ("C-c C-k" . slack-channel-leave)
- ("C-c r a" . slack-message-add-reaction)
- ("C-c r r" . slack-message-remove-reaction)
- ("C-c r s" . slack-message-show-reaction-users)
- ("C-c p l" . slack-room-pins-list)
- ("C-c p a" . slack-message-pins-add)
- ("C-c p r" . slack-message-pins-remove)
- ("@" . slack-message-embed-mention)
- ("#" . slack-message-embed-channel)))
-
-(use-package alert
- :commands (alert)
- :init
- (setq alert-default-style 'notifier))
-#+end_src
-
** hl-todo
#+begin_src emacs-lisp
""))))
#+end_src
-** magithub
-
-For when I /have to/ use GH.
-
-#+begin_src emacs-lisp
-(use-package magithub
- :after magit
- :config
- (magithub-feature-autoinject t)
- (setq magithub-clone-default-directory "~/src/git"))
-#+end_src
-
** [[https://github.com/peterwvj/eshell-up][eshell-up]]
#+begin_src emacs-lisp
#+begin_src emacs-lisp
(use-package multi-term
:defer 1
- :general (amin--leader-keys
- "a s m" 'multi-term
- "a s p" 'multi-term-dedicated-toggle)
- :bind ("C-c C-j" . term-line-mode)
+ :bind (("C-c a s m m" . multi-term)
+ ("C-c a s m p" . multi-term-dedicated-toggle)
+ :map term-mode-map
+ ("C-c C-j" . term-char-mode)
+ :map term-raw-map
+ ("C-c C-j" . term-line-mode))
:config
(setq multi-term-program "/bin/screen"
;; TODO: add separate bindings for connecting to existing
'("C-z" "C-x" "C-c" "C-h" "C-y" "<ESC>")))
#+end_src
+** page-break-lines
+
+#+begin_src emacs-lisp
+(use-package page-break-lines
+ :config
+ (global-page-break-lines-mode))
+#+end_src
+
+** expand-region
+
+#+begin_src emacs-lisp
+(use-package expand-region
+ :bind ("C-=" . er/expand-region))
+#+end_src
+
+** multiple-cursors
+
+#+begin_src emacs-lisp
+(use-package multiple-cursors
+ :bind
+ (("C-S-<mouse-1>" . mc/add-cursor-on-click)
+ (:prefix-map a/mc-prefix-map
+ :prefix "C-c m"
+ ("c" . mc/edit-lines)
+ ("n" . mc/mark-next-like-this)
+ ("p" . mc/mark-previous-like-this)
+ ("a" . mc/mark-all-like-this))))
+#+end_src
+
* Email
+:PROPERTIES:
+:CUSTOM_ID: email
+:END:
#+begin_src emacs-lisp
-(defvar amin-maildir (expand-file-name "~/mail/"))
-(after! recentf
- (add-to-list 'recentf-exclude amin-maildir))
+(defvar a/maildir (expand-file-name "~/mail/"))
+(with-eval-after-load 'recentf
+ (add-to-list 'recentf-exclude a/maildir))
#+end_src
** Gnus
#+begin_src emacs-lisp
(setq
- amin-gnus-init-file (no-littering-expand-etc-file-name "gnus")
- mail-user-agent 'gnus-user-agent
- read-mail-command 'gnus)
+ a/gnus-init-file (no-littering-expand-etc-file-name "gnus")
+ mail-user-agent 'gnus-user-agent
+ read-mail-command 'gnus)
(use-package gnus
- :general
- (amin--leader-keys
- "m" 'gnus
- "M" 'gnus-unplugged)
- :bind (("s-m" . gnus)
- ("s-M" . gnus-unplugged))
+ :bind (("s-m" . gnus)
+ ("s-M" . gnus-unplugged))
:init
(setq
gnus-select-method '(nnnil "")
(use-package gnus-sum
:bind (:map gnus-summary-mode-map
- :prefix-map amin--gnus-summary-prefix-map
+ :prefix-map a/gnus-summary-prefix-map
:prefix "v"
("r" . gnus-summary-reply)
("w" . gnus-summary-wide-reply)
:map gnus-summary-mode-map
("r" . gnus-summary-reply-with-original)
("R" . gnus-summary-wide-reply-with-original)
- ("M-L" . org-store-link)))
+ ("M-L" . org-store-link))
+ :hook (gnus-summary-mode . a/no-mouse-autoselect-window))
(use-package gnus-msg
:config
(setq gnus-posting-styles
'((".*"
- (address "amin@bandali.me")
+ (address "amin@aminb.org")
(body "\nBest,\namin\n")
- (signature-file "~/.signature-amin")
- (eval (setq amin--message-cite-say-hi t)))
+ (eval (setq a/message-cite-say-hi t)))
("gnu.*"
- (address "bandali@gnu.org")
- (signature-file nil))
+ (address "bandali@gnu.org"))
((header "subject" "ThankCRM")
(to "webmasters-comment@gnu.org")
(body "\nAdded to 2018supporters.html.\n\nMoving to campaigns.\n\n-amin\n")
- (eval (setq amin--message-cite-say-hi nil)))
+ (eval (setq a/message-cite-say-hi nil)))
("nnimap\\+uwaterloo:.*"
(address "abandali@uwaterloo.ca")
- (gcc "\"nnimap+uwaterloo:Sent Items\"")
- (signature-file nil)))))
+ (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
(use-package gnus-topic
:hook (gnus-group-mode . gnus-topic-mode))
#+begin_src emacs-lisp
(use-package message
:config
- (defconst amin--message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:")
+ (defconst a/message-cite-style-format "On %Y-%m-%d %l:%M %p, %N wrote:")
(defconst message-cite-style-bandali
'((message-cite-function 'message-cite-original)
(message-citation-line-function 'message-insert-formatted-citation-line)
(message-yank-cited-prefix ">")
(message-yank-empty-prefix ">")
(message-citation-line-format
- (if amin--message-cite-say-hi
- (concat "Hi %F,\n\n" amin--message-cite-style-format)
- amin--message-cite-style-format)))
+ (if a/message-cite-say-hi
+ (concat "Hi %F,\n\n" a/message-cite-style-format)
+ a/message-cite-style-format)))
"Citation style based on Mozilla Thunderbird's. Use with message-cite-style.")
(setq message-cite-style 'message-cite-style-bandali
message-kill-buffer-on-exit t
message-send-mail-function 'message-send-mail-with-sendmail
message-sendmail-envelope-from 'header
message-dont-reply-to-names
- "\\(\\(amin@bandali\\.me\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)"
+ "\\(\\(.*@aminb\\.org\\)\\|\\(amin@bandali\\.me\\)\\|\\(\\(aminb?\\|mab\\|bandali\\)@gnu\\.org\\)\\|\\(\\(m\\|a\\(min\\.\\)?\\)bandali@uwaterloo\\.ca\\)\\)"
message-user-fqdn "aminb.org")
:hook (;; (message-setup . mml-secure-message-sign-pgpmime)
(message-mode . flyspell-mode)
;; (message-header-cc ((t (:foreground "#333" :weight normal))))
)
-(after! mml-sec
+(with-eval-after-load 'mml-sec
(setq mml-secure-openpgp-encrypt-to-self t
mml-secure-openpgp-sign-with-sender t))
#+end_src
:after message
:bind
(:map message-mode-map
- :prefix-map amin--footnote-prefix-map
+ :prefix-map a/footnote-prefix-map
:prefix "C-c f"
("a" . footnote-add-footnote)
("b" . footnote-back-to-message)
footnote-style 'unicode))
#+end_src
-** bbdb
+** ebdb
+
+#+begin_src emacs-lisp
+(use-package ebdb
+ :defer 1
+ :bind (:map gnus-group-mode-map ("e" . ebdb))
+ :config
+ (setq ebdb-sources (no-littering-expand-var-file-name "ebdb"))
+ (with-eval-after-load 'swiper
+ (add-to-list 'swiper-font-lock-exclude 'ebdb-mode t)))
+
+(use-package ebdb-com
+ :after ebdb)
-Manually install bbdb (=lisp/bbdb= copied from an ELPA-based setup),
-because installing it from source on Emacs 27 using the following
-submodule configuration for some reason doesn’t work and results in
-very strange errors when using any of the functions.
+;; (use-package ebdb-complete
+;; :after ebdb
+;; :config
+;; (ebdb-complete-enable))
-#+begin_src conf :tangle no
-[submodule "bbdb"]
- path = lib/bbdb
- url = https://git.savannah.nongnu.org/git/bbdb.git
- load-path = lisp
- info-path = doc
- build-step = ./autogen.sh
- build-step = ./configure
- build-step = make
- build-step = make install
-#+end_src
+(use-package company-ebdb
+ :after (:all company message)
+ :config
+ (defun company-ebdb--post-complete (_) nil)
+ :hook
+ (message-mode . (lambda ()
+ (add-to-list (make-local-variable 'company-backends)
+ 'company-ebdb))))
+
+(use-package 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
+ :after ebdb
+ ;; :custom (ebdb-mua-pop-up nil)
+ )
-I tried using =borg-elpa= instead of doing it like this, but it added
-2 seconds to my startup time, which is unacceptable to me.
+;; (use-package ebdb-message
+;; :after ebdb)
-#+begin_src emacs-lisp
-(use-package bbdb
- :load-path "lisp/bbdb"
- :init
- (load (expand-file-name "lisp/bbdb/bbdb-autoloads.el" user-emacs-directory))
- ;; (bbdb-mua-auto-update-init 'message)
- (setq bbdb-mua-auto-update-p 'query
- bbdb-complete-mail nil)
- (bbdb-initialize 'gnus 'message))
+
+;; (use-package ebdb-vcard
+;; :after ebdb)
#+end_src
** COMMENT message-x
#+end_src
* Blogging
+:PROPERTIES:
+:CUSTOM_ID: blogging
+:END:
+
** [[https://ox-hugo.scripter.co][ox-hugo]]
#+begin_src emacs-lisp
#+begin_src emacs-lisp
(message "Loading %s...done (%.3fs)" user-init-file
(float-time (time-subtract (current-time)
- amin--before-user-init-time)))
+ a/before-user-init-time)))
#+end_src
* Footer
* COMMENT Local Variables :ARCHIVE:
# Local Variables:
-# eval: (add-hook 'after-save-hook #'amin/async-babel-tangle 'append 'local)
+# eval: (add-hook 'after-save-hook #'a/async-babel-tangle 'append 'local)
+# eval: (typo-mode -1)
# End:
projects / ~bandali / configs / blobdiff