diff options
Diffstat (limited to 'init.el')
| -rw-r--r-- | init.el | 1233 |
1 files changed, 533 insertions, 700 deletions
@@ -41,8 +41,6 @@ "Value of `current-time' when Emacs begins loading `user-init-file'.") (defvar b/emacs-initialized nil "Whether Emacs has been initialized.") -(defvar b/exwm-p (string= (system-name) "chaman") - "Whether or not we will be using `exwm'.") (when (not (bound-and-true-p b/emacs-initialized)) (message "Loading Emacs...done (%.3fs)" @@ -68,7 +66,7 @@ gc-cons-threshold b/gc-cons-threshold gc-cons-percentage b/gc-cons-percentage file-name-handler-alist b/file-name-handler-alist) - (when b/exwm-p + (when (featurep 'exwm-workspace) (with-eval-after-load 'exwm-workspace (setq-default mode-line-format @@ -106,45 +104,40 @@ '(("git@github.com:" . "https://github.com/") ("git@gitlab.com:" . "https://gitlab.com/")))) -;; use-package -(if nil ; set to t when need to debug init - (progn - (setq use-package-verbose t - use-package-expand-minimally nil - use-package-compute-statistics t - debug-on-error t) - (require 'use-package)) - (setq use-package-verbose nil - use-package-expand-minimally t)) +(defmacro csetq (&rest args) + "Set the value of user option VAR to VALUE. -(setq use-package-always-defer t) -(require 'bind-key) +More generally, you can use multiple variables and values, as in + (csetq VAR VALUE VAR VALUE...) +This sets each user option VAR's value to the corresponding VALUE. + +\(fn [VAR VALUE]...)" + (declare (debug setq)) + `(progn + ,@(cl-loop for (var value) on args by 'cddr + collect + `(funcall (or (get ',var 'custom-set) #'set-default) + ',var ,value)))) ;;; Initial setup ;; 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)) - -(use-package auto-compile - :demand - :config - (auto-compile-on-load-mode) - (auto-compile-on-save-mode) - (setq auto-compile-display-buffer nil) - (setq auto-compile-mode-line-counter t) - (setq auto-compile-source-recreate-deletes-dest t) - (setq auto-compile-toggle-deletes-nonlib-dest t) - (setq auto-compile-update-autoloads t)) +(require 'no-littering) +(defalias 'b/etc 'no-littering-expand-etc-file-name) +(defalias 'b/var 'no-littering-expand-var-file-name) + +(require 'auto-compile) +(auto-compile-on-load-mode) +(auto-compile-on-save-mode) +(setq auto-compile-display-buffer nil) +(setq auto-compile-mode-line-counter t) +(setq auto-compile-source-recreate-deletes-dest t) +(setq auto-compile-toggle-deletes-nonlib-dest t) +(setq auto-compile-update-autoloads t) ;; separate custom file (don't want it mixing with init.el) -(use-package custom - :no-require - :config +(with-eval-after-load 'custom (setq custom-file (b/etc "custom.el")) (when (file-exists-p custom-file) (load custom-file)) @@ -163,9 +156,8 @@ ;; start up emacs server. see ;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html#Emacs-Server -(use-package server - :defer 0.5 - :config +(run-with-idle-timer 0.5 nil #'require 'server) +(with-eval-after-load 'server (declare-function server-edit "server") (bind-key "C-c F D" 'server-edit) (declare-function server-running-p "server") @@ -176,7 +168,7 @@ ;;;; C-level customizations -(setq +(csetq ;; minibuffer enable-recursive-minibuffers t resize-mini-windows t @@ -244,93 +236,75 @@ ;;;; Elisp-level customizations -(use-package startup - :no-require - :demand - :config - ;; don't need to see the startup echo area message - (advice-add #'display-startup-echo-area-message :override #'ignore) - :custom - ;; 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-package files - :no-require - :demand - :custom - ;; backups (C-h v make-backup-files RET) - (backup-by-copying t) - (version-control t) - (delete-old-versions t) - - ;; auto-save - (auto-save-file-name-transforms - `((".*" ,(b/var "auto-save/") t))) - - ;; insert newline at the end of files - (require-final-newline t) - - ;; open read-only file buffers in view-mode - ;; (enables niceties like `q' for quit) - (view-read-only t)) - +;; startup +;; don't need to see the startup echo area message +(advice-add #'display-startup-echo-area-message :override #'ignore) +(csetq + ;; 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) + +;; files +(csetq + ;; backups (C-h v make-backup-files RET) + backup-by-copying t + version-control t + delete-old-versions t + ;; auto-save + auto-save-file-name-transforms `((".*" ,(b/var "auto-save/") t)) + ;; insert newline at the end of files + require-final-newline t + ;; open read-only file buffers in view-mode + ;; (enables niceties like `q' for quit) + view-read-only t) + +;; novice ;; disable disabled commands -(setq disabled-command-function nil) +(csetq disabled-command-function nil) ;; lazy-person-friendly yes/no prompts (defalias 'yes-or-no-p #'y-or-n-p) ;; enable automatic reloading of changed buffers and files -(use-package autorevert - :demand - :config - (global-auto-revert-mode 1) - :custom - (auto-revert-verbose nil) - (global-auto-revert-non-file-buffers nil)) +(progn ; autorevert + (csetq auto-revert-verbose nil + global-auto-revert-non-file-buffers nil) + (require 'autorevert) + (global-auto-revert-mode 1)) ;; time and battery in mode-line -(use-package time - :demand - :config - (display-time-mode) - :custom - (display-time-default-load-average nil) - (display-time-format " %a %b %-e %-l:%M%P") - (display-time-mail-icon '(image :type xpm :file "gnus/gnus-pointer.xpm" :ascent center)) - (display-time-use-mail-icon t)) - -(use-package battery - :demand - :config - (display-battery-mode) - :custom - (battery-mode-line-format "%p%% %t")) - -(use-package fringe - :demand - :config - ;; smaller fringe - ;; (fringe-mode '(3 . 1)) - (fringe-mode nil)) - -(use-package winner - :demand - :config - ;; enable winner-mode (C-h f winner-mode RET) - (winner-mode 1)) - -(use-package compile - :config +(csetq + display-time-default-load-average nil + display-time-format " %a %b %-e %-l:%M%P" + display-time-mail-icon '(image :type xpm + :file "gnus/gnus-pointer.xpm" + :ascent center) + display-time-use-mail-icon t) +(require 'time) +(display-time-mode) + +(csetq battery-mode-line-format "%p%% %t") +(require 'battery) +(display-battery-mode) + +(require 'fringe) +;; smaller fringe +;; (fringe-mode '(3 . 1)) +(fringe-mode nil) + +(require 'winner) +;; enable winner-mode (C-h f winner-mode RET) +(winner-mode 1) + +(with-eval-after-load 'compile ;; 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'. @@ -352,147 +326,116 @@ ad-do-it)) (ad-activate 'compilation-start)) -(use-package 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)) - +;; isearch +(csetq + ;; 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) + +;; replace ;; uncomment to extend the above behaviour to query-replace -(comment - (use-package replace - :custom - (replace-char-fold t))) - -(use-package vc - :bind ("C-x v C-=" . vc-ediff)) - -(use-package vc-git - :after vc - :custom - (vc-git-print-log-follow t)) - -(use-package ediff - :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo) - :custom ((ediff-window-setup-function 'ediff-setup-windows-plain) - (ediff-split-window-function 'split-window-horizontally))) - -(use-package face-remap - :custom - ;; gentler font resizing - (text-scale-mode-step 1.05)) - -(use-package mwheel - :defer 0.4 - :config - (setq mouse-wheel-scroll-amount '(1 ((shift) . 1)) ; one line at a time - mouse-wheel-progressive-speed nil ; don't accelerate scrolling - mouse-wheel-follow-mouse t)) ; scroll window under mouse - -(use-package pixel-scroll - :defer 0.4 - :config (pixel-scroll-mode 1)) - -(use-package epg-config - :config - ;; ask for GPG passphrase in minibuffer - ;; this will fail if gpg>=2.1 is not available - (setq epg-pinentry-mode 'loopback) - :custom - (epg-gpg-program (executable-find "gpg"))) - -(use-package epg - :after epg-config) - -(use-package pinentry - :disabled - :demand - :after (epa epg server) - :config - ;; workaround for systemd-based distros: - ;; (setq pinentry--socket-dir server-socket-dir) - (pinentry-start)) - -(use-package auth-source - :custom - (auth-sources '("~/.authinfo.gpg")) - (authinfo-hidden (regexp-opt '("password" "client-secret" "token")))) +;; (csetq replace-char-fold t) + +;; vc +(global-set-key (kbd "C-x v C-=") #'vc-ediff) + +(with-eval-after-load 'vc-git + (csetq vc-git-print-log-follow t)) + +(csetq ediff-window-setup-function 'ediff-setup-windows-plain + ediff-split-window-function 'split-window-horizontally) +(with-eval-after-load 'ediff + (add-hook 'ediff-after-quit-hook-internal #'winner-undo)) + +;; face-remap +(csetq + ;; gentler font resizing + text-scale-mode-step 1.05) + +(run-with-idle-timer 0.4 nil #'require 'mwheel) +(csetq 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 + +(run-with-idle-timer 0.4 nil #'require 'pixel-scroll) +(with-eval-after-load 'pixel-scroll + (pixel-scroll-mode 1)) + +;; epg-config +(csetq + epg-gpg-program (executable-find "gpg") + ;; ask for GPG passphrase in minibuffer + ;; this will fail if gpg>=2.1 is not available + epg-pinentry-mode 'loopback) + +;; (require 'pinentry) +;; workaround for systemd-based distros: +;; (setq pinentry--socket-dir server-socket-dir) +;; (pinentry-start) + +;; auth-source +(csetq + auth-sources '("~/.authinfo.gpg") + authinfo-hidden (regexp-opt '("password" "client-secret" "token"))) -;;; General bindings +;;; General key bindings -(bind-keys - ("C-a" . b/move-indentation-or-beginning-of-line) - ("C-c a i" . ielm) - ("C-c d" . b/duplicate-line-or-region) +(global-set-key (kbd "C-a") #'b/move-indentation-or-beginning-of-line) +(global-set-key (kbd "C-c a i") #'ielm) +(global-set-key (kbd "C-c d") #'b/duplicate-line-or-region) +(global-set-key (kbd "C-S-j") #'b/join-line-top) +(global-set-key (kbd "C-c x") #'execute-extended-command) - ("C-c e b" . eval-buffer) - ("C-c e e" . eval-last-sexp) - ("C-c e p" . pp-macroexpand-last-sexp) - ("C-c e r" . eval-region) +;; evaling and macro-expanding +(global-set-key (kbd "C-c e b") #'eval-buffer) +(global-set-key (kbd "C-c e e") #'eval-last-sexp) +(global-set-key (kbd "C-c e p") #'pp-macroexpand-last-sexp) +(global-set-key (kbd "C-c e r") #'eval-region) - ("C-c e i" . emacs-init-time) - ("C-c e u" . emacs-uptime) - ("C-c e v" . emacs-version) +;; emacs things +(global-set-key (kbd "C-c e i") #'emacs-init-time) +(global-set-key (kbd "C-c e u") #'emacs-uptime) +(global-set-key (kbd "C-c e v") #'emacs-version) - ("C-c f ." . find-file) - ("C-c f d" . find-name-dired) - ("C-c f l" . find-library) +;; finding +(global-set-key (kbd "C-c f .") #'find-file) +(global-set-key (kbd "C-c f d") #'find-name-dired) +(global-set-key (kbd "C-c f l") #'find-library) - ("C-c F m" . make-frame-command) - ("C-c F d" . delete-frame) +;; frames +(global-set-key (kbd "C-c F m") #'make-frame-command) +(global-set-key (kbd "C-c F d") #'delete-frame) - ("C-S-h C" . describe-char) - ("C-S-h F" . describe-face) +;; help/describe +(global-set-key (kbd "C-S-h C") #'describe-char) +(global-set-key (kbd "C-S-h F") #'describe-face) - ("C-S-j" . b/join-line-top) +;; (global-set-key (kbd "C-x k") #'b/kill-current-buffer) +;; (global-set-key (kbd "C-x K") #'kill-buffer) +;; (global-set-key (kbd "C-x s") #'save-buffer) +;; (global-set-key (kbd "C-x S") #'save-some-buffers) - ("C-c x" . execute-extended-command) - - ("C-x k" . b/kill-current-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)) +(define-key emacs-lisp-mode-map (kbd "<C-return>") #'b/add-elisp-section) (when (display-graphic-p) - (unbind-key "C-z" global-map)) - -(bind-keys - ;; for back and forward mouse keys - ("<XF86Back>" . previous-buffer) - ("<mouse-8>" . previous-buffer) - ;; ("<drag-mouse-8>" . previous-buffer) - ("<XF86Forward>" . next-buffer) - ("<mouse-9>" . next-buffer) - ;; ("<drag-mouse-9>" . next-buffer) - ;; ("<drag-mouse-2>" . kill-this-buffer) - ;; ("<drag-mouse-3>" . switch-to-buffer) - ) + (global-unset-key (kbd "C-z"))) ;;; Essential packages -(when b/exwm-p - (require 'bandali-exwm)) +;; (require 'bandali-exwm) (require 'bandali-org) (require 'bandali-theme) ;; *the* right way to do git -(use-package magit - :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 +(with-eval-after-load 'magit (declare-function magit-add-section-hook "magit-section" (hook function &optional at append local)) (magit-add-section-hook 'magit-status-sections-hook @@ -503,42 +446,44 @@ ;; 'magit-insert-ignored-files ;; 'magit-insert-untracked-files ;; 'append) - (setq magit-repository-directories '(("~/.emacs.d/" . 0) - ("~/src/git/" . 2))) + (declare-function magit-display-buffer-fullframe-status-v1 + "magit-mode" (buffer)) + (csetq + magit-diff-refine-hunk t + magit-repository-directories '(("~/.emacs.d/" . 0) + ("~/src/git/" . 2)) + ;; magit-completing-read-function 'magit-ido-completing-read + magit-display-buffer-function + #'magit-display-buffer-fullframe-status-v1) (nconc magit-section-initial-visibility-alist '(([unpulled status] . show) ([unpushed status] . show))) - (declare-function magit-display-buffer-fullframe-status-v1 "magit-mode" (buffer)) - :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))))) - -(use-package magit-extras - :after magit - :config - (setq magit-pop-revision-stack-format - (pcase-let ((`(,pt ,_eob ,index-regexp) - (default-value 'magit-pop-revision-stack-format))) - `(,pt "[%N: %h]: %ci\n %s + (custom-set-faces '(magit-diff-file-heading ((t (:weight normal))))) + + (with-eval-after-load 'magit-extras + (csetq + magit-pop-revision-stack-format + (pcase-let ((`(,pt ,_eob ,index-regexp) + (default-value 'magit-pop-revision-stack-format))) + `(,pt "[%N: %h]: %ci\n %s https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=%H" - ,index-regexp)))) + ,index-regexp))))) +;; global key bindings +(global-set-key (kbd "C-x g") #'magit-status) +(global-set-key (kbd "C-c g b") #'magit-blame-addition) +(global-set-key (kbd "C-c g l") #'magit-log-buffer-file) +(global-set-key (kbd "C-c g y") #'magit-pop-revision-stack) ;; recently opened files -(use-package recentf - :defer 0.2 - :config - (add-to-list 'recentf-keep 'file-remote-p) - :config - (recentf-mode) - :custom - (recentf-max-saved-items 2000)) +(run-with-idle-timer 0.2 nil #'require 'recentf) +(with-eval-after-load 'recentf + (csetq recentf-max-saved-items 2000) + (add-to-list 'recentf-keep #'file-remote-p) + (recentf-mode)) ;; needed for history for counsel -(use-package amx - :defer 0.3 - :config +(run-with-idle-timer 0.3 nil #'require 'amx) +(with-eval-after-load 'amx (amx-mode)) ;; (require 'bandali-ido) @@ -549,221 +494,172 @@ (require 'bandali-ibuffer) -(use-package outline - :disabled - :hook (prog-mode . outline-minor-mode) - :bind - (:map - outline-minor-mode-map - ("<s-tab>" . outline-toggle-children) - ("M-p" . outline-previous-visible-heading) - ("M-n" . outline-next-visible-heading) - :prefix-map b/outline-prefix-map - :prefix "s-O" - ("TAB" . outline-toggle-children) - ("a" . outline-hide-body) - ("H" . outline-hide-body) - ("S" . outline-show-all) - ("h" . outline-hide-subtree) - ("s" . outline-show-subtree)) - :config - (when (featurep 'which-key) - (which-key-add-key-based-replacements - "C-c @" "outline" - "s-O" "outline"))) +;; outline +;; (with-eval-after-load 'outline +;; (when (featurep 'which-key) +;; (which-key-add-key-based-replacements +;; "C-c @" "outline" +;; "s-O" "outline")) +;; (define-key outline-minor-mode-map (kbd "<s-tab>") +;; #'outline-toggle-children) +;; (define-key outline-minor-mode-map (kbd "M-p") +;; #'outline-previous-visible-heading) +;; (define-key outline-minor-mode-map (kbd "M-n") +;; #'outline-next-visible-heading) +;; (defvar b/outline-prefix-map) +;; (define-prefix-command 'b/outline-prefix-map) +;; (define-key outline-minor-mode-map (kbd "s-O") +;; 'b/outline-prefix-map) +;; (define-key b/outline-prefix-map (kbd "TAB") +;; #'outline-toggle-children) +;; (define-key b/outline-prefix-map (kbd "a") +;; #'outline-hide-body) +;; (define-key b/outline-prefix-map (kbd "H") +;; #'outline-hide-body) +;; (define-key b/outline-prefix-map (kbd "S") +;; #'outline-show-all) +;; (define-key b/outline-prefix-map (kbd "h") +;; #'outline-hide-subtree) +;; (define-key b/outline-prefix-map (kbd "s") +;; #'outline-show-subtree)) +;; (add-hook 'prog-mode-hook #'outline-minor-mode) (require 'bandali-dired) -(use-package help - :bind - (:map help-mode-map - ("p" . backward-button) - ("n" . forward-button)) - :config +(with-eval-after-load 'help (temp-buffer-resize-mode) - (setq help-window-select t)) + (csetq help-window-select t) -(use-package tramp - :config + ;; local key bindings + (define-key help-mode-map (kbd "p") #'backward-button) + (define-key help-mode-map (kbd "n") #'forward-button)) + +(with-eval-after-load 'tramp (add-to-list 'tramp-default-proxies-alist '(nil "\\`root\\'" "/ssh:%h:")) (add-to-list 'tramp-default-proxies-alist '("localhost" nil nil)) (add-to-list 'tramp-default-proxies-alist (list (regexp-quote (system-name)) nil nil))) -(use-package doc-view - :bind (:map doc-view-mode-map - ("M-RET" . image-previous-line))) +(with-eval-after-load 'doc-view + (define-key doc-view-mode-map (kbd "M-RET") #'image-previous-line)) -(use-package shr - :custom - (shr-max-width 80)) +(csetq shr-max-width 80) ;; Email (with Gnus, message, and EBDB) (require 'bandali-gnus) -(use-package sendmail - :config - (setq sendmail-program (executable-find "msmtp") - ;; message-sendmail-extra-arguments '("-v" "-d") - mail-specify-envelope-from t - mail-envelope-from 'header)) +(with-eval-after-load 'sendmail + (csetq sendmail-program (executable-find "msmtp") + ;; message-sendmail-extra-arguments '("-v" "-d") + mail-specify-envelope-from t + mail-envelope-from 'header)) (require 'bandali-message) (require 'bandali-ebdb) ;; IRC (with ERC and ZNC) (require 'bandali-erc) -(use-package scpaste - :config - (setq scpaste-http-destination "https://p.bndl.org" - scpaste-scp-destination "p:~")) +(with-eval-after-load 'scpaste + (csetq scpaste-http-destination "https://p.bndl.org" + scpaste-scp-destination "p:~")) ;;; Editing -;; highlight uncommitted changes in the left fringe -(use-package diff-hl - :disabled - :defer 0.6 - :config - (setq diff-hl-draw-borders nil) - (global-diff-hl-mode) - :hook - ((magit-pre-refresh . diff-hl-magit-pre-refresh) - (magit-post-refresh . diff-hl-magit-post-refresh))) - ;; display Lisp objects at point in the echo area -(use-package eldoc - :when (version< "25" emacs-version) - :config (global-eldoc-mode)) +(when (version< "25" emacs-version) + (with-eval-after-load 'eldoc + (global-eldoc-mode))) ;; highlight matching parens -(use-package paren - :demand - :config (show-paren-mode)) - -(use-package elec-pair - :disabled - :demand - :config (electric-pair-mode)) - -(use-package 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)) +(require 'paren) +(show-paren-mode) + +;; (require 'elec-pair) +;; (electric-pair-mode) + +(csetq + ;; 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) +(with-eval-after-load 'simple + (column-number-mode)) ;; save minibuffer history -(use-package savehist - :demand - :config - (savehist-mode) - (add-to-list 'savehist-additional-variables 'kill-ring)) +(require 'savehist) +(savehist-mode) +(add-to-list 'savehist-additional-variables 'kill-ring) ;; automatically save place in files -(use-package saveplace - :when (version< "25" emacs-version) - :config (save-place-mode)) - -(use-package prog-mode - :config (global-prettify-symbols-mode) - (defun indicate-buffer-boundaries-left () - (setq indicate-buffer-boundaries 'left)) - (add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left)) - -(use-package 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 - :mode "\\.*rc$") - -(use-package sh-script - :mode ("\\.bashrc$" . sh-mode)) - -(use-package company - :disabled - :bind - (:map company-active-map - ([tab] . company-complete-common-or-cycle) - ([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) - ) - -(use-package flycheck - :disabled - :defer 0.6 - :hook (prog-mode . flycheck-mode) - :bind - (:map flycheck-mode-map - ("M-P" . flycheck-previous-error) - ("M-N" . flycheck-next-error)) - :config - ;; Use the load-path from running Emacs when checking elisp files - (setq flycheck-emacs-lisp-load-path 'inherit) - - ;; Only flycheck when I actually save the buffer - (setq flycheck-check-syntax-automatically '(mode-enabled save)) - :custom (flycheck-mode-line-prefix "flyc")) - -;; (use-package flyspell) - +(when (version< "25" emacs-version) + (save-place-mode)) + +(defun indicate-buffer-boundaries-left () + (csetq indicate-buffer-boundaries 'left)) +(with-eval-after-load 'prog-mode + (global-prettify-symbols-mode)) +(add-hook 'prog-mode-hook #'indicate-buffer-boundaries-left) + +(define-key text-mode-map (kbd "C-*") #'b/insert-asterism) +(add-hook 'text-mode-hook #'indicate-buffer-boundaries-left) +(add-hook 'text-mode-hook #'flyspell-mode) + +(add-to-list 'auto-mode-alist '("\\.*rc$" . conf-mode)) + +(add-to-list 'auto-mode-alist '("\\.bashrc$" . sh-mode)) + +;; flycheck +;; (run-with-idle-timer 0.6 nil #'require 'flycheck) +;; (with-eval-after-load 'flycheck +;; (csetq +;; ;; Use the load-path from running Emacs when checking elisp files +;; flycheck-emacs-lisp-load-path 'inherit +;; ;; Only flycheck when I actually save the buffer +;; flycheck-check-syntax-automatically '(mode-enabled save) +;; flycheck-mode-line-prefix "flyc")) +;; (define-key flycheck-mode-map (kbd "M-P") #'flycheck-previous-error) +;; (define-key flycheck-mode-map (kbd "M-N") #'flycheck-next-error) +;; (add-hook 'prog-mode-hook #'flycheck-mode) + +;; ispell ;; http://endlessparentheses.com/ispell-and-apostrophes.html -(use-package ispell - :disabled - :defer 0.6 - :config - ;; ’ can be part of a word - (setq ispell-local-dictionary-alist - `((nil "[[:alpha:]]" "[^[:alpha:]]" - "['\x2019]" nil ("-B") nil utf-8)) - ispell-program-name (executable-find "hunspell")) - ;; don't send ’ to the subprocess - (defun endless/replace-apostrophe (args) - (cons (replace-regexp-in-string - "’" "'" (car args)) - (cdr args))) - (advice-add #'ispell-send-string :filter-args - #'endless/replace-apostrophe) - - ;; convert ' back to ’ from the subprocess - (defun endless/replace-quote (args) - (if (not (derived-mode-p 'org-mode)) - args - (cons (replace-regexp-in-string - "'" "’" (car args)) - (cdr args)))) - (advice-add #'ispell-parse-output :filter-args - #'endless/replace-quote)) - -(use-package abbrev - :hook (text-mode . abbrev-mode)) +;; (run-with-idle-timer 0.6 nil #'require 'ispell) +;; (with-eval-after-load 'ispell +;; ;; ’ can be part of a word +;; (csetq ispell-local-dictionary-alist +;; `((nil "[[:alpha:]]" "[^[:alpha:]]" +;; "['\x2019]" nil ("-B") nil utf-8)) +;; ispell-program-name (executable-find "hunspell")) +;; ;; don't send ’ to the subprocess +;; (defun endless/replace-apostrophe (args) +;; (cons (replace-regexp-in-string +;; "’" "'" (car args)) +;; (cdr args))) +;; (advice-add #'ispell-send-string :filter-args +;; #'endless/replace-apostrophe) +;; ;; convert ' back to ’ from the subprocess +;; (defun endless/replace-quote (args) +;; (if (not (derived-mode-p 'org-mode)) +;; args +;; (cons (replace-regexp-in-string +;; "'" "’" (car args)) +;; (cdr args)))) +;; (advice-add #'ispell-parse-output :filter-args +;; #'endless/replace-quote)) + +(add-hook 'text-mode-hook #'abbrev-mode) ;;; Programming modes -(use-package lisp-mode - :config +(with-eval-after-load 'lisp-mode (defun indent-spaces-mode () (setq indent-tabs-mode nil)) (add-hook 'lisp-interaction-mode-hook #'indent-spaces-mode)) -(use-package alloy-mode - :mode "\\.\\(als\\|dsh\\)\\'" - :config - (setq alloy-basic-offset 2) +(with-eval-after-load 'alloy-mode + (csetq alloy-basic-offset 2) ;; (defun b/alloy-simple-indent (start end) ;; (interactive "r") ;; ;; (if (region-active-p) @@ -773,80 +669,60 @@ ;; ;; (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)))) - -(use-package lean-mode - :disabled - :defer 0.4 - :init (eval-when-compile (defvar lean-mode-map)) - :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 sgml-mode - :config - (setq sgml-basic-offset 0)) - -(use-package css-mode - :config - (setq css-indent-offset 2)) - -(use-package geiser - :disabled) - -(use-package geiser-guile - :disabled - :config - (setq geiser-guile-load-path "~/src/git/guix")) - -(use-package guix - :disabled) - -(use-package go-mode - :disabled) - -(use-package po-mode - :disabled - :hook - (po-mode . (lambda () (run-with-timer 0.1 nil 'View-exit)))) - -(use-package auctex - :disabled - :custom - (font-latex-fontify-sectioning 'color)) - -(use-package tex-mode - :config + ;; local key bindings + (define-key alloy-mode-map (kbd "RET") #'electric-newline-and-maybe-indent) + ;; (define-key alloy-mode-map (kbd "TAB") #'b/alloy-simple-indent) + (define-key alloy-mode-map (kbd "TAB") #'indent-for-tab-command)) +(add-to-list 'auto-mode-alist '("\\.\\(als\\|dsh\\)\\'" . alloy-mode)) +(add-hook 'alloy-mode-hook (lambda nil (setq-local indent-tabs-mode nil))) + +;; lean +;; (eval-when-compile (defvar lean-mode-map)) +;; (run-with-idle-timer 0.4 nil #'require 'lean-mode) +;; (with-eval-after-load 'lean-mode +;; (require 'lean-input) +;; (csetq default-input-method "Lean" +;; lean-input-tweak-all '(lean-input-compose +;; (lean-input-prepend "/") +;; (lean-input-nonempty)) +;; lean-input-user-translations '(("/" "/"))) +;; (lean-input-setup) +;; ;; local key bindings +;; (define-key lean-mode-map (kbd "S-SPC") #'company-complete)) + +(with-eval-after-load 'sgml-mode + (csetq sgml-basic-offset 0)) + +(with-eval-after-load 'css-mode + (csetq css-indent-offset 2)) + +;; po-mode +;; (add-hook 'po-mode-hook (lambda nil (run-with-timer 0.1 nil 'View-exit))) + +;; auctex +;; (csetq font-latex-fontify-sectioning 'color) + +(with-eval-after-load 'tex-mode (cl-delete-if (lambda (p) (string-match "^---?" (car p))) - 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\\'") + tex--prettify-symbols-alist)) +(add-hook 'tex-mode-hook #'auto-fill-mode) +(add-hook 'tex-mode-hook #'flyspell-mode) ;;; Emacs enhancements & auxiliary packages -(use-package man - :config (setq Man-width 80)) - -(use-package which-key - :defer 0.4 - :config +(with-eval-after-load 'man + (csetq Man-width 80)) + +(run-with-idle-timer 0.4 nil #'require 'which-key) +(with-eval-after-load 'which-key + (csetq + which-key-add-column-padding 5 + which-key-idle-delay 10000 + which-key-idle-secondary-delay 0.05 + which-key-max-description-length 32 + which-key-show-early-on-C-h t) (which-key-add-key-based-replacements ;; prefixes for global prefixes and minor modes "C-c !" "flycheck" @@ -875,218 +751,175 @@ "C-S-h" "help(ful)" "C-c q" "boxquote" "C-c t" "themes") - ;; prefixes for major modes (which-key-add-major-mode-key-based-replacements 'org-mode "C-c C-v" "org-babel") - - (which-key-mode) - :custom - (which-key-add-column-padding 5) - (which-key-idle-delay 10000) - (which-key-idle-secondary-delay 0.05) - (which-key-max-description-length 32) - (which-key-show-early-on-C-h t)) + (which-key-mode)) ;; (require 'bandali-projectile) -(use-package helpful - :disabled - :defer 0.6 - :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))) - -(use-package unkillable-scratch - :defer 0.6 - :config - (unkillable-scratch 1) - :custom - (unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$"))) +(run-with-idle-timer 0.6 nil #'require 'unkillable-scratch) +(with-eval-after-load 'unkillable-scratch + (csetq unkillable-buffers '("^\\*scratch\\*$" "^\\*Messages\\*$")) + (unkillable-scratch 1)) ;; ,---- ;; | make pretty boxed quotes like this ;; `---- -(use-package boxquote - :defer 0.6 - :bind - (:prefix-map - b/boxquote-prefix-map - :prefix "C-c q" - ("b" . boxquote-buffer) - ("B" . boxquote-insert-buffer) - ("d" . boxquote-defun) - ("F" . boxquote-insert-file) - ("hf" . boxquote-describe-function) - ("hk" . boxquote-describe-key) - ("hv" . boxquote-describe-variable) - ("hw" . boxquote-where-is) - ("k" . boxquote-kill) - ("p" . boxquote-paragraph) - ("q" . boxquote-boxquote) - ("r" . boxquote-region) - ("s" . boxquote-shell-command) - ("t" . boxquote-text) - ("T" . boxquote-title) - ("u" . boxquote-unbox) - ("U" . boxquote-unbox-region) - ("y" . boxquote-yank) - ("M-q" . boxquote-fill-paragraph) - ("M-w" . boxquote-kill-ring-save))) - -(use-package hl-todo +(run-with-idle-timer 0.6 nil #'require 'boxquote) +(with-eval-after-load 'boxquote + (defvar b/boxquote-prefix-map) + (define-prefix-command 'b/boxquote-prefix-map) + (global-set-key (kbd "C-c q") 'b/boxquote-prefix-map) + (define-key b/boxquote-prefix-map (kbd "b") #'boxquote-buffer) + (define-key b/boxquote-prefix-map (kbd "B") #'boxquote-insert-buffer) + (define-key b/boxquote-prefix-map (kbd "d") #'boxquote-defun) + (define-key b/boxquote-prefix-map (kbd "F") #'boxquote-insert-file) + (define-key b/boxquote-prefix-map (kbd "hf") #'boxquote-describe-function) + (define-key b/boxquote-prefix-map (kbd "hk") #'boxquote-describe-key) + (define-key b/boxquote-prefix-map (kbd "hv") #'boxquote-describe-variable) + (define-key b/boxquote-prefix-map (kbd "hw") #'boxquote-where-is) + (define-key b/boxquote-prefix-map (kbd "k") #'boxquote-kill) + (define-key b/boxquote-prefix-map (kbd "p") #'boxquote-paragraph) + (define-key b/boxquote-prefix-map (kbd "q") #'boxquote-boxquote) + (define-key b/boxquote-prefix-map (kbd "r") #'boxquote-region) + (define-key b/boxquote-prefix-map (kbd "s") #'boxquote-shell-command) + (define-key b/boxquote-prefix-map (kbd "t") #'boxquote-text) + (define-key b/boxquote-prefix-map (kbd "T") #'boxquote-title) + (define-key b/boxquote-prefix-map (kbd "u") #'boxquote-unbox) + (define-key b/boxquote-prefix-map (kbd "U") #'boxquote-unbox-region) + (define-key b/boxquote-prefix-map (kbd "y") #'boxquote-yank) + (define-key b/boxquote-prefix-map (kbd "M-q") #'boxquote-fill-paragraph) + (define-key b/boxquote-prefix-map (kbd "M-w") #'boxquote-kill-ring-save)) + +(run-with-idle-timer 0.5 nil #'require 'hl-todo) +(with-eval-after-load 'hl-todo ;; highlight TODOs in buffers - :defer 0.5 - :config (global-hl-todo-mode)) -(use-package page-break-lines - :defer 0.5 - :custom - (page-break-lines-max-width fill-column) - :config +(run-with-idle-timer 0.5 nil #'require 'page-break-lines) +(with-eval-after-load 'page-break-lines + (csetq page-break-lines-max-width fill-column) (global-page-break-lines-mode)) -(use-package expand-region - :bind ("C-=" . er/expand-region)) - -(require 'bandali-yasnippet) - -(use-package debbugs - :bind - (("C-c D d" . debbugs-gnu) - ("C-c D b" . debbugs-gnu-bugs) - ("C-c D e" . - (lambda () - (interactive) ; bug-gnu-emacs - (setq debbugs-gnu-current-suppress t) - (debbugs-gnu debbugs-gnu-default-severities '("emacs")))) - ("C-c D g" . ; bug-gnuzilla - (lambda () - (interactive) - (setq debbugs-gnu-current-suppress t) - (debbugs-gnu debbugs-gnu-default-severities '("gnuzilla")))) - ("C-c D G b" . ; bug-guix - (lambda () - (interactive) - (setq debbugs-gnu-current-suppress t) - (debbugs-gnu debbugs-gnu-default-severities '("guix")))) - ("C-c D G p" . ; guix-patches - (lambda () - (interactive) - (setq debbugs-gnu-current-suppress t) - (debbugs-gnu debbugs-gnu-default-severities '("guix-patches")))))) +;; expand-region +(global-set-key (kbd "C-=") #'er/expand-region) + +(run-with-idle-timer 0.6 nil #'require 'yasnippet) +(with-eval-after-load 'yasnippet + (declare-function yas-reload-all + "yasnippet" (&optional no-jit interactive)) + (declare-function yas-maybe-expand-abbrev-key-filter + "yasnippet" (cmd)) + + (defconst yas-verbosity-cur yas-verbosity) + (setq yas-verbosity 2) + (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-abbrev-key-filter (cmd) + (when (and (yas-maybe-expand-abbrev-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-abbrev-key-filter)) + (define-key yas-minor-mode-map (kbd "SPC") b/yas-maybe-expand) + + (yas-global-mode)) + +;; debbugs +(global-set-key (kbd "C-c D d") #'debbugs-gnu) +(global-set-key (kbd "C-c D b") #'debbugs-gnu-bugs) +(global-set-key (kbd "C-c D e") ; bug-gnu-emacs + (lambda () + (interactive) + (setq debbugs-gnu-current-suppress t) + (debbugs-gnu debbugs-gnu-default-severities + '("emacs")))) +(global-set-key (kbd "C-c D g") ; bug-gnuzilla + (lambda () + (interactive) + (setq debbugs-gnu-current-suppress t) + (debbugs-gnu debbugs-gnu-default-severities + '("gnuzilla")))) +(global-set-key (kbd "C-c D G b") ; bug-guix + (lambda () + (interactive) + (setq debbugs-gnu-current-suppress t) + (debbugs-gnu debbugs-gnu-default-severities + '("guix")))) +(global-set-key (kbd "C-c D G p") ; guix-patches + (lambda () + (interactive) + (setq debbugs-gnu-current-suppress t) + (debbugs-gnu debbugs-gnu-default-severities + '("guix-patches")))) + +;; eww +(csetq eww-download-directory (file-name-as-directory + (getenv "XDG_DOWNLOAD_DIR"))) +(global-set-key (kbd "C-c a e w") #'eww) (comment -(use-package org-ref - :init - (b/setq-every '("~/usr/org/references.bib") - reftex-default-bibliography - org-ref-default-bibliography) - (setq - org-ref-bibliography-notes "~/usr/org/notes.org" - org-ref-pdf-directory "~/usr/org/bibtex-pdfs/")) - -;; (use-package fill-column-indicator) - -(use-package window - :bind - (("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 - :defer 0.6 - :bind - (("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 - :bind ("C-c a p" . pass) - :hook (pass-mode . View-exit)) - -(use-package pdf-tools - :defer 0.5 - :bind (:map pdf-view-mode-map - ("<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 - :disabled - :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 - :hook (latex-mode . reftex-mode)) - -(use-package reftex-cite - :after reftex - :disabled ; enable to disable - ; reftex-cite's default choice - ; of previous word - :config - (defun reftex-get-bibkey-default () - "If the cursor is in a citation macro, return the word before the macro." - (let* ((macro (reftex-what-macro 1))) - (save-excursion - (when (and macro (string-match "cite" (car macro))) - (goto-char (cdr macro))) - (reftex-this-word))))) - -(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 eww - :bind ("C-c a e w" . eww) - :custom - (eww-download-directory (file-name-as-directory - (getenv "XDG_DOWNLOAD_DIR")))) +;; org-ref +(csetq + reftex-default-bibliography '("~/usr/org/references.bib") + org-ref-default-bibliography '("~/usr/org/references.bib") + org-ref-bibliography-notes "~/usr/org/notes.org" + org-ref-pdf-directory "~/usr/org/bibtex-pdfs/") + +;; fill-column-indicator ? + +;; window +(csetq split-width-threshold 150) +(global-set-key (kbd "C-c w s l") + (lambda () + (interactive) + (split-window-right) + (other-window 1))) +(global-set-key (kbd "C-c w s j") + (lambda () + (interactive) + (split-window-below) + (other-window 1))) +(global-set-key (kbd "C-c w q") #'quit-window) + +(run-with-idle-timer 0.6 nil #'require 'windmove) +(global-set-key (kbd "C-c w h") #'windmove-left) +(global-set-key (kbd "C-c w j") #'windmove-down) +(global-set-key (kbd "C-c w k") #'windmove-up) +(global-set-key (kbd "C-c w l") #'windmove-right) +(global-set-key (kbd "C-c w H") #'windmove-swap-states-left) +(global-set-key (kbd "C-c w J") #'windmove-swap-states-down) +(global-set-key (kbd "C-c w K") #'windmove-swap-states-up) +(global-set-key (kbd "C-c w L") #'windmove-swap-states-right) + +;; pass +(global-set-key (kbd "C-c a p") #'pass) +(add-hook 'pass-mode-hook #'View-exit) + +;; reftex +;; uncomment to disable reftex-cite's default choice of previous word +;; (with-eval-after-load 'reftex +;; (require 'reftex-cite) +;; (defun reftex-get-bibkey-default () +;; "If the cursor is in a citation macro, return the word before the macro." +;; (let* ((macro (reftex-what-macro 1))) +;; (save-excursion +;; (when (and macro (string-match "cite" (car macro))) +;; (goto-char (cdr macro))) +;; (reftex-this-word))))) +(add-hook 'latex-mode-hook #'reftex-mode) + +;; dmenu +(csetq + dmenu-prompt-string "run: " + dmenu-save-file (b/var "dmenu-items")) + +;; eosd ? ;;; Post initialization |