From 3ae38333424ad14f5b5000bd38b37f2e7381f571 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sun, 1 Sep 2024 21:30:39 +0900 Subject: [PATCH 1/5] skk-jisyo-code of utf-8 --- .emacs.d/init.d/skk-init.el | 13 ++++++------- .emacs.d/init.el | 5 ++++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.emacs.d/init.d/skk-init.el b/.emacs.d/init.d/skk-init.el index 1a9e16cb..df82da24 100644 --- a/.emacs.d/init.d/skk-init.el +++ b/.emacs.d/init.d/skk-init.el @@ -3,15 +3,14 @@ ;; (setq skk-cdb-large-jisyo nil) -(setq skk-large-jisyo (concat external-directory "ddskk/SKK-JISYO.L")) -(setq skk-jisyo-code 'euc-jis-2004-unix) - +(setq skk-large-jisyo (concat external-directory "ddskk/SKK-JISYO.L.utf8")) +(setq skk-jisyo-code 'utf-8) (dolist (JISYO - (list "assoc" "edict" "fullname" "geo" "itaiji" "jinmei" - "law" "lisp" "mazegaki" "okinawa" "propernoun" "pubdic+" "station" - "zipcode" "office.zipcode" "JIS3_4" "JIS2004")) + (list "emoji" "JIS2004" "JIS3_4" "JIS2" "office.zipcode" "zipcode" "station" + "pubdic+" "propernoun" "propernoun" "law" "jinmei" "itaiji" "geo" + "fullname" "edict" "assoc")) (add-to-list 'skk-extra-jisyo-file-list - (concat external-directory "ddskk/SKK-JISYO." JISYO))) + (concat external-directory "ddskk/SKK-JISYO." JISYO ".utf8"))) (setq-default skk-kutouten-type 'en) (setq-default skk-kuten-touten-alist diff --git a/.emacs.d/init.el b/.emacs.d/init.el index b6c9cd69..33b96a9f 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -151,7 +151,10 @@ (,el-get-emacs "-batch" "-q" "-no-site-file" "-l" "SKK-MK" "-f" "SKK-MK-compile") ;; (,el-get-emacs "-batch" "-q" "-no-site-file" "-l" "SKK-MK" "-f" "SKK-MK-compile-info") ("cp" "skk-setup.el.in" "skk-setup.el"))) -(setopt skk-user-directory (concat external-directory "ddskk") +(setopt + skk-server-host nil + skk-server-portnum nil + skk-user-directory (concat external-directory "ddskk") skk-init-file (concat user-initial-directory "skk-init.el") skk-isearch-start-mode 'latin) (setq skk-preload nil) From 4a2f6236defe510571e2d16af7d897a5ec69156a Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sun, 1 Sep 2024 21:34:13 +0900 Subject: [PATCH 2/5] Add skkdic-maintenance.sh --- .emacs.d/bin/skkdic-maintenance.sh | 79 ++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100755 .emacs.d/bin/skkdic-maintenance.sh diff --git a/.emacs.d/bin/skkdic-maintenance.sh b/.emacs.d/bin/skkdic-maintenance.sh new file mode 100755 index 00000000..b9ccbc7c --- /dev/null +++ b/.emacs.d/bin/skkdic-maintenance.sh @@ -0,0 +1,79 @@ +#!/usr/bin/env bash + +CURRENT_DIR=$(cd $(dirname $0); pwd) +ONEDRIVE_DIR="${HOME}/OneDrive - Skirnir Inc/emacs/ddskk" + +mkdir -p skk-jisyo +cd skk-jisyo + +# https://skk-dev.github.io/dict/ +while read -r line; do + echo "Downloading $line" + curl -O "https://skk-dev.github.io/dict/${line}.gz" + gunzip -d "${line}.gz" + iconv -f euc-jisx0213 -t utf8 "${line}" \ + | sed -e 's/coding: euc-jp/coding: utf-8/g' \ + | sed -e 's/coding: euc-jis-2004/coding: utf-8/g' \ + > "${ONEDRIVE_DIR}/${line}.utf8" +done < <(cat < "${ONEDRIVE_DIR}/SKK-JISYO.edict.utf8" +iconv -f euc-jisx0213 -t utf8 zipcode/SKK-JISYO.zipcode | sed -e 's/coding: euc-jis-2004/coding: utf-8/g' > "${ONEDRIVE_DIR}/SKK-JISYO.zipcode.utf8" +iconv -f euc-jisx0213 -t utf8 zipcode/SKK-JISYO.office.zipcode | sed -e 's/coding: euc-jis-2004/coding: utf-8/g' > "${ONEDRIVE_DIR}/SKK-JISYO.office.zipcode.utf8" + +curl -O https://raw.githubusercontent.com/uasi/skk-emoji-jisyo/master/SKK-JISYO.emoji.utf8 +cp -rp SKK-JISYO.emoji.utf8 "${ONEDRIVE_DIR}/SKK-JISYO.emoji.utf8" + +skkdic-expr2 \ + SKK-JISYO.L + \ + SKK-JISYO.assoc + \ + SKK-JISYO.edict + \ + SKK-JISYO.fullname + \ + SKK-JISYO.geo + \ + SKK-JISYO.jinmei + \ + SKK-JISYO.law + \ + SKK-JISYO.propernoun + \ + SKK-JISYO.station + \ + zipcode/SKK-JISYO.zipcode + \ + zipcode/SKK-JISYO.office.zipcode + \ + SKK-JISYO.JIS2 + \ + SKK-JISYO.JIS2004 + \ + SKK-JISYO.JIS3_4 \ + > SKK-JISYO.all.euc-jisx0213 + +cat <(iconv -f euc-jisx0213 -t utf8 SKK-JISYO.all.euc-jisx0213) <(cat SKK-JISYO.emoji.utf8) > SKK-JISYO.all.utf8 + +cd $CURRENT_DIR +cp -rp skk-jisyo/SKK-JISYO.all.utf8 "${ONEDRIVE_DIR}/SKK-JISYO.all.utf8" +# backword compatibility +cp -rp skk-jisyo/SKK-JISYO.all.euc-jisx0213 "${ONEDRIVE_DIR}/SKK-JISYO.ALL.nosort" +cp -rp skk-jisyo/SKK-JISYO.all.euc-jisx0213 "${ONEDRIVE_DIR}/SKK-JISYO.ALL" +rm -rf skk-jisyo From cdc4e0c9886ffff4f256c85af3b7f013c6a1301d Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sun, 1 Sep 2024 21:35:31 +0900 Subject: [PATCH 3/5] Bump packages --- .emacs.d/el-get.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.emacs.d/el-get.lock b/.emacs.d/el-get.lock index 3bb765ce..41756aa5 100644 --- a/.emacs.d/el-get.lock +++ b/.emacs.d/el-get.lock @@ -1,5 +1,6 @@ (setq el-get-lock-package-versions - '((modus-themes :checksum "243fc35181db62e4cadc10b29a8950072443eea0") + '((emacs-todoist :checksum "205c730a4615dec20ea71ccd0a09479a420cb974") + (modus-themes :checksum "243fc35181db62e4cadc10b29a8950072443eea0") (dired-preview :checksum "411a6fd3608a42a5cb5a166ed9613366f426b664") (ddskk :checksum "8c47f46e38a29a0f3eabcd524268d20573102467") (ebuild-mode :checksum "529191d3b6691401f9612e761e1c5448f9359857") @@ -12,13 +13,13 @@ (tree-sitter-php-mode :checksum "2f791d9d83c35b11e9a14daf9a58dd7e23566041") (php-ts-mode :checksum "6c0214eb1a323cfc9cedb5e187c4ed20da763e9b") (jq-mode :checksum "d533567a680bc87060c56a50f83d80e58646d2f2") - (terraform-mode :checksum "a645c32a8f0f0d04034262ae5fea330d5c7a33c6") + (terraform-mode :checksum "abfc10f5e313c4bb99de136a14636e9bc6df74f6") (hcl-mode :checksum "ec27736c4c16fbf7f1ecab0210ec3c71ac2406fa") (elisp-tree-sitter :checksum "fa5a072128da1235e237da827daf53f71a2cd562") (fosi :checksum "c1d5ed6bc4c6c1e5d8c14c21ff0d6234e65bc83a") (wakatime-mode :checksum "25fb775178d16decb818b75f32fd23301c0f5da0") (compat :checksum "8d4e8a366681def88751f5e9975738ecd3180deb") - (lsp-bridge :checksum "d54ffdf127e92c0faae96e005026833c44007aa8") + (lsp-bridge :checksum "fe7a0729f9f46a0713b7049d20b25bb78d93f68f") (copilot :checksum "f831b2b8375950eb1cc282d15ccc78ed90f30a1a") (eldoc-box :checksum "5c067f5c195198ffd16df2f455da95e46cc8ce02") (consult-tramp :checksum "befa62baca768caa457b167e773b91f1bc7d661f") From 8ab09607ecc785c4c3e4435e863b77c53c0db126 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sun, 1 Sep 2024 21:35:46 +0900 Subject: [PATCH 4/5] Improve performance --- .emacs.d/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 33b96a9f..43e90da8 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -882,7 +882,7 @@ :type github :pkgname "manateelazycat/lsp-bridge" :depends (posframe markdown-mode yasnippet orderless)) -(add-hook 'emacs-startup-hook +(add-hook 'prog-mode-hook #'(lambda () ;; (setq lsp-bridge-enable-mode-line nil) (global-lsp-bridge-mode))) From f850e1a72fde6e4ef4ba624bdb5213fd96178790 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sun, 1 Sep 2024 21:36:44 +0900 Subject: [PATCH 5/5] Add edicorconfig-apply of web-mode --- .emacs.d/init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 43e90da8..a7d34568 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -953,6 +953,7 @@ (add-hook 'web-mode-hook #'(lambda () (setq web-mode-enable-auto-indentation nil))) + (add-hook 'web-mode-hook 'editorconfig-apply) (add-hook 'web-mode-hook 'prettier-js-mode) (add-hook 'web-mode-hook #'(lambda ()