commit 9e4d1ea8e3426ebddadd21a21631ee5eddf4b873
parent dd7e6f28e8227cd926de6f1e4d7a0f797c8f72d8
Author: dwrz <dwrz@dwrz.net>
Date: Tue, 6 Feb 2024 01:55:34 +0000
Update Emacs init
Diffstat:
| M | emacs/init.el | | | 54 | +++++++++++++++++++++++++++++++++++++++--------------- |
1 file changed, 39 insertions(+), 15 deletions(-)
diff --git a/emacs/init.el b/emacs/init.el
@@ -110,8 +110,6 @@
:ensure nil)
(use-package avy
- :bind (("C-c g" . avy-goto-line)
- ("C-c o" . avy-goto-char))
:config (setq avy-all-windows 'all-frames
avy-background t
avy-case-fold-search nil
@@ -482,7 +480,7 @@
:defer t
:ensure nil)
-(use-package ol-notmuch :bind ("C-c l" . org-store-link) :defer t :ensure t)
+(use-package ol-notmuch :defer t :ensure t)
(use-package orderless
:ensure t
@@ -536,7 +534,6 @@
:ensure nil)
(use-package org-agenda
- :bind ("C-c a" . org-agenda)
:config
(setq chimerical-agenda-files '("~/projects/chimerical/chimerical.org")
dwrz-agenda-files '("~/org/dwrz.org"
@@ -821,6 +818,7 @@
(defvar-keymap dwrz-buffer-map
:doc "Prefix keymap for buffers."
:name "Buffer"
+ "R" #'rename-buffer
"b" #'consult-buffer
"i" #'ibuffer
"n" #'next-buffer
@@ -876,16 +874,22 @@
"<left>" #'windmove-left
"<right>" #'windmove-right)
-(defvar-keymap dwrz-org-map
- :doc "Prefix keymap for org-mode."
- :name "Org"
+(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"))
+ "e" #'(lambda () (interactive) (dwrz-switch-org-ctx "eti")))
+
+(defvar-keymap dwrz-org-map
+ :doc "Prefix keymap for org-mode."
+ :name "Org"
+ "a" #'org-agenda
"l" #'org-store-link
"L" #'org-insert-link
- "p" #'dwrz-org-capture-at-point)
+ "c" #'dwrz-org-capture-at-point
+ "x" dwrz-org-ctx-map)
(defvar-keymap dwrz-password-map
:doc "Prefix keymap for password-store."
@@ -939,7 +943,12 @@
(defvar-keymap dwrz-terminal-map
:doc "Prefix keymap for terminal."
:name "Terminal"
- "s" #'dwrz-shell-in-current-directory)
+ "s" #'dwrz-shell-in-current-directory
+ "v" #'vterm-copy-mode)
+
+(defvar-keymap dwrz-time-map
+ "c" #'calendar
+ "w" #'world-clock)
(defvar-keymap dwrz-transpose-map
:doc "Prefix keymap for transposition."
@@ -958,21 +967,34 @@
"-" #'text-scale-decrease
"0" #'delete-window
"1" #'delete-other-windows
+ "2" #'split-window-below
+ "3" #'split-window-right
"9" #'dwrz-split-window-two-thirds
+ "<down>" #'windmove-swap-states-down
+ "<left>" #'windmove-swap-states-left
+ "<right>" #'windmove-swap-states-right
+ "<up>" #'windmove-swap-states-up
"=" (cons "reset" #'(lambda () (interactive) (text-scale-increase 0)))
+ "B" #'balance-windows-area
+ "E" #'enlarge-window-horizontally
+ "S" #'shrink-window-horizontally
"b" #'balance-windows
- "l" #'shrink-window
- "n" #'shrink-window-horizontally
- "t" #'enlarge-window
- "w" #'enlarge-window-horizontally)
+ "e" #'enlarge-window
+ "o" #'other-window
+ "s" #'shrink-window
+ "t" #'tear-off-window)
(defvar-keymap dwrz-prefix-map
:doc "Prefix keymap with multiple subkeymaps."
:name "dwrz prefix"
- "?" (cons "help" dwrz-help-map)
"#" #'display-line-numbers-mode
+ "-" #'negative-argument
+ ":" (cons "project" project-prefix-map)
+ "?" (cons "help" dwrz-help-map)
+ "@" (cons "time" dwrz-time-map)
"H" #'hippie-expand
"P" (cons "password" dwrz-password-map)
+ "Q" #'save-buffers-kill-emacs
"T" (cons "transpose" dwrz-transpose-map)
"b" (cons "buffer" dwrz-buffer-map)
"c" (cons "cape" dwrz-cape-map)
@@ -981,11 +1003,13 @@
"h" (cons "highlight" dwrz-highlight-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)
"r" (cons "region" dwrz-region-map)
"s" (cons "search" dwrz-search-map)
"t" (cons "terminal" dwrz-terminal-map)
+ "u" #'universal-argument
"w" (cons "window" dwrz-windows-map))
;; KEYBINDINGS
