commit 2c24c6fde71aacfb4098218647f7e363dfcccfcf
parent ab6cf6e2f448e23e59fc911de2c0e8d3eb708b88
Author: Yuval Langer <yuval.langer@gmail.com>
Date: Tue, 30 Jul 2024 23:35:56 +0300
Fix my kakafarm/multi-vterm-weechat function's defining a variable before it is being defined as a custom variable. Also, alphabetically order use-packages.
Diffstat:
2 files changed, 90 insertions(+), 84 deletions(-)
diff --git a/config/emacs/init.el b/config/emacs/init.el
@@ -1,3 +1,5 @@
+;;; -*- lexical-binding: t; -*-
+
(setq gc-cons-threshold (* 1024 1024 1024))
(setq read-process-output-max (string-to-number
@@ -71,60 +73,6 @@
)
)
-(use-package multi-vterm
- :defer t
- :init
- (bind-key "C-c C-w" 'kakafarm/multi-vterm-weechat)
- (bind-key "C-c w" 'kakafarm/multi-vterm-weechat)
- :bind
- (
- :map global-map
- ("C-c <RET> <RET>" . multi-vterm)
- ("C-c m m" . multi-vterm)
- )
- :commands
- (
- multi-vterm
- multi-vterm-buffer-exist-p
- )
- )
-
-(use-package fontset
- :defer t
- :config
- (set-fontset-font t 'hebrew "Noto Sans Hebrew"))
-
-(use-package helm
- :defer t
- :bind
- (
- :map global-map
- ("M-x" . helm-M-x)
- )
- )
-
-(use-package helpful
- :defer t
- :bind
- (
- ("C-h f" . helpful-function)
- ("C-h k" . helpful-key)
- ("C-h m" . helpful-mode)
- ("C-h v" . helpful-variable)
- )
- )
-
-(use-package orderless
- :defer t
- :custom
- (completion-styles
- '(orderless
- basic))
- (completion-category-overrides
- '((file (styles
- basic
- partial-completion)))))
-
(use-package erc
:defer t
:custom
@@ -150,10 +98,10 @@
("C-c f f a p" . kakafarm/ffap-browse-urls)
))
-'(use-package mutli-vterm
- :defer t
- :bind
- (("C-q" . vterm-send-next-key)))
+(use-package fontset
+ :defer t
+ :config
+ (set-fontset-font t 'hebrew "Noto Sans Hebrew"))
(use-package geiser
:defer t
@@ -188,12 +136,64 @@
w3m-mode
))
+(use-package helm
+ :defer t
+ :bind
+ (
+ :map global-map
+ ("M-x" . helm-M-x)
+ )
+ )
+
+(use-package helpful
+ :defer t
+ :bind
+ (
+ ("C-h f" . helpful-function)
+ ("C-h k" . helpful-key)
+ ("C-h m" . helpful-mode)
+ ("C-h v" . helpful-variable)
+ )
+ )
+
(use-package icomplete
:defer t
:config
;; Display completions continuously in minibuffer.
(icomplete-mode 1))
+(use-package info
+ :defer t
+ :custom
+ (Info-additional-directory-list '("~/infopath/")))
+
+(use-package kakafarm
+ ;; :demand t
+ :bind
+ (
+ :map global-map
+ ("C-c C-w" . kakafarm/multi-vterm-weechat)
+ ("C-c w" . kakafarm/multi-vterm-weechat)
+ )
+ )
+
+(use-package multi-vterm
+ ;; :demand t
+ :bind
+ (
+ :map global-map
+ ("C-c <RET> <RET>" . multi-vterm)
+ ("C-c m m" . multi-vterm)
+ :map vterm-mode-map
+ ("C-q" . vterm-send-next-key)
+ )
+ :commands
+ (
+ multi-vterm
+ multi-vterm-buffer-exist-p
+ )
+ )
+
(use-package magit-todos
:defer t
:after magit
@@ -233,11 +233,6 @@
;;; https://emacs.stackexchange.com/questions/34322/set-default-coding-system-utf-8
(set-language-environment "utf-8"))
-(use-package info
- :defer t
- :custom
- (Info-additional-directory-list '("~/infopath/")))
-
'(use-package nano-tts
:defer t
:hook (eww-after-render nov-mode Info-mode))
@@ -246,6 +241,17 @@
:defer t
:mode ("\\.epub\\'" . nov-mode))
+(use-package orderless
+ :defer t
+ :custom
+ (completion-styles
+ '(orderless
+ basic))
+ (completion-category-overrides
+ '((file (styles
+ basic
+ partial-completion)))))
+
(use-package org
:defer t
:config
@@ -265,13 +271,6 @@
;;(org-roam-db-autosync-mode)
)
-;; XXX: Disabled.
-'(use-package parinfer
- :defer t
- :hook (emacs-lisp-mode
- lisp-mode
- scheme-mode))
-
(use-package paredit
:defer t
:hook (emacs-lisp-mode
@@ -283,6 +282,13 @@
:config
(show-paren-mode))
+;; XXX: Disabled.
+'(use-package parinfer
+ :defer t
+ :hook (emacs-lisp-mode
+ lisp-mode
+ scheme-mode))
+
(use-package rainbow-delimiters
:defer t
:config
@@ -296,14 +302,6 @@
("C-c t" . recentf-open-files)
("C-c l" . dictionary-lookup-definition)))
-(use-package undo-tree
- :defer t
- :config
- (global-undo-tree-mode 1)
- (setq undo-tree-auto-save-history nil)
- :bind
- ("C-x u" . undo-tree-visualize))
-
(use-package scheme-mode
:defer t
:mode "\\.\\(scm\\|sxml\\)\\'"
@@ -329,6 +327,14 @@
(text-mode)))
)
+(use-package undo-tree
+ :defer t
+ :config
+ (global-undo-tree-mode 1)
+ (setq undo-tree-auto-save-history nil)
+ :bind
+ ("C-x u" . undo-tree-visualize))
+
(use-package window
:defer t
:config
diff --git a/config/emacs/local-packages/emacs-kakafarm/kakafarm.el b/config/emacs/local-packages/emacs-kakafarm/kakafarm.el
@@ -289,15 +289,15 @@ who-knows-where-and-who."
(interactive)
- (let* ((vterm-shell (expand-file-name "~/bin/w"))
- (weechat-buffer-name "weechat")
+ (let* ((weechat-buffer-name "weechat")
(maybe-weechat-buffer (get-buffer weechat-buffer-name)))
(cond
((multi-vterm-buffer-exist-p maybe-weechat-buffer)
(switch-to-buffer maybe-weechat-buffer))
(t
- (multi-vterm)
- (rename-buffer weechat-buffer-name)))))
+ (let ((vterm-shell (expand-file-name "~/bin/w")))
+ (multi-vterm)
+ (rename-buffer weechat-buffer-name))))))
(defun kakafarm/sentence-end-double-nilify-for-read-only-buffers ()
"Set `sentence-end-double-space' in read-only buffer to `nil'."
@@ -404,6 +404,6 @@ https://www.tomsdiner.org/blog/post_0003_sourcehut_readme_org_export.html"
(provide 'kakafarm)
;;; Local Variables:
-;; read-symbol-shorthands: (("kf/" . "kakafarm/"))
-;; End:
+;;; read-symbol-shorthands: (("kf/" . "kakafarm/"))
+;;; End:
;;; kakafarm.el ends here.
