commit 45f053d485e22ad1f3078a4d203bec02674a09e9
parent e92aa79cb011df83748fecfca099922552f0c7c6
Author: dwrz <dwrz@dwrz.net>
Date: Sun, 21 Jul 2024 13:36:07 +0000
Update Emacs init
Diffstat:
1 file changed, 36 insertions(+), 7 deletions(-)
diff --git a/emacs/init.el b/emacs/init.el
@@ -376,6 +376,10 @@
:config (global-hl-line-mode t)
:ensure nil)
+(use-package hideshow
+ :hook (go-mode . hs-minor-mode)
+ :ensure nil)
+
(use-package ispell
:config (setq ispell-program-name "/usr/bin/aspell"
ispell-dictionary "en_US"
@@ -670,6 +674,20 @@
:defines org-plantuml-jar-path
:ensure t)
+(use-package proced
+ :commands proced
+ :custom
+ (proced-auto-update-flag t)
+ (proced-enable-color-flag t)
+ (proced-format 'custom)
+ (proced-goal-attribute nil)
+ (proced-show-remote-processes t)
+ :config
+ (add-to-list
+ 'proced-format-alist
+ '(custom pid user pcpu pmem rss pri nice start time tree state (args comm)))
+ :ensure nil)
+
(use-package prog-mode
:hook ((prog-mode . flycheck-mode)
(prog-mode . flyspell-prog-mode)
@@ -784,7 +802,7 @@
(use-package tool-bar :config (tool-bar-mode -1) :ensure nil)
-(use-package tramp :config (setq tramp-default-method "rsync"))
+(use-package tramp :config (setq tramp-default-method "rsync") :ensure nil)
(use-package vertico
:config
@@ -829,10 +847,10 @@
(use-package web-mode
:config (setq web-mode-code-indent-offset 2
web-mode-css-indent-offset 2
- web-mode-engines-alist
- '(("go" . "\\.gohtml\\'"))
+ web-mode-engines-alist '(("go" . "\\.gohtml\\'"))
web-mode-indent-style 2
web-mode-markup-indent-offset 2)
+ :hook ((web-mode . (lambda () (setq indent-tabs-mode nil))))
:mode (("\\.html?\\'" . web-mode)
("\\.gohtml\\'" . web-mode))
:ensure t)
@@ -956,6 +974,14 @@
"n" (cons "rename" #'password-store-rename)
"r" (cons "remove" #'password-store-remove))
+(defvar-keymap dwrz-hideshow-map
+ :doc "Prefix keymap for hideshow."
+ :name "Transpose"
+ "h" #'hs-hide-all
+ "s" #'hs-show-all
+ "H" #'hs-hide-block
+ "S" #'hs-show-block)
+
(defvar-keymap dwrz-insert-map
:doc "Prefix keymap for insertion and point."
:name "Insert"
@@ -1056,23 +1082,27 @@
(defvar-keymap dwrz-prefix-map
:doc "Prefix keymap with multiple subkeymaps."
:name "dwrz prefix"
- "<" #'undo
- ">" #'undo-redo
+ :repeat (:exit (ignore))
"#" #'display-line-numbers-mode
"-" #'negative-argument
";" (cons "terminal" dwrz-terminal-map)
+ "<" #'undo
"<down>" #'windmove-down
"<left>" #'windmove-left
"<right>" #'windmove-right
"<up>" #'windmove-up
+ ">" #'undo-redo
"?" (cons "help" help-map)
"@" (cons "time" dwrz-time-map)
"E" #'hippie-expand
"F" #'consult-find
"H" (cons "highlight" dwrz-highlight-map)
+ "M" (cons "macro" dwrz-macro-map)
"P" (cons "project" project-prefix-map)
"Q" #'save-buffers-kill-emacs
+ "R" (cons "replace" #'query-replace)
"S" (cons "spell" dwrz-spell-map)
+ "_" (cons "hideshow" dwrz-hideshow-map)
"a" #'avy-goto-char
"b" (cons "buffer" dwrz-buffer-map)
"c" (cons "cape" dwrz-cape-map)
@@ -1083,12 +1113,11 @@
"j" (cons "jump" #'jump-to-register)
"l" (cons "line" #'avy-goto-line)
"m" (cons "move" dwrz-movement-map)
- "M" (cons "macro" dwrz-macro-map)
"n" (cons "narrow" narrow-map)
"o" (cons "org" dwrz-org-map)
"p" (cons "password" dwrz-password-map)
+ "q" #'ignore
"r" (cons "region" dwrz-region-map)
- "R" (cons "replace" #'query-replace)
"s" (cons "search" dwrz-search-map)
"t" (cons "transpose" dwrz-transpose-map)
"u" #'universal-argument