commit adde0d1f1b4f12929fa261aeafde3f1042245b9b
parent 9e4d1ea8e3426ebddadd21a21631ee5eddf4b873
Author: dwrz <dwrz@dwrz.net>
Date: Wed, 7 Feb 2024 01:49:27 +0000
Update Emacs init
Diffstat:
| M | emacs/init.el | | | 72 | ++++++++++++++++++++++++++++++++++++++++-------------------------------- |
1 file changed, 40 insertions(+), 32 deletions(-)
diff --git a/emacs/init.el b/emacs/init.el
@@ -115,6 +115,7 @@
avy-case-fold-search nil
avy-keys '(?a ?o ?e ?u ?h ?t ?n ?s)
avy-style 'at-full)
+ :defer t
:ensure t)
(use-package base16-theme
@@ -422,7 +423,7 @@
:custom (mouse-wheel-scroll-amount '(1 ((shift) .1)))
:ensure nil)
-(use-package nerd-icons :ensure t)
+(use-package nerd-icons :defer t :ensure t)
(use-package notmuch
:bind (("C-x m" . notmuch)
@@ -643,7 +644,7 @@
(use-package paren :config (show-paren-mode t) :ensure nil)
-(use-package password-store :ensure t)
+(use-package password-store :defer t :ensure t)
(use-package plantuml-mode
:config (setq org-plantuml-jar-path (expand-file-name
@@ -767,6 +768,7 @@
:config
(setq vundo-glyph-alist vundo-unicode-symbols
vundo-compact-display t)
+ :defer t
:ensure t)
(use-package visual-fill-column
@@ -777,6 +779,7 @@
(use-package vterm
:config (setq vterm-max-scrollback 32767)
+ :defer t
:ensure t)
(use-package web-mode
@@ -802,7 +805,7 @@
split-width-threshold 160)
:ensure nil)
-(use-package xref :ensure nil)
+(use-package xref :defer t :ensure nil)
(use-package yaml-mode :ensure t)
@@ -818,12 +821,12 @@
(defvar-keymap dwrz-buffer-map
:doc "Prefix keymap for buffers."
:name "Buffer"
- "R" #'rename-buffer
+ "R" #'revert-buffer
"b" #'consult-buffer
"i" #'ibuffer
"n" #'next-buffer
"p" #'previous-buffer
- "r" #'revert-buffer)
+ "r" #'rename-buffer)
(defvar-keymap dwrz-cape-map
:doc "Prefix keymap for cape."
@@ -848,13 +851,6 @@
"F" #'find-file-other-window
"d" #'dired)
-(defvar-keymap dwrz-help-map
- :doc "Prefix keymap for help."
- :name "Help"
- "k" (cons "key" #'describe-key)
- "f" (cons "function" #'describe-function)
- "v" (cons "variable" #'describe-variable))
-
(defvar-keymap dwrz-highlight-map
:doc "Prefix keymap for highlight."
:name "Highlight"
@@ -876,11 +872,13 @@
(defvar-keymap dwrz-org-ctx-map
:doc "Prefix keymap for org-mode context."
- :name "Org-Context"
- "a" #'(lambda () (interactive) (dwrz-switch-org-ctx "all"))
- "c" #'(lambda () (interactive) (dwrz-switch-org-ctx "chimerical"))
- "d" #'(lambda () (interactive) (dwrz-switch-org-ctx "dwrz"))
- "e" #'(lambda () (interactive) (dwrz-switch-org-ctx "eti")))
+ :name "Org Context"
+ "a" (cons "all"
+ #'(lambda () (interactive) (dwrz-switch-org-ctx "all")))
+ "c" (cons "chimerical"
+ #'(lambda () (interactive) (dwrz-switch-org-ctx "chimerical")))
+ "d" (cons "dwrz" #'(lambda () (interactive) (dwrz-switch-org-ctx "dwrz")))
+ "e" (cons "eti" #'(lambda () (interactive) (dwrz-switch-org-ctx "eti"))))
(defvar-keymap dwrz-org-map
:doc "Prefix keymap for org-mode."
@@ -900,16 +898,14 @@
"n" (cons "rename" #'password-store-rename)
"r" (cons "remove" #'password-store-remove))
-(defvar-keymap dwrz-point-map
- :doc "Prefix keymap for point."
- :name "Point"
+(defvar-keymap dwrz-insert-map
+ :doc "Prefix keymap for insertion and point."
+ :name "Insert"
"d" (cons "date" #'dwrz-insert-date)
"e" #'emoji-search
"h" #'hippie-expand
- "k" #'kill-word
"l" #'emoji-list
"q" #'quoted-insert
- "s" #'ispell-word
"t" (cons "timestamp" #'dwrz-insert-timestamp))
(defvar-keymap dwrz-region-map
@@ -927,7 +923,8 @@
(defvar-keymap dwrz-search-map
:doc "Prefix keymap for search."
:name "Search"
- "a" #'(lambda () (interactive) (consult-notmuch-address t nil))
+ "a" (cons "address"
+ #'(lambda () (interactive) (consult-notmuch-address t nil)))
"c" #'consult-mark
"f" #'consult-find
"g" #'consult-grep
@@ -940,13 +937,22 @@
"t" #'consult-outline
"v" #'consult-git-grep)
+(defvar-keymap dwrz-spell-map
+ "b" #'ispell-buffer
+ "r" #'ispell-region
+ "w" #'ispell-word)
+
(defvar-keymap dwrz-terminal-map
:doc "Prefix keymap for terminal."
:name "Terminal"
+ "c" #'vterm-copy-mode
"s" #'dwrz-shell-in-current-directory
- "v" #'vterm-copy-mode)
+ "t" #'term
+ "v" #'vterm)
(defvar-keymap dwrz-time-map
+ :doc "Prefix keymap for date and time."
+ :name "Time"
"c" #'calendar
"w" #'world-clock)
@@ -989,26 +995,28 @@
:name "dwrz prefix"
"#" #'display-line-numbers-mode
"-" #'negative-argument
- ":" (cons "project" project-prefix-map)
- "?" (cons "help" dwrz-help-map)
+ ":" (cons "terminal" dwrz-terminal-map)
+ "?" (cons "help" help-map)
"@" (cons "time" dwrz-time-map)
- "H" #'hippie-expand
- "P" (cons "password" dwrz-password-map)
+ "H" (cons "highlight" dwrz-highlight-map)
+ "P" (cons "project" project-prefix-map)
+ "S" (cons "spell" dwrz-spell-map)
"Q" #'save-buffers-kill-emacs
- "T" (cons "transpose" dwrz-transpose-map)
+ "a" #'avy-goto-char
"b" (cons "buffer" dwrz-buffer-map)
"c" (cons "cape" dwrz-cape-map)
"e" (cons "exec" #'execute-extended-command)
"f" (cons "file" dwrz-file-map)
- "h" (cons "highlight" dwrz-highlight-map)
+ "h" #'hippie-expand
+ "i" (cons "insert" dwrz-insert-map)
"j" (cons "jump" #'jump-to-register)
"m" (cons "move" dwrz-movement-map)
"n" (cons "narrow" narrow-map)
"o" (cons "org" dwrz-org-map)
- "p" (cons "point" dwrz-point-map)
+ "p" (cons "password" dwrz-password-map)
"r" (cons "region" dwrz-region-map)
"s" (cons "search" dwrz-search-map)
- "t" (cons "terminal" dwrz-terminal-map)
+ "t" (cons "transpose" dwrz-transpose-map)
"u" #'universal-argument
"w" (cons "window" dwrz-windows-map))
