Emacs : migration done.

This commit is contained in:
2023-01-17 20:48:50 +09:00
parent dc264e1e9d
commit cdc9d036ae

View File

@ -170,8 +170,8 @@ Emacs Configuration for emacs 29.50
(require 'custom-latex) (require 'custom-latex)
(require 'custom-org) (require 'custom-org)
;;(require 'custom-workspaces) ;;(require 'custom-workspaces)
;;(require 'custom-languages) (require 'custom-languages)
;;(require 'custom-extra) (require 'custom-extra)
;;; config.el ends here ;;; config.el ends here
#+end_src #+end_src
@ -1065,7 +1065,7 @@ my-blog jaeus.net
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-org.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-org.el
(use-package ox-hugo (use-package ox-hugo
:straight (:build t) :straight (:build t)
:defer t) :after ox)
#+end_src #+end_src
***** TODO Engrave-faces ***** TODO Engrave-faces
latex export code block latex export code block
@ -1389,7 +1389,7 @@ speed-up insertion of environments and math templates.
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-latex.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-latex.el
(use-package latex-preview-pane (use-package latex-preview-pane
:straight (:build t) :straight (:build t)
:defer t) :ensure t)
#+end_src #+end_src
**** Provide Modules **** Provide Modules
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-latex.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-latex.el
@ -1399,10 +1399,12 @@ speed-up insertion of environments and math templates.
*** Extra *** Extra
**** Helpful **** Helpful
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el
(usr-package-install 'helpful) (use-package helpful
(customize-set-variable 'counsel-describe-function-function #'helpful-callable) :straight (:build t)
(customize-set-variable 'counsel-describe-variable-function #'helpful-variable) :defer t
(require 'helpful) :custom
(counsel-describe-function-function #'helpful-callable)
(counsel-describe-variable-function #'helpful-variable))
;;:commands (helpful-callable helpful-variable helpful-command helpful-key) ;;:commands (helpful-callable helpful-variable helpful-command helpful-key)
(global-set-key [remap describe-function] #'describe-function) (global-set-key [remap describe-function] #'describe-function)
(global-set-key [remap describe-command] #'helpful-command) (global-set-key [remap describe-command] #'helpful-command)
@ -1411,8 +1413,11 @@ speed-up insertion of environments and math templates.
#+end_src #+end_src
**** Avy **** Avy
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el
(usr-package-install 'avy) (use-package avy
(setq avy-all-windows t) :straight (:build t)
:defer t
:config
(setq avy-all-windows t))
(ju/leader-key-def (ju/leader-key-def
"v" '(:ignore t :which-key "Avy") "v" '(:ignore t :which-key "Avy")
"vc" '(avy-goto-char :which-key "Avy Goto Char") "vc" '(avy-goto-char :which-key "Avy Goto Char")
@ -1421,54 +1426,68 @@ speed-up insertion of environments and math templates.
#+end_src #+end_src
**** Snippet **** Snippet
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el
(usr-package-install 'yasnippet) (use-package yasnippet
(usr-package-install 'yasnippet-snippets) :straight (:build t)
:defer t
:hook (prog-mode . yas-minor-mode)
:config
(defvar yas-snippet-dirs nil) (defvar yas-snippet-dirs nil)
(add-hook 'prog-mode-hook #'yas-minor-mode)
(add-to-list 'yas-snippet-dirs "~/.config/emacs/snippets") (add-to-list 'yas-snippet-dirs "~/.config/emacs/snippets")
(yas-global-mode 1) (yas-global-mode 1))
(ju/leader-key-def (ju/leader-key-def
"i s" '(yas-insert-snippet :which-key "snippet")) "i s" '(yas-insert-snippet :which-key "snippet"))
#+end_src #+end_src
**** Emojify **** Emojify
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el
(usr-package-install 'emojify) (use-package emojify
(global-emojify-mode 1) :straight (:build t)
:defer t
:init (global-emojify-mode 1))
(ju/leader-key-def (ju/leader-key-def
"i e" '(emojify-insert-emoji :which-key "emoji")) "i e" '(emojify-insert-emoji :which-key "emoji"))
#+end_src #+end_src
**** PDF Tool **** PDF Tool
enhanced PDF viewer on emacs enhanced PDF viewer on emacs
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el
(usr-package-install 'pdf-tools) (use-package pdf-tools
(require 'pdf-tools) :defer t
(pdf-tools-install) :config
(setq-default pdf-view-display-size 'fit-width) ;;(pdf-tools-install)
(setq-default pdf-view-display-size 'fit-width))
#+end_src #+end_src
**** PDF view restore **** PDF view restore
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el
(usr-package-install 'pdf-view-restore) (use-package pdf-view-restore
(add-hook 'pdf-view-mode-hook #'pdf-view-restore-mode) :straight (:build t)
:defer t
:hook (pdf-view-mode . pdf-view-restore-mode)
:config
(setq pdf-view-restore-filename (expand-file-name ".tmp/pdf-view-restore" (setq pdf-view-restore-filename (expand-file-name ".tmp/pdf-view-restore"
user-emacs-directory)) user-emacs-directory)))
#+end_src #+end_src
**** Nov **** Nov
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el
(usr-package-install 'nov) (use-package nov
(add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode)) :straight (:build t)
:defer t
:config
(add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode)))
#+end_src #+end_src
**** Openwith **** Openwith
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el
(usr-package-install 'openwith) (use-package openwith
(setq larget-file-warning-threshold nil) :straight (:build t)
:defer t
:config
(openwith-mode t) (openwith-mode t)
(setq larget-file-warning-threshold nil)
(setq openwith-associations (setq openwith-associations
(list (list (openwith-make-extension-regexp (list (list (openwith-make-extension-regexp
'("mpg" "mpeg" "mp3" "mp4" "m4v" '("mpg" "mpeg" "mp3" "mp4" "m4v"
"avi" "wmv" "wav" "mov" "flv" "avi" "wmv" "wav" "mov" "flv"
"ogm" "ogg" "mkv")) "ogm" "ogg" "mkv"))
"mpv" "mpv"
'(file)))) '(file)))))
;;(list (openwith-make-extension-regexp ;;(list (openwith-make-extension-regexp
;; '("html" "htm")) ;; '("html" "htm"))
;; "qutebrowser" ;; "qutebrowser"
@ -1477,18 +1496,24 @@ enhanced PDF viewer on emacs
**** Calfw **** Calfw
calendar calendar
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el
(usr-package-install 'calfw) (use-package calfw
(usr-package-install 'calfw-org) :straight (:build t)
:defer t)
#+end_src #+end_src
**** ELFEED **** ELFEED
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el
(usr-package-install 'elfeed) (use-package elfeed
(usr-package-install 'elfeed-goodies) :straight (:build t)
(usr-package-install 'elfeed-org) :defer t)
(use-package elfeed-goodies
(require 'elfeed-org) :straight (:build t)
:defer t)
(use-package elfeed-org
:straight (:build t)
:defer t
:config
(elfeed-org) (elfeed-org)
(setq rmh-elfeed-org-files (list (expand-file-name "elfeed.org" user-emacs-directory))) (setq rmh-elfeed-org-files (list (expand-file-name "elfeed.org" user-emacs-directory))))
#+end_src #+end_src
**** Provide Modules **** Provide Modules
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-extra.el
@ -1524,75 +1549,94 @@ calendar
#+end_src #+end_src
**** Treesitter **** Treesitter
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el
(if (version< emacs-version "29") ;;(if (version< emacs-version "29")
(progn ;;(use-package tree-sitter
(usr-package-install 'tree-sitter) ;; :straight (:build t)
(usr-package-install 'tree-sitter-langs) ;; :defer t
(require 'tree-sitter) ;; :init (global-tree-sitter-mode))
(global-tree-sitter-mode))) ;;(use-package tree-sitter-langs
;; :straight (:build t)
;; :defer t
;; :after tree-sitter))
#+end_src #+end_src
**** eglot **** eglot
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el
(if (version< emacs-version "29") (if (version< emacs-version "29")
(usr-package-install 'eglot)) (use-package eglot
:straight (:build t)
:defer t))
#+end_src #+end_src
**** Rust **** Rust
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el
(usr-package-install 'rust-mode) (use-package rust-mode
:straight (:build t)
:defer t)
#+end_src #+end_src
**** Python **** Python
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el
(usr-package-install 'jupyter) (use-package jupyter
(setq org-babel-jupyter-override-src-block "python") :straight (:build t)
:defer t
:config
(setq org-babel-jupyter-override-src-block "python"))
#+end_src #+end_src
**** CMAKE **** CMAKE
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el
(usr-package-install 'cmake-mode) ;;(use-package cmake-mode
;; :straight (:build t)
;; :defer t)
#+end_src #+end_src
**** Haskell **** Haskell
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el
(usr-package-install 'haskell-mode) (use-package haskell-mode
:straight (:build t)
:defer t)
#+end_src #+end_src
**** Markdown **** Markdown
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el
(usr-package-install 'markdown-mode) (use-package markdown-mode
:straight (:build t)
:defer t
:config
(add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode)) (add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode))
(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode)) (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
(add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode)) (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
(setq markdown-command "multimarkdown") (setq markdown-command "multimarkdown"))
#+end_src #+end_src
**** PKGBUILD **** PKGBUILD
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el
(usr-package-install 'pkgbuild-mode) (use-package pkgbuild-mode
;;(phundrak/major-leader-key :straight (:build t)
;; :keymaps 'pkgbuild-mode-map :defer t)
;; "c" #'pkgbuild-syntax-check
;; "i" #'pkgbuild-initialize
;; "I" #'pkgbuild-increase-release-tag
;; "m" #'pkgbuild-makepkg
;; "u" '(:ignore :wk "update")
;; "us" #'pkgbuild-update-sums-line
;; "uS" #'pkgbuild-update-srcinfo))
#+end_src #+end_src
**** Systemd **** Systemd
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el
(usr-package-install 'systemd) (use-package systemd
:straight (:build t)
:defer t)
#+end_src #+end_src
**** Toml **** Toml
#+begin_src emacs-lisp #+begin_src emacs-lisp
(usr-package-install 'toml-mode) (use-package toml-mode
(add-to-list 'auto-mode-alist '("/\\(Cargo.lock\\|\\.cargo/config\\)\\'" . toml-mode)) :straight (:build t)
:defer t
:config
(add-to-list 'auto-mode-alist '("/\\(Cargo.lock\\|\\.cargo/config\\)\\'" . toml-mode)))
#+end_src #+end_src
**** Gnuplot **** Gnuplot
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el
(usr-package-install 'gnuplot) (use-package gnuplot
:straight (:build t)
:defer t)
#+end_src #+end_src
**** Graphviz dot Mode **** Graphviz dot Mode
org mode graph drawing with graphviz org mode graph drawing with graphviz
#+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el #+begin_src emacs-lisp :mkdirp yes :tangle ~/.config/emacs/modules/custom-languages.el
(usr-package-install 'graphviz-dot-mode) (use-package graphviz-dot-mode
:straight (:build t)
:defer t)
#+end_src #+end_src
**** Verilog Indent **** Verilog Indent
LSP -> veriloter LSP -> veriloter