X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/dfe440bcc2729d9da9c11eea890655c7e4e3e877..e505cb8c77c605e8bd1341e4a463635a367500af:/init.org diff --git a/init.org b/init.org index d5ea7ff..4ff8b94 100644 --- a/init.org +++ b/init.org @@ -240,12 +240,12 @@ can then be managed with the help of Magit or other tools. (with-eval-after-load 'bind-key (bind-keys :package borg - ("C-c B A" . borg-activate) - ("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))) + ("C-c b A" . borg-activate) + ("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 *** =use-package= @@ -283,9 +283,9 @@ database, low-level functions for querying the database, and a (use-package epkg :defer t :bind - (("C-c B d" . epkg-describe-package) - ("C-c B p" . epkg-list-packages) - ("C-c B u" . epkg-update))) + (("C-c b d" . epkg-describe-package) + ("C-c b p" . epkg-list-packages) + ("C-c b u" . epkg-update))) #+end_src ** No littering in =~/.emacs.d= @@ -348,7 +348,7 @@ in my shell. (exec-path-from-shell-copy-env "SSH_AUTH_SOCK")) #+end_src -** Only one custom theme at a time +** COMMENT Only one custom theme at a time #+begin_src emacs-lisp (defadvice load-theme (before clear-previous-themes activate) @@ -611,7 +611,7 @@ Enable automatic reloading of changed buffers and files. #+begin_src emacs-lisp (global-auto-revert-mode 1) (setq auto-revert-verbose nil - global-auto-revert-non-file-buffers t) + global-auto-revert-non-file-buffers nil) #+end_src *** Always use space for indentation @@ -645,20 +645,23 @@ Enable =winner-mode=. (cons msg code))) #+end_src -** Bindings +*** 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][endlessparentheses]] +for this. #+begin_src emacs-lisp -(bind-keys - ("C-c b k" . kill-this-buffer) - ("C-c b s" . save-buffer) - ("C-c S" . save-buffer) - ("C-c o" . other-window) - ("C-c q q" . save-buffers-kill-terminal) +(setq search-default-mode #'char-fold-to-regexp) - ("C-c F m" . make-frame-command) - ("C-c F d" . delete-frame) - ("C-c F D" . delete-other-frames) +;; uncomment to extend this behaviour to query-replace +;; (setq replace-char-fold t) +#+end_src +** Bindings + +#+begin_src emacs-lisp +(bind-keys ("s-c e b" . eval-buffer) ("s-c e r" . eval-region) @@ -690,6 +693,146 @@ customizing it. '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) + + ;; custom mode state mappings + (dolist (mspair '((ebdb-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 + + "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 @@ -703,6 +846,22 @@ In short, my favourite way of life. #+begin_src emacs-lisp (use-package org :defer 3 + :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 @@ -710,6 +869,17 @@ In short, my favourite way of life. org-email-link-description-format "Email %c: %s" ; %.30s 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)) :bind (:map org-mode-map ("M-L" . org-insert-last-stored-link)) :hook ((org-mode . org-indent-mode) (org-mode . auto-fill-mode) @@ -737,6 +907,13 @@ In short, my favourite way of life. (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)) @@ -801,28 +978,19 @@ Not just how I do git, but /the/ way to do git. #+begin_src emacs-lisp (use-package magit :defer 2 - :bind - (("s-g" . magit-status) - :prefix-map amin--magit-prefix-map - :prefix "C-c g" - ("SPC" . magit-status) - ("s" . magit-status) - ("S" . magit-status-prefix) - ("B" . magit-blame-addition) - ("C" . magit-clone) - ("f" . magit-fetch-other) - ("F" . magit-pull-branch) - ("P" . magit-push-other) - ("p" . magit-dispatch-popup) - ("c c" . magit-commit-create) - ("c a" . magit-commit-amend) - ("b b" . magit-checkout) - ("b c" . magit-branch-create)) + :general (amin--leader-keys "g s" 'magit-status) + :bind ("s-g" . magit-status) :config (magit-add-section-hook 'magit-status-sections-hook 'magit-insert-modules 'magit-insert-stashes 'append) + (setq + magit-repository-directories '(("~/.emacs.d/" . 0) + ("~/src/git/" . 1))) + (nconc magit-section-initial-visibility-alist + '(([unpulled status] . show) + ([unpushed status] . show))) :custom-face (magit-diff-file-heading ((t (:weight normal))))) #+end_src @@ -840,9 +1008,9 @@ There's no way I could top that, so I won't attempt to. #+begin_src emacs-lisp (use-package ivy :defer 1 + :general (amin--leader-keys "," 'ivy-switch-buffer) :bind - (("C-c b b" . ivy-switch-buffer) - :map ivy-minibuffer-map + (:map ivy-minibuffer-map ([escape] . keyboard-escape-quit) ([S-up] . ivy-previous-history-element) ([S-down] . ivy-next-history-element) @@ -860,6 +1028,7 @@ There's no way I could top that, so I won't attempt to. #+begin_src emacs-lisp (use-package swiper + :general (:states '(normal motion) "/" 'swiper) :bind (("C-s" . swiper) ("C-r" . swiper))) #+end_src @@ -869,6 +1038,11 @@ There's no way I could top that, so I won't attempt to. #+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) @@ -914,9 +1088,9 @@ There's no way I could top that, so I won't attempt to. #+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) - ("C-c b B" . ibuffer-other-window) :map ibuffer-mode-map ("P" . ibuffer-backward-filter-group) ("N" . ibuffer-forward-filter-group) @@ -1019,7 +1193,9 @@ TODO: break this giant source block down into individual org sections. (use-package help :defer t - :config (temp-buffer-resize-mode)) + :config + (temp-buffer-resize-mode) + (setq help-window-select t)) (progn ; `isearch' (setq isearch-allow-scroll t)) @@ -1073,12 +1249,14 @@ TODO: break this giant source block down into individual org sections. (list (regexp-quote (system-name)) nil nil))) (use-package undo-tree - :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)) + (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 @@ -1519,35 +1697,75 @@ Emacs package that displays available keybindings in popup :config (which-key-mode)) #+end_src +** theme + +#+begin_src emacs-lisp +(add-to-list 'custom-theme-load-path "~/.emacs.d/lisp") +(load-theme 'tangomod t) +#+end_src + ** [[https://github.com/Malabarba/smart-mode-line][smart-mode-line]] #+begin_src emacs-lisp (use-package smart-mode-line :config (sml/setup) - ;; (sml/apply-theme 'light) + (sml/apply-theme 'light) (remove-hook 'display-time-hook 'sml/propertize-time-string)) #+end_src +** theme helper functions + +#+begin_src emacs-lisp +(defun amin/light () + "Load light theme(s)." + (interactive) + (progn + (mapc #'disable-theme custom-enabled-themes) + (load-theme 'tangomod t) + (sml/apply-theme 'light))) + +(defun amin/dark () + "Load dark theme(s)." + (interactive) + (progn + (mapc #'disable-theme custom-enabled-themes) + (load-theme 'tangomod-dark t) + (sml/apply-theme 'dark))) + +(amin--leader-keys + "t" '(:ignore t :wk "theme") + "t d" 'amin/dark + "t l" 'amin/light) +#+end_src + ** [[https://github.com/bbatsov/crux][crux]] #+begin_src emacs-lisp (use-package crux :defer 1 - :bind (("C-c d" . crux-duplicate-current-line-or-region) - ("C-c M-d" . crux-duplicate-and-comment-current-line-or-region) - ("C-c b K" . crux-kill-other-buffers) - ("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-S-j" . crux-top-join-line) - ("C-c j" . crux-top-join-line))) + :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))) #+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) ("" . mwim-beginning-of-line-or-code) @@ -1580,24 +1798,14 @@ Emacs package that displays available keybindings in popup #+begin_src emacs-lisp (use-package helpful :defer 1 - :bind - (;; ("C-h F" . helpful-function) - ("C-h f" . helpful-callable) - ("C-h v" . helpful-variable) - ("C-h k" . helpful-key) - ("C-c C-d" . helpful-at-point) - ("C-h C" . helpful-command) - ("C-h c" . describe-char) - ("C-h F" . describe-face))) - -(use-package help - :bind - (("C-S-h f" . describe-function) - ("C-S-h v" . describe-variable) - ("C-S-h k" . describe-key) - ("C-S-h C" . describe-coding-system) - ("C-S-h c" . describe-key-briefly)) - :config (setq help-window-select t)) + :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/kyagi/shell-pop-el][shell-pop]] @@ -1605,6 +1813,7 @@ Emacs package that displays available keybindings in popup #+begin_src emacs-lisp (use-package shell-pop :defer 1 + :general (amin--leader-keys "a s" 'shell-pop) :init (setq shell-pop-universal-key "C-c e" shell-pop-shell-type '("eshell" "*eshell*" (lambda nil (eshell))))) @@ -1748,6 +1957,9 @@ Hopefully temporary. :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) @@ -1827,6 +2039,13 @@ For when I /have to/ use GH. (setq magithub-clone-default-directory "~/src/git")) #+end_src +** [[https://github.com/peterwvj/eshell-up][eshell-up]] + +#+begin_src emacs-lisp +(use-package eshell-up + :after eshell) +#+end_src + * Email #+begin_src emacs-lisp @@ -1844,6 +2063,10 @@ For when I /have to/ use GH. read-mail-command 'gnus) (use-package gnus + :general + (amin--leader-keys + "m" 'gnus + "M" 'gnus-unplugged) :bind (("s-m" . gnus) ("s-M" . gnus-unplugged)) :init @@ -1862,7 +2085,7 @@ For when I /have to/ use GH. (nnimap-server-port 143) (nnimap-authenticator plain) (nnimap-user "abandali@uwaterloo.ca"))) - gnus-message-archive-group "nnimap:Sent" + gnus-message-archive-group "nnimap+amin:Sent" gnus-parameters '(("gnu.*" (gcc-self . t))) @@ -1923,9 +2146,12 @@ For when I /have to/ use GH. :config (setq gnus-posting-styles '((".*" - (address "amin@aminb.org")) + (address "amin@aminb.org") + (body "\nBest,\namin\n")) ("gnu.*" (address "bandali@gnu.org")) + ((header "subject" "ThankCRM") + (to "webmasters-comment@gnu.org")) ("nnimap\\+uwaterloo:.*" (address "abandali@uwaterloo.ca") (gcc "\"nnimap+uwaterloo:Sent Items\""))))) @@ -1963,7 +2189,17 @@ For when I /have to/ use GH. #+begin_src emacs-lisp (use-package message :config - (setq message-kill-buffer-on-exit t + (defconst message-cite-style-bandali + '((message-cite-function 'message-cite-original) + (message-citation-line-function 'message-insert-formatted-citation-line) + (message-cite-reply-position 'traditional) + (message-yank-prefix "> ") + (message-yank-cited-prefix ">") + (message-yank-empty-prefix ">") + (message-citation-line-format "Hi %F,\n\nOn %Y-%m-%d %l:%M %p, %N wrote:")) + "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 @@ -2007,7 +2243,7 @@ Convenient footnotes in =message-mode=. footnote-style 'unicode)) #+end_src -** supercite +** COMMENT supercite #+begin_src emacs-lisp (use-package supercite @@ -2016,20 +2252,33 @@ Convenient footnotes in =message-mode=. (setq sc-nested-citation-p t ;; sc-cite-blank-lines-p t sc-citation-leader "" + sc-reference-tag-string "" + sc-preferred-header-style 5 ; (sc-header-author-writes) sc-auto-fill-region-p nil sc-confirm-always-p nil) :config - (defun amin--sc-header () - "Hi ,\n\n writes:" - (let ((sc-mumble "") - (whofrom (sc-whofrom))) - (if whofrom - (insert (sc-hdr "Hi " (sc-mail-field "sc-firstname") ", \n\n") - sc-reference-tag-string - whofrom - " writes:\n")))) - (add-to-list 'sc-rewrite-header-list '(amin--sc-header) t) - (setq sc-preferred-header-style (1- (length sc-rewrite-header-list))) + ;; (defun amin--sc-header-on-wrote () + ;; "\"On , wrote:\" unless: + ;; 1. the \"sc-author\" field cannot be found, in which case nothing is inserted; + ;; 2. the \"date\" field is missing in which case only the from part is printed." + ;; (let ((sc-mumble "") + ;; (whofrom (sc-whofrom))) + ;; (if whofrom + ;; (insert sc-reference-tag-string + ;; (sc-hdr "On " (sc-mail-field "date") ", ") + ;; (sc-hdr "" (sc-mail-field "sc-author")) " wrote:\n")))) + ;; (defun amin--sc-header () + ;; "Hi ,\n\n writes:" + ;; (let ((sc-mumble "") + ;; (whofrom (sc-whofrom))) + ;; (if whofrom + ;; (insert (sc-hdr "Hi " (sc-mail-field "sc-firstname") ",\n\n") + ;; sc-reference-tag-string + ;; whofrom + ;; " writes:\n")))) + ;; (add-to-list 'sc-rewrite-header-list '(amin--sc-header) t) + ;; (add-to-list 'sc-rewrite-header-list '(amin--sc-header-on-wrote) t) + ;; (setq sc-preferred-header-style (1- (length sc-rewrite-header-list))) (add-hook 'mail-citation-hook 'sc-cite-original)) #+end_src