Merge pull request #336 from nanasess/use-eask

Use Eask
nanasess · Mar 26, 2024 · 68c4cab · 68c4cab
2 parents 4157ae3 + 6cd7843
commit 68c4cab
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 111 deletions.
diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore
@@ -9,6 +9,7 @@ url
 tramp
 .edbi-ds-history
 el-get/*
+!el-get/.gitkeep
 .session
 elpa
 tutorial

diff --git a/.emacs.d/el-get.lock b/.emacs.d/el-get.lock
@@ -1,16 +1,17 @@
 (setq el-get-lock-package-versions
-      '((undo-tree :checksum "7eb78fa1fcb076621235c46fc730f485d3225dbb")
+      '((nard-icons.el :checksum "8095215a503d8048739de8b4ea4066598edb8cbb")
+        (undo-tree :checksum "7eb78fa1fcb076621235c46fc730f485d3225dbb")
         (tree-sitter-php-mode :checksum "2f791d9d83c35b11e9a14daf9a58dd7e23566041")
         (php-ts-mode :checksum "b398a871ce7dda880997196666083e850d153388")
-        (jq-mode :checksum "071c1c29bac30351ad338136f2b625e5601365cd")
-        (terraform-mode :checksum "25a22a66f81e35c75f2fdaaab89aad7f9940fe06")
+        (jq-mode :checksum "d533567a680bc87060c56a50f83d80e58646d2f2")
+        (terraform-mode :checksum "a645c32a8f0f0d04034262ae5fea330d5c7a33c6")
         (hcl-mode :checksum "ec27736c4c16fbf7f1ecab0210ec3c71ac2406fa")
         (elisp-tree-sitter :checksum "fa5a072128da1235e237da827daf53f71a2cd562")
-        (fosi :checksum "f5f61d91545e18ebe879a53f1c679da6d3aa9c4e")
-        (wakatime-mode :checksum "ef923829912c3854d230834f81083814b7c9d992")
-        (compat :checksum "32e737b145fef05105e2bad4ca34ca41072e9569")
-        (lsp-bridge :checksum "f582b8b2e32fe9bfb759fe1331791874e31e982b")
-        (copilot :checksum "421703f5dd5218ec2a3aa23ddf09d5f13e5014c2")
+        (fosi :checksum "c1d5ed6bc4c6c1e5d8c14c21ff0d6234e65bc83a")
+        (wakatime-mode :checksum "25fb775178d16decb818b75f32fd23301c0f5da0")
+        (compat :checksum "8d4e8a366681def88751f5e9975738ecd3180deb")
+        (lsp-bridge :checksum "de8f8447a65198206c38ec9aa3792c8f3b9c9c1f")
+        (copilot :checksum "d61196b0819273d0867111d9ba77ef5b0adae405")
         (eldoc-box :checksum "5c067f5c195198ffd16df2f455da95e46cc8ce02")
         (eglot :checksum "e501275e06952889056268dabe08ccd0dbaf23e5")
         (consult-tramp :checksum "befa62baca768caa457b167e773b91f1bc7d661f")
@@ -21,14 +22,14 @@
         (initchart :checksum "2df1fbc965c5ef82906a0fa76b3517c5831d3581")
         (esup :checksum "4b49c8d599d4cc0fbf994e9e54a9c78e5ab62a5f")
         (consult-dir :checksum "3f5f4b71ebe819392cb090cda71bd39a93bd830a")
-        (consult-flycheck :checksum "c371996c571b7139ef4d9a8db142bf37a7ee826b")
+        (consult-flycheck :checksum "754f5497d827f7d58009256a21af614cc44378a3")
         (sudo-edit :checksum "74eb1e6986461baed9a9269566ff838530b4379b")
-        (consult-ls-git :checksum "7ba583abc16f70c497d038bfcbddbadd6894bd3d")
-        (embark :checksum "6ced04601fb7aae70401ad5b6bf6a12469739087")
-        (orderless :checksum "e6784026717a8a6a7dcd0bf31fd3414f148c542e")
-        (marginalia :checksum "ec2e99f8a12a818ddac2f7db8438477725a1a067")
-        (consult :checksum "e408ccfa41f542c1f55db1f15972291f1c79a557")
-        (vertico :checksum "7e2375b6f09579b5845dbf35ad168a8c6fc70e66")
+        (consult-ls-git :checksum "3ccd9d80da73a05ef2a74616ffdc469860f74c21")
+        (embark :checksum "15c95aee0ec6f42ee3b7a0bc6cf1e2c1ad91dfcd")
+        (orderless :checksum "3847f311077efa17951a786d2759f2639c5f43c8")
+        (marginalia :checksum "3275d1f85cb020280979a050054b843f7563aea2")
+        (consult :checksum "7533460e530a1e7abc89b4da8ad99b696fca8a30")
+        (vertico :checksum "68e51fda552a2f91caab69e83564bc91275b09b1")
         (gcmh :checksum "0089f9c3a6d4e9a310d0791cf6fa8f35642ecfd9")
         (with-eval-after-load-feature-el :checksum "0b38651a5f0dafdfe04bd0032eb5ff803e99460b")
         (forge :checksum "6a820a424465900b0cc7bc54ccdad6491764e581")
@@ -39,12 +40,12 @@
         (treepy :checksum "7c4a0d21322506a4d4b2301b4274ec955b429b47")
         (emacsql :checksum "373975cbccf7776af771e23f86043b236a330702")
         (yaml :checksum "73fde9d8fbbaf2596449285df9eb412ae9dd74d9")
-        (mermaid-mode :checksum "e4e4bb8cca72e7eff322229719f028908b52ce3f")
+        (mermaid-mode :checksum "d8bfb8c819cda9ead19c871842f6b0b8d56c56c0")
         (tree-mode :checksum "b06078826d5875d74b0e7b7ac47b0d0917610534")
-        (with-editor :checksum "59867aebe16454be4d8c0c858f3b00b8a34f3f61")
-        (terminal-here :checksum "4bf2a77e450b260570033afda463e178fdf34617")
-        (emacs-sql-indent :checksum "d6f451dc09fb1a6f38a8327cf46ef246431afbd9")
-        (editorconfig :checksum "e1a391a618ec33d157822dbcc51d010559289f1a")
+        (with-editor :checksum "5db5f0eb2202f52d44f529fe00654c866bb64eb1")
+        (terminal-here :checksum "c996304c1e873e561108a509129b9e4358d354d5")
+        (emacs-sql-indent :checksum "c3dd49ccd1f0655ed1699058c16a777ac1cb1419")
+        (editorconfig :checksum "6b85f0475f01ff97f3233acb68e2646d2ca32a91")
         (recentf-ext :checksum "95f81dfac24d3f67002024f0a24e6b997bf6d647")
         (plantuml-mode :checksum "5889166b6cfe94a37532ea27fc8de13be2ebfd02")
         (po-mode :checksum "3c97f0d391751956fdcf9f4c858d45c60405dd35")
@@ -54,22 +55,22 @@
         (emacs-inertial-scroll :checksum "c0bdcc3f3196610d98ea90210cc16f1e68250d15")
         (scratch-pop :checksum "cbe842fd78e4b742ece9fc493ebf43e69d872866")
         (auto-save-buffers-enhanced :checksum "461e8c816c1b7c650be5f209078b381fe55da8c6")
-        (popwin :checksum "1e57430615b60bf33e85228f7cc625537f468241")
+        (popwin :checksum "f4bf2e4cbda328359b06d89e233c951cba30363e")
         (twittering-mode :checksum "114891e8fdb4f06b1326a6cf795e49c205cf9e29")
-        (mew :checksum "97e21004fedf303b74f42aacd7f33a1820ea9ad7")
-        (dockerfile-mode :checksum "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c")
+        (mew :checksum "f46b06dba0c7f0aa371be30d704b6d9ba30a8321")
+        (dockerfile-mode :checksum "39a012a27fcf6fb629c447d13b6974baf906714c")
         (lsp-haskell :checksum "485c1148ce4d27030bb95b21c7289809294e7d31")
-        (haskell-mode :checksum "43b4036bf02b02de75643a1a2a31e28efac1c50b")
+        (haskell-mode :checksum "d23ec34788286405f377ce485d2a17e302d94a4f")
         (csharp-mode :checksum "02c61c219b2c22491eff9b7315fed661fab423d4")
-        (csv-mode :checksum "db8a3e3aef31d35ce5bd1fd09127a3bbfdd0c340")
-        (groovy-mode :checksum "c612ac1e9f742856914ad6e8eb9e9dc169f489ab")
-        (phpstan :checksum "cce2b02a7f91525423b14dbdae304c1c6b8a1817")
+        (csv-mode :checksum "63f02980978f19786bda354457ac5259b8f969a2")
+        (groovy-mode :checksum "7b8520b2e2d3ab1d62b35c426e17ac25ed0120bb")
+        (phpstan :checksum "563589435a798250274306dbb9cd4c85e9949d6c")
         (phpactor :checksum "272217fbb6b7e7f70615fc518d77c6d75f33a44f")
-        (composer :checksum "5af1707fefbd9d7db1102afdaeb8f2da893fea37")
-        (php-skeleton :checksum "208202c772be1320857d7b1ade9be28a8ddb35e5")
-        (php-runtime :checksum "36e6ae862cb02104b5782a563f0a5846c00e0082")
+        (composer :checksum "91945f1bdb655be272320d14dab306b661a128a1")
+        (php-skeleton :checksum "0e0f891e7dd8335bddc1335eca7f424394e524ce")
+        (php-runtime :checksum "b01e840ecf23690595ea109e04889fafdb526619")
         (php-mode :checksum "4a29636243ba7f4afba476348587713531d994bc")
-        (yaml-mode :checksum "3fcb36d6039bef57e2a0f6e24c51f623c0bf5fb7")
+        (yaml-mode :checksum "7b5ce294fb15c2c8926fa476d7218aa415550a2a")
         (web-mode :checksum "9fdbfa0eeee40e4a3bcf990c81203dce7e028c67")
         (web-completion-data :checksum "c272c94e8a71b779c29653a532f619acad433a4f")
         (tide :checksum "4cf6a0d89da7f946565a425a632ee2410a40c7da")
@@ -83,53 +84,53 @@
         (dap-mode :checksum "7f924d7feacb2c271e5cde179f6fe1c390a78223")
         (lsp-treemacs :checksum "9859326df6b8e8c954a3c227e53b6878e54aaae8")
         (lsp-mode :checksum "7153b3d8648e8bad780df2dc2801170f943c5c9d")
-        (posframe :checksum "dace2dcf105e9685b4085836645b3392dc7e2211")
+        (posframe :checksum "017deece88360c7297265680d78a0bb316470716")
         (bui :checksum "f3a137628e112a91910fd33c0cff0948fa58d470")
         (treemacs :checksum "8b7638e69f64dcef05f1bd04dbc82c829e8bf261")
         (ace-window :checksum "77115afc1b0b9f633084cf7479c767988106c196")
         (avy :checksum "955c8dedd68c74f3cf692c1249513f048518c4c9")
         (hydra :checksum "317e1de33086637579a7aeb60f77ed0405bf359b")
         (pfuture :checksum "19b53aebbc0f2da31de6326c495038901bffb73c")
-        (flycheck :checksum "5f2ef177cb21ae8b73714575802beef04abd0f5e")
+        (flycheck :checksum "bf11b2a3eb2f9dc0eb07cc8fb6b5be606e6a698a")
         (pkg-info :checksum "76ba7415480687d05a4353b27fea2ae02b8d9d61")
         (epl :checksum "78ab7a85c08222cd15582a298a364774e3282ce6")
-        (ht :checksum "3c1677f1bf2ded2ab07edffb7d17def5d2b5b6f6")
+        (ht :checksum "1c49aad1c820c86f7ee35bf9fff8429502f60fef")
         (spinner :checksum "d4647ae87fb0cd24bc9081a3d287c860ff061c21")
         (request :checksum "01e338c335c07e4407239619e57361944a82cb8a")
         (deferred :checksum "2239671d94b38d92e9b28d4e12fd79814cfb9c16")
-        (markdown-mode :checksum "e096bb97a91fcd4dc2b46d8b6e093194b03b7364")
+        (markdown-mode :checksum "fd6c5508f979ab526e024a591eaec963712cb211")
         (frame-local :checksum "7ee1106c3bcd4022f48421f8cb1ef4f995da816e")
         (helm-swoop :checksum "1b3285791f1dc1fde548fe67aec07214d698fd57")
-        (wgrep :checksum "edf768732a56840db6879706b64c5773c316d619")
+        (wgrep :checksum "208b9d01cfffa71037527e3a324684b3ce45ddc4")
         (helm-descbinds :checksum "b72515982396b6e336ad7beb6767e95a80fca192")
         (helm-ls-git :checksum "ae2202fbbbe11873ad4b393a6959da50ac250c1e")
         (helm :checksum "4e99cc8ef66aac2d824c456f58abe833be26c99d")
         (howm :checksum "ffc1e7da1f02f750094a9f0fe8a0aa837743193b")
-        (magit :checksum "dda332b2a41569f5fd8c0c2c3c2dab902d48ceb4")
-        (transient :checksum "75a5076def1e6f5265eb2346a951ba9d97502fc9")
+        (magit :checksum "0e8f25a8d8011328f2bf082232c720b24c2a12c2")
+        (transient :checksum "55d5d41b48d7f7bc1ecf1f90c012d7821dff5724")
         (smart-jump :checksum "3392eb35e3cde37e6f5f2a48dc0db15ca535143c")
-        (dumb-jump :checksum "0a783d1db610ff1dc4e1b7869589cff16ff92f7a")
-        (popup :checksum "71cede0588c10526f88dd0375bce776ec2eed05e")
-        (multiple-cursors :checksum "6956e8e12ee191d7c80d042ae8ff495286fcbe38")
-        (expand-region :checksum "b70feaa644310dc2d599dc277cd20a1f2b6446ac")
-        (yasnippet-snippets :checksum "ffdabd7990013718f6b765bfd5e3f1899430d2cc")
-        (yasnippet :checksum "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6")
+        (dumb-jump :checksum "ede6a04187e79a29ef31d14760ac0d8d4c5f4cc5")
+        (popup :checksum "4d6f6c22a5abf130fe8359171cb9d6b00dc41c0b")
+        (multiple-cursors :checksum "c870c18462461df19382ecd2f9374c8b902cd804")
+        (expand-region :checksum "e8f4e0fe9c9a80a6a26e2b438502aba9a799d580")
+        (yasnippet-snippets :checksum "e6ec9f1822913cea7dc67cde6aeb8f2625980950")
+        (yasnippet :checksum "33587a8551b8f6991b607d3532062a384c010ce1")
         (easy-kill :checksum "de7d66c3c864a4722a973ee9bc228a14be49ba0c")
         (visual-regexp :checksum "48457d42a5e0fe10fa3a9c15854f1f127ade09b5")
-        (migemo :checksum "f756cba3d5268968da361463c2e29b3a659a3de7")
+        (migemo :checksum "7d78901773da3b503e5c0d5fa14a53ad6060c97f")
         (prettier-js :checksum "e9b73e81d3e1642aec682195f127a42dfb0b5774")
         (emacs-async :checksum "3bd17d58e1ca14c629e72acfbd77138ff5adc1d6")
-        (symbol-overlay :checksum "ed007230378b03f384b5a2b643dd857010ef21d3")
-        (doom-modeline :checksum "236fa330c631228e9a513dea2f4598a29b7e8444")
+        (symbol-overlay :checksum "de215fff392c916ffab01950fcb6daf6fd18be4f")
+        (doom-modeline :checksum "2e420e64ffadc7489e281ea69e572cd0e415fbcb")
         (eldoc-eval :checksum "e91800503c90cb75dc70abe42f1d6ae499346cc1")
-        (shrink-path :checksum "9d06c453d1537df46a4b703a29213cc7f7857aa0")
-        (f :checksum "af7d37c619010b576fd22b50c62c71ff33093f3c")
-        (s :checksum "e957dcb0677da18b2bb60ad867db5df5c35b5616")
-        (dash :checksum "c30c6bea49b79d966c92ce606fea53dea647b959")
+        (shrink-path :checksum "0bf09bf4d4a90ca183a8806271740239d3ae6703")
+        (f :checksum "1e7020dc0d4c52d3da9bd610d431cab13aa02d8c")
+        (s :checksum "dda84d38fffdaf0c9b12837b504b402af910d01d")
+        (dash :checksum "5df7605da5a080df769d4f260034fb0e5e86a7a4")
         (cp5022x :checksum "ea7327dd75e54539576916f592ae1be98179ae35")
-        (ddskk :checksum "c24a624884a3cfb0c28d6d5b9eb19e01387f0917")
-        (doom-themes :checksum "4c239dbe42232e81c28901000f435746de2a55ab")
-        (all-the-icons :checksum "51bf77da1ebc3c199dfc11f54c0dce67559f5f40")
+        (ddskk :checksum "8c47f46e38a29a0f3eabcd524268d20573102467")
+        (doom-themes :checksum "37d2182f5078d29fb22bbace346e523bb84b2c4e")
+        (all-the-icons :checksum "ee414384938ccf2ce93c77d717b85dc5538a257d")
         (memoize :checksum "51b075935ca7070f62fae1d69fe0ff7d8fa56fdd")
         (el-get-lock :checksum "df8cfe55441695865a64b97946750b6413a40425")))
 (setq el-get-lock-locked-packages 'nil)

diff --git a/.emacs.d/el-get/.gitkeep b/.emacs.d/el-get/.gitkeep
@@ -0,0 +1 @@
+()
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
@@ -286,9 +286,12 @@
   :depends (dash f s))
 (el-get-bundle memoize)
 (el-get-bundle all-the-icons)
+(el-get-bundle nard-icons.el
+  :type github
+  :pkgname "rainstormstudio/nerd-icons.el")
 (el-get-bundle doom-modeline
   :type github
-  :depends (all-the-icons dash eldoc-eval shrink-path)
+  :depends (all-the-icons dash eldoc-eval shrink-path nard-icons.el)
   :pkgname "seagle0128/doom-modeline")
 (with-eval-after-load 'doom-modeline-core
   (with-eval-after-load 'all-the-icons
@@ -568,13 +571,13 @@
   (define-key smerge-mode-map (kbd "M-n") 'smerge-next)
   (define-key smerge-mode-map (kbd "M-p") 'smerge-prev))
 
+(setopt howm-directory (concat external-directory "howm/"))
 (el-get-bundle howm
   :type git
   :url "git://git.osdn.jp/gitroot/howm/howm.git"
   :build `(("./configure" ,(concat "--with-emacs=" el-get-emacs)) ("make"))
   :prepare (progn
              (defvar howm-menu-lang 'ja)
-             (defvar howm-directory (concat external-directory "howm/"))
              (defvar howm-file-name-format "%Y/%m/%Y-%m-%d-%H%M%S.txt")
              (defvar howm-history-file (concat howm-directory ".howm-history"))
              (defvar howm-keyword-file (concat howm-directory ".howm-keys"))
@@ -1138,13 +1141,13 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- )
+ '(vertico-group-title ((t (:foreground "#788484")))))
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- )
+ '(package-selected-packages '(queue)))
 ;; (profiler-report)
 ;; (profiler-stop)
 (setq file-name-handler-alist my/saved-file-name-handler-alist)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,64 +14,26 @@ on:
       - '!*.md'
 
 jobs:
-  run-on-mac:
-    name: Run on Mac
+  build:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest ]
+        os: [ubuntu-latest, macos-latest]
+        emacs-version:
+          - "29.2"
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Checkout Emacs
-      uses: actions/checkout@v4
+    - uses: actions/checkout@v4
+    - uses: purcell/setup-emacs@master
       with:
-        repository: nanasess/emacs-package
-        ref: for-carbon-emacs
-        path: ./emacs-package
-        submodules: true
-    - name: prepare
-      run: |
-        git config --global user.name "Kentaro Ohkouchi"
-        git config --global user.email nanasess@example.com
-        brew install texinfo pkg-config
-        cd ./emacs-package/emacs && ./autogen.sh
-
-    - name: build emacs
-      working-directory: ./emacs-package
-      run: |
-        sudo mkdir -p /usr/local/libexec
-        sudo chown -R runner /usr/local/libexec
-        export PATH="/usr/local/opt/texinfo/bin:$PATH"
-        export PATH="/usr/local/opt/gnutls/bin:$PATH"
-        make install
-
-    - run: emacs-package/emacs/mac/Emacs.app/Contents/MacOS/Emacs --version
-    - name: bootstrap
-      run: emacs-package/emacs/mac/Emacs.app/Contents/MacOS/Emacs -q -l .emacs.d/init.el --batch
-    - name: byte-compile
-      run: emacs-package/emacs/mac/Emacs.app/Contents/MacOS/Emacs -q -l .emacs.d/init.el --batch -f batch-byte-compile .emacs.d/init.el
-  run-on-ubuntu:
-    name: Run on Ubuntu
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest ]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: build emacs
+        version: ${{ matrix.emacs-version }}
+    - uses: emacs-eask/setup-eask@master
+      with:
+        version: 'snapshot'
+    - run: mv .emacs.d/el-get/.gitkeep .emacs.d/el-get/.status.el
+    - run: emacs -Q -l .emacs.d/early-init.el -l .emacs.d/init.el  --batch
+    - name: Eask
       run: |
-         sudo add-apt-repository ppa:kelleyk/emacs
-         sudo apt-fast update
-         sudo apt-fast install -y texinfo emacs28
+        eask clean all
+        eask compile
 
-    - run: emacs --version
-    - name: bootstrap
-      run: |
-        emacs -q -l .emacs.d/init.el --batch
-    - name: byte-compile
-      run: |
-        emacs -q -l .emacs.d/init.el --batch -f batch-byte-compile .emacs.d/init.el
diff --git a/Eask b/Eask
@@ -0,0 +1,14 @@
+(package "nanasess/dotfiles"
+         "0.0.1"
+         "")
+
+(website-url "")
+(keywords "")
+
+(package-file ".emacs.d/init.el")
+
+(script "test" "echo \"Error: no test specified\" && exit 1")
+
+(source "gnu")
+
+(depends-on "emacs" "29.2")