Update
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
:demand t
|
||||
:config
|
||||
;; To disable collection of benchmark data after init is done.
|
||||
;; (add-hook 'emacs-startup-hook 'benchmark-init/deactivate)
|
||||
(add-hook 'emacs-startup-hook 'benchmark-init/deactivate)
|
||||
)
|
||||
|
||||
;; Load some component of large package (org, magit etc.) before complete mount
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
(bind-keys ("s-r" . revert-buffer-quick)
|
||||
("C-x K" . delete-this-file)
|
||||
("C-c C-l" . reload-init-file))
|
||||
("C-c C-l" . reload-init-file)
|
||||
("C-c C-w 0" . desktop-clear))
|
||||
|
||||
(provide 'init-bindings)
|
||||
|
||||
@@ -219,7 +219,7 @@ the element after the #+HEADER: tag."
|
||||
:hook (org-latex-preview-mode . org-latex-preview-center-mode)
|
||||
:config
|
||||
;; Higher resolution when using dvipng
|
||||
(plist-put org-latex-preview-appearance-options :page-width 1.0)
|
||||
(plist-put org-latex-preview-appearance-options :page-width 0.6)
|
||||
;; (plist-put org-latex-preview-appearance-options :margin 1)
|
||||
(plist-put org-latex-preview-appearance-options :scale 2.0)
|
||||
|
||||
|
||||
@@ -2,37 +2,78 @@
|
||||
|
||||
(use-package shell
|
||||
:straight nil
|
||||
:hook ((shell-mode . my/shell-mode-hook)
|
||||
(comint-output-filter-functions . comint-strip-ctrl-m))
|
||||
:hook ((comint-output-filter-functions . comint-strip-ctrl-m))
|
||||
:init
|
||||
(setq system-uses-terminfo nil)
|
||||
(setq system-uses-terminfo nil))
|
||||
|
||||
;; Emacs command shell
|
||||
(use-package eshell
|
||||
:ensure nil
|
||||
:defines eshell-prompt-function
|
||||
:bind (:map eshell-mode-map
|
||||
([remap recenter-top-bottom] . eshell/clear))
|
||||
:config
|
||||
(with-no-warnings
|
||||
(defun my/shell-simple-send (proc command)
|
||||
"Various PROC COMMANDs pre-processing before sending to shell."
|
||||
(cond
|
||||
;; Checking for clear command and execute it.
|
||||
((string-match "^[ \t]*clear[ \t]*$" command)
|
||||
(comint-send-string proc "\n")
|
||||
(erase-buffer))
|
||||
;; Checking for man command and execute it.
|
||||
((string-match "^[ \t]*man[ \t]*" command)
|
||||
(comint-send-string proc "\n")
|
||||
(setq command (replace-regexp-in-string "^[ \t]*man[ \t]*" "" command))
|
||||
(setq command (replace-regexp-in-string "[ \t]+$" "" command))
|
||||
;;(message (format "command %s command" command))
|
||||
(funcall 'man command))
|
||||
;; Send other commands to the default handler.
|
||||
(t (comint-simple-send proc command))))
|
||||
(defun eshell/clear ()
|
||||
"Clear the eshell buffer."
|
||||
(let ((inhibit-read-only t))
|
||||
(erase-buffer)
|
||||
(eshell-send-input)))
|
||||
(defun eshell/emacs (&rest args)
|
||||
"Open a file (ARGS) in Emacs. Some habits die hard."
|
||||
(if (null args)
|
||||
;; If I just ran "emacs", I probably expect to be launching
|
||||
;; Emacs, which is rather silly since I'm already in Emacs.
|
||||
;; So just pretend to do what I ask.
|
||||
(bury-buffer)
|
||||
;; We have to expand the file names or else naming a directory in an
|
||||
;; argument causes later arguments to be looked for in that directory,
|
||||
;; not the starting directory
|
||||
(mapc #'find-file (mapcar #'expand-file-name (flatten-tree (reverse args))))))
|
||||
(defalias 'eshell/e #'eshell/emacs)
|
||||
(defalias 'eshell/ec #'eshell/emacs)
|
||||
(defun eshell/ebc (&rest args)
|
||||
"Compile a file (ARGS) in Emacs. Use `compile' to do background make."
|
||||
(if (eshell-interactive-output-p)
|
||||
(let ((compilation-process-setup-function
|
||||
(list 'lambda nil
|
||||
(list 'setq 'process-environment
|
||||
(list 'quote (eshell-copy-environment))))))
|
||||
(compile (eshell-flatten-and-stringify args))
|
||||
(pop-to-buffer compilation-last-buffer))
|
||||
(throw 'eshell-replace-command
|
||||
(let ((l (eshell-stringify-list (flatten-tree args))))
|
||||
(eshell-parse-command (car l) (cdr l))))))
|
||||
(put 'eshell/ebc 'eshell-no-numeric-conversions t)
|
||||
(defun eshell-view-file (file)
|
||||
"View FILE. A version of `view-file' which properly rets the eshell prompt."
|
||||
(interactive "fView file: ")
|
||||
(unless (file-exists-p file) (error "%s does not exist" file))
|
||||
(let ((buffer (find-file-noselect file)))
|
||||
(if (eq (get (buffer-local-value 'major-mode buffer) 'mode-class)
|
||||
'special)
|
||||
(progn
|
||||
(switch-to-buffer buffer)
|
||||
(message "Not using View mode because the major mode is special"))
|
||||
(let ((undo-window (list (window-buffer) (window-start)
|
||||
(+ (window-point)
|
||||
(length (funcall eshell-prompt-function))))))
|
||||
(switch-to-buffer buffer)
|
||||
(view-mode-enter (cons (selected-window) (cons nil undo-window))
|
||||
'kill-buffer)))))
|
||||
|
||||
(defun my/shell-mode-hook ()
|
||||
"Shell mode customization."
|
||||
(local-set-key '[up] 'comint-previous-input)
|
||||
(local-set-key '[down] 'comint-next-input)
|
||||
(local-set-key '[(shift tab)] 'comint-next-matching-input-from-input)
|
||||
(defun eshell/less (&rest args)
|
||||
"Invoke `view-file' on a file (ARGS).
|
||||
|
||||
(ansi-color-for-comint-mode-on)
|
||||
(setq comint-input-sender 'my/shell-simple-send))))
|
||||
\"less +42 foo\" will go to line 42 in the buffer for foo."
|
||||
(while args
|
||||
(if (string-match "\\`\\+\\([0-9]+\\)\\'" (car args))
|
||||
(let* ((line (string-to-number (match-string 1 (pop args))))
|
||||
(file (pop args)))
|
||||
(eshell-view-file file)
|
||||
(forward-line line))
|
||||
(eshell-view-file (pop args)))))
|
||||
(defalias 'eshell/more #'eshell/less)))
|
||||
|
||||
(use-package xterm-color
|
||||
:defines (compilation-environment
|
||||
@@ -42,6 +83,18 @@
|
||||
;; For shell and interpreters
|
||||
(setenv "TERM" "xterm-256color")
|
||||
|
||||
(setq comint-output-filter-functions
|
||||
(remove 'ansi-color-process-output comint-output-filter-functions))
|
||||
(add-hook 'comint-preoutput-filter-functions 'xterm-color-filter)
|
||||
(add-hook 'shell-mode-hook
|
||||
(lambda ()
|
||||
;; Disable font-locking to improve performance
|
||||
(font-lock-mode -1)
|
||||
;; Prevent font-locking from being re-enabled
|
||||
(make-local-variable 'font-lock-function)
|
||||
(setq font-lock-function #'ignore)))
|
||||
|
||||
;; For eshell
|
||||
(with-eval-after-load 'esh-mode
|
||||
(add-hook 'eshell-before-prompt-hook
|
||||
(lambda ()
|
||||
@@ -49,14 +102,22 @@
|
||||
(add-to-list 'eshell-preoutput-filter-functions 'xterm-color-filter)
|
||||
(setq eshell-output-filter-functions
|
||||
(remove 'eshell-handle-ansi-color eshell-output-filter-functions)))
|
||||
|
||||
(setq compilation-environment '("TERM=xterm-256color"))
|
||||
(defun my/advice-compilation-filter (fn proc string)
|
||||
(funcall fn proc
|
||||
(if (eq major-mode 'rg-mode) ; compatible with `rg'
|
||||
string
|
||||
(xterm-color-filter string))))
|
||||
(advice-add 'compilation-filter :around #'my/advice-compilation-filter)
|
||||
(advice-add 'gud-filter :around #'my/advice-compilation-filter)
|
||||
)
|
||||
|
||||
(setq eshell-banner-message "")
|
||||
|
||||
(use-package eat
|
||||
:bind ("C-`" . eshell-toggle)
|
||||
:bind ("C-<escape>" . eat-toggle)
|
||||
:bind ("C-`" . eat-toggle)
|
||||
:bind ("C-<escape>" . eshell-toggle)
|
||||
:hook ((eshell-load . eat-eshell-mode)
|
||||
(eshell-load . eat-eshell-visual-command-mode))
|
||||
:straight `(eat :repo "https://codeberg.org/akib/emacs-eat"
|
||||
@@ -92,8 +153,8 @@
|
||||
:defines eshell-highlight-prompt
|
||||
:autoload (epe-theme-lambda epe-theme-dakrone epe-theme-pipeline)
|
||||
:init
|
||||
(setq eshell-highlight-prompt t
|
||||
eshell-prompt-function #'epe-theme-lambda))
|
||||
(setq eshell-highlight-prompt t)
|
||||
(setq eshell-prompt-function #'epe-theme-lambda))
|
||||
|
||||
;; (use-package eshell-z
|
||||
;; :hook (eshell-mode . (lambda () (require 'eshell-z))))
|
||||
|
||||
@@ -6,10 +6,11 @@
|
||||
;; ("make")))
|
||||
:straight (auctex :type git :host nil :repo "https://git.savannah.gnu.org/git/auctex.git")
|
||||
:mode (("\\.tex\\'" . LaTeX-mode))
|
||||
:hook (LaTeX-mode . prettify-symbols-mode)
|
||||
:hook (LaTeX-mode . visual-line-mode)
|
||||
:hook (LaTeX-mode . turn-on-reftex)
|
||||
:hook (LaTeX-mode . lsp-deferred)
|
||||
:hook ((LaTeX-mode . prettify-symbols-mode)
|
||||
(LaTeX-mode . visual-line-mode)
|
||||
(LaTeX-mode . turn-on-reftex)
|
||||
(LaTeX-mode . lsp-deferred)
|
||||
(LaTeX-mode . (lambda () (lsp-ui-mode -1))))
|
||||
:bind (:map LaTeX-mode-map
|
||||
("C-S-e" . latex-math-from-calc)
|
||||
("C-c x" . TeX-clean)
|
||||
|
||||
@@ -40,52 +40,23 @@
|
||||
;; :config
|
||||
;; (modus-themes-load-theme 'standard-light-tinted))
|
||||
|
||||
;; fix this
|
||||
(use-package doric-themes
|
||||
:bind ("<f5>" . doric-themes-load-random)
|
||||
:bind ("C-<f5>" . doric-load-random-light)
|
||||
:bind ("M-<f5>" . doric-load-random-dark)
|
||||
:bind ("C-<f5>" . (lambda () (interactive) (doric-themes-load-random 'light)))
|
||||
:bind ("M-<f5>" . (lambda () (interactive) (doric-themes-load-random 'dark)))
|
||||
:commands doric-themes-load-random
|
||||
:init
|
||||
(defvar my/doric-dark-themes
|
||||
'(doric-fire
|
||||
doric-valley
|
||||
doric-walnut
|
||||
doric-mermaid
|
||||
doric-pine
|
||||
doric-plum
|
||||
doric-water))
|
||||
(defvar my/doric-light-themes
|
||||
'(doric-oak
|
||||
doric-jade
|
||||
doric-wind
|
||||
doric-beach
|
||||
doric-coral
|
||||
doric-earth
|
||||
doric-almond))
|
||||
|
||||
(defun synchronise-theme ()
|
||||
(let* ((hour (string-to-number
|
||||
(substring (current-time-string) 11 13)))
|
||||
(theme-list (if (member hour (number-sequence 6 18))
|
||||
my/doric-light-themes
|
||||
my/doric-dark-themes))
|
||||
(loaded (seq-random-elt theme-list)))
|
||||
(mapc #'disable-theme custom-enabled-themes)
|
||||
(load-theme loaded :no-confirm)))
|
||||
|
||||
(substring (current-time-string) 11 13))))
|
||||
(if (member hour (number-sequence 6 18))
|
||||
(doric-themes-load-random 'light)
|
||||
(doric-themes-load-random 'dark))))
|
||||
:init
|
||||
(synchronise-theme)
|
||||
(run-with-timer 3600 3600 'synchronise-theme)
|
||||
|
||||
(defun doric-load-random-light ()
|
||||
(interactive)
|
||||
(mapc #'disable-theme custom-enabled-themes)
|
||||
(let ((loaded (seq-random-elt my/doric-light-themes)))
|
||||
(load-theme loaded :no-confirm)))
|
||||
|
||||
(defun doric-load-random-dark ()
|
||||
(interactive)
|
||||
(mapc #'disable-theme custom-enabled-themes)
|
||||
(let ((loaded (seq-random-elt my/doric-dark-themes)))
|
||||
(load-theme loaded :no-confirm))))
|
||||
)
|
||||
|
||||
(use-package rainbow-delimiters
|
||||
:hook ((prog-mode . rainbow-delimiters-mode)
|
||||
@@ -138,7 +109,7 @@
|
||||
|
||||
(pcase system-type
|
||||
('darwin ; macOS
|
||||
(set-face-attribute 'default nil :font "Sarasa Mono TC Nerd Font-22") ; 20 * 1.5
|
||||
(set-face-attribute 'default nil :font "Sarasa Term SC-22") ; 20 * 1.5
|
||||
(set-face-attribute 'variable-pitch nil :font "Bookerly-22" :weight 'light)
|
||||
(set-face-attribute 'fixed-pitch nil :font "Sarasa Term SC-22")
|
||||
|
||||
|
||||
@@ -49,13 +49,16 @@
|
||||
|
||||
;; Fast search tool `ripgrep'
|
||||
(use-package rg
|
||||
:hook (after-init . rg-enable-default-bindings)
|
||||
;; :hook (after-init . rg-enable-default-bindings)
|
||||
:bind (:map rg-global-map
|
||||
("c" . rg-dwim-current-dir)
|
||||
("f" . rg-dwim-current-file)
|
||||
("m" . rg-menu))
|
||||
:init (setq rg-show-columns t)
|
||||
:config (add-to-list 'rg-custom-type-aliases '("tmpl" . "*.tmpl")))
|
||||
:config
|
||||
(add-to-list 'rg-custom-type-aliases '("tmpl" . "*.tmpl"))
|
||||
(rg-enable-default-bindings)
|
||||
)
|
||||
|
||||
;; (use-package pdf-tools
|
||||
;; :config
|
||||
|
||||
Reference in New Issue
Block a user