akirak · akirak · Dec 30, 2023 · Jul 16, 2023 · Jul 30, 2023 · Sep 27, 2023
diff --git a/.github/workflows/rebase-onto-upstream.yml b/.github/workflows/rebase-onto-upstream.yml
@@ -0,0 +1,44 @@
+name: Rebase onto upstream
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 8 * * 5'
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        base_ref:
+          - akirak
+          # - admin
+        upstream_branch:
+          - 'master'
+
+    steps:
+
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        ref: ${{ matrix.base_ref }}
+
+    - name: Fetch the upstream
+      run: |
+        git remote add upstream https://github.com/melpa/melpa.git
+        git fetch upstream ${{ matrix.upstream_branch }}
+
+    - name: Cherry pick commits
+      run: |
+        git config --add user.name 'github-actions[bot]'
+        git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com'
+        git rebase -s ort -X theirs upstream/${{ matrix.upstream_branch }}
+
+    - uses: peter-evans/create-pull-request@v5
+      with:
+        base: ${{ matrix.base_ref }}
+        title: 'Rebase onto upstream'
+        branch: 'rebase-${{ matrix.base_ref }}'
+        labels: automation
+        token: ${{ secrets.PAT_FOR_PR }}
diff --git a/.github/workflows/reset-on-merge.yml b/.github/workflows/reset-on-merge.yml
@@ -0,0 +1,49 @@
+name: Reset on merge
+
+on:
+  pull_request:
+    types:
+    - closed
+
+jobs:
+  reset:
+
+    if: |
+      github.event.pull_request.merged == true &&
+      github.base_ref == 'akirak' &&
+      github.head_ref == 'rebase-akirak' &&
+      github.event.pull_request.head.repo.id == github.event.pull_request.base.repo.id
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        ref: ${{ github.base_ref }}
+
+    - name: Tag the last head revision
+      id: backup
+      run: |
+        tag="${{ github.base_ref }}-backup-$(date +'%Y%m%d%H%M%S')"
+        git tag "$tag" "$(git rev-parse HEAD~1)"
+        echo "tag=$tag" >> "$GITHUB_OUTPUT"
+
+    - name: Push the tag
+      uses: ad-m/github-push-action@master
+      with:
+        tags: true
+        branch: ${{ steps.backup.outputs.tag }}
+
+    - name: Reset
+      run: |
+        git reset --hard "$rev"
+      env:
+        rev: ${{ github.head_ref }}
+
+    - name: Push the resetted branch
+      uses: ad-m/github-push-action@master
+      with:
+        branch: ${{ github.base_ref }}
+        force: true
diff --git a/recipes/acm b/recipes/acm
@@ -0,0 +1,2 @@
+(acm :fetcher github :repo "manateelazycat/lsp-bridge"
+     :files ("acm/*.el" "acm/icons"))
diff --git a/recipes/akirak b/recipes/akirak
@@ -0,0 +1,2 @@
+(akirak :fetcher github :repo "akirak/emacs-config"
+        :files ("emacs/lisp/*.el"))
diff --git a/recipes/apprentice b/recipes/apprentice
@@ -0,0 +1 @@
+(apprentice :fetcher github :repo "Sasanidas/Apprentice")
diff --git a/recipes/avy-riben b/recipes/avy-riben
@@ -0,0 +1,2 @@
+(avy-riben :fetcher github :repo "akirak/emacs-dumb-japanese"
+           :files ("avy-riben.el"))
diff --git a/recipes/beancount b/recipes/beancount
@@ -0,0 +1 @@
+(beancount :fetcher github :repo "beancount/beancount-mode")
diff --git a/recipes/benchmark-init b/recipes/benchmark-init
@@ -1 +1,6 @@
-(benchmark-init :fetcher github :repo "dholm/benchmark-init-el")
+;; I initially intended to use this fork until a bugfix PR is merged.
+;;
+;; However, I added another patch which further enhances the package,
+;; so I probably won't switch back to the original.
+;; https://github.com/akirak/benchmark-init-el/commit/cc16e08c3d3a6e0044046b74c3f6544e46250d4a
+(benchmark-init :fetcher github :repo "akirak/benchmark-init-el")
diff --git a/recipes/bfmt b/recipes/bfmt
@@ -0,0 +1 @@
+(bfmt :fetcher github :repo "akirak/bfmt.el")
diff --git a/recipes/chatgpt b/recipes/chatgpt
@@ -0,0 +1 @@
+(chatgpt :fetcher github :repo "joshcho/ChatGPT.el")
diff --git a/recipes/clipsave b/recipes/clipsave
@@ -0,0 +1,2 @@
+(clipurl :fetcher github :repo "akirak/clipurl.el"
+         :files ("clipsave.el"))
diff --git a/recipes/clipurl b/recipes/clipurl
@@ -0,0 +1,2 @@
+(clipurl :fetcher github :repo "akirak/clipurl.el"
+         :files ("clipurl.el"))
diff --git a/recipes/codeium b/recipes/codeium
@@ -0,0 +1 @@
+(codeium :fetcher github :repo "Exafunction/codeium.el")
diff --git a/recipes/coercion b/recipes/coercion
@@ -0,0 +1,3 @@
+(coercion
+ :fetcher github
+ :repo "liuyinz/coercion.el")
diff --git a/recipes/consult-org-dog b/recipes/consult-org-dog
@@ -0,0 +1,2 @@
+(consult-org-dog :fetcher github :repo "akirak/org-dog"
+                 :files ("extra/consult-org-dog.el"))
diff --git a/recipes/consult-org-nlink b/recipes/consult-org-nlink
@@ -0,0 +1,2 @@
+(consult-org-nlink :fetcher github :repo "akirak/org-nlink.el"
+                   :files ("consult-org-nlink.el"))
diff --git a/recipes/copilot b/recipes/copilot
@@ -0,0 +1 @@
+(copilot :fetcher github :repo "zerolfx/copilot.el" :files ("dist" "*.el"))
diff --git a/recipes/dape b/recipes/dape
@@ -0,0 +1 @@
+(dape :fetcher github :repo "svaante/dape")
diff --git a/recipes/dash-docs b/recipes/dash-docs
@@ -1,2 +1,3 @@
 (dash-docs :repo "dash-docs-el/dash-docs"
-                 :fetcher github)
+           :fetcher github
+           :files (:defaults (:exclude "use-package-dash-docs.el")))
diff --git a/recipes/dired-auto-readme b/recipes/dired-auto-readme
@@ -0,0 +1 @@
+(dired-auto-readme :fetcher github :repo "amno1/dired-auto-readme")
diff --git a/recipes/duckduckgo b/recipes/duckduckgo
@@ -0,0 +1 @@
+(duckduckgo :fetcher github :repo "akirak/duckduckgo.el")
diff --git a/recipes/eglot-x b/recipes/eglot-x
@@ -0,0 +1 @@
+(eglot-x :fetcher github :repo "nemethf/eglot-x")
diff --git a/recipes/embark-org b/recipes/embark-org
@@ -0,0 +1,2 @@
+(embark-org :fetcher github :repo "oantolin/embark"
+            :files ("embark-org.el"))
diff --git a/recipes/eval-in-repl b/recipes/eval-in-repl
@@ -1,3 +1,3 @@
-(eval-in-repl :fetcher github
-              :repo    "kaz-yos/eval-in-repl"
-              :commit  "origin/master")
+;; Override the recipe because :commit "origin/master"
+;; is problematic in the Nix fetcher
+(eval-in-repl :fetcher github :repo "kaz-yos/eval-in-repl")
diff --git a/recipes/flymake-actionlint1 b/recipes/flymake-actionlint1
@@ -0,0 +1 @@
+(flymake-actionlint1 :fetcher github :repo "akirak/flymake-actionlint1")
diff --git a/recipes/ghelp b/recipes/ghelp
@@ -0,0 +1,2 @@
+(ghelp :fetcher github :repo "casouri/ghelp"
+       :files (:defaults (:exclude "ghelp-*.el") "ghelp-builtin.el"))
diff --git a/recipes/ghelp-eglot b/recipes/ghelp-eglot
@@ -0,0 +1,2 @@
+(ghelp :fetcher github :repo "casouri/ghelp"
+       :files ("ghelp-eglot.el"))
diff --git a/recipes/ghelp-geiser b/recipes/ghelp-geiser
@@ -0,0 +1,2 @@
+(ghelp :fetcher github :repo "casouri/ghelp"
+       :files ("ghelp-geiser.el"))
diff --git a/recipes/ghelp-helpful b/recipes/ghelp-helpful
@@ -0,0 +1,2 @@
+(ghelp :fetcher github :repo "casouri/ghelp"
+       :files ("ghelp-helpful.el"))
diff --git a/recipes/ghelp-sly b/recipes/ghelp-sly
@@ -0,0 +1,2 @@
+(ghelp :fetcher github :repo "casouri/ghelp"
+       :files ("ghelp-sly.el"))
diff --git a/recipes/gleam-mode b/recipes/gleam-mode
@@ -0,0 +1 @@
+(gleam-mode :fetcher github :repo "gleam-lang/gleam-mode")
diff --git a/recipes/grammatical-edit b/recipes/grammatical-edit
@@ -0,0 +1 @@
+(grammatical-edit :fetcher github :repo "manateelazycat/grammatical-edit")
diff --git a/recipes/haskell-tng-mode b/recipes/haskell-tng-mode
@@ -0,0 +1,3 @@
+(haskell-tng-mode :fetcher gitlab :repo "tseenshe/haskell-tng.el"
+                  :branch "tng"
+                  :files ("*.el" (:exclude "haskell-tng-extra-*.el")))
diff --git a/recipes/huan b/recipes/huan
@@ -0,0 +1 @@
+(huan :fetcher github :repo "akirak/huan.el")
diff --git a/recipes/indent-bars b/recipes/indent-bars
@@ -0,0 +1 @@
+(indent-bars :fetcher github :repo "jdtsmith/indent-bars")
diff --git a/recipes/insert-translated-name b/recipes/insert-translated-name
@@ -0,0 +1 @@
+(insert-translated-name :fetcher github :repo "manateelazycat/insert-translated-name")
diff --git a/recipes/jtsx b/recipes/jtsx
@@ -1,3 +1 @@
-(jtsx
- :fetcher github
- :repo "llemaitre19/jtsx")
+(jtsx :fetcher github :repo "llemaitre19/jtsx")
diff --git a/recipes/lean4-mode b/recipes/lean4-mode
@@ -0,0 +1,2 @@
+(lean4-mode :fetcher github :repo "leanprover/lean4-mode"
+            :files (:defaults ("data" "data/*.json")))
diff --git a/recipes/liquidmetal b/recipes/liquidmetal
@@ -1 +1 @@
-(liquidmetal :repo "jcs-elpa/liquidmetal" :fetcher github)
+(liquidmetal :repo "jcs-legacy/liquidmetal" :fetcher github)
diff --git a/recipes/lsp-bridge b/recipes/lsp-bridge
@@ -0,0 +1,11 @@
+;; This recipe was taken from https://github.com/akirak/nixpkgs/blob/a790cc526b488cf5d9966e9a45d2f4d2a92963a5/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+(lsp-bridge
+ :repo "manateelazycat/lsp-bridge"
+ :fetcher github
+ :files
+ ("*.el"
+  "lsp_bridge.py"
+  "core"
+  "langserver"
+  "multiserver"
+  "resources"))
diff --git a/recipes/magit-nix3 b/recipes/magit-nix3
@@ -0,0 +1,2 @@
+(magit-nix3 :fetcher github :repo "emacs-twist/nix3.el"
+            :files ("extra/magit-nix3.el"))
diff --git a/recipes/memento-mori b/recipes/memento-mori
@@ -1 +1 @@
-(memento-mori :fetcher github :repo "lassik/emacs-memento-mori")
+(memento-mori :fetcher github :repo "gvol/emacs-memento-mori")
diff --git a/recipes/mode-minder b/recipes/mode-minder
@@ -0,0 +1 @@
+(mode-minder :fetcher github :repo "jdtsmith/mode-minder")
diff --git a/recipes/nano-theme b/recipes/nano-theme
@@ -0,0 +1 @@
+(nano-theme :fetcher github :repo "rougier/nano-theme")
diff --git a/recipes/nix3 b/recipes/nix3
@@ -0,0 +1 @@
+(nix3 :fetcher github :repo "emacs-twist/nix3.el")
diff --git a/recipes/notebook b/recipes/notebook
@@ -0,0 +1 @@
+(notebook :fetcher github :repo "rougier/notebook-mode")
diff --git a/recipes/oahu b/recipes/oahu
@@ -0,0 +1 @@
+(oahu :fetcher sourcehut :repo "akirak/oahu.el")
diff --git a/recipes/oahu-memento b/recipes/oahu-memento
@@ -0,0 +1,2 @@
+(oahu-memento :fetcher sourcehut :repo "akirak/oahu.el"
+              :files ("extra/oahu-memento.el"))
diff --git a/recipes/octopus b/recipes/octopus
@@ -0,0 +1,2 @@
+(octopus :fetcher github :repo "akirak/org-dog"
+         :files ("extra/octopus.el"))
diff --git a/recipes/open-color b/recipes/open-color
@@ -0,0 +1 @@
+(open-color :repo "a13/open-color.el" :fetcher github)
diff --git a/recipes/org-agenda-files-track b/recipes/org-agenda-files-track
@@ -0,0 +1,4 @@
+(org-agenda-files-track
+ :fetcher sourcehut
+ :repo "ngraves/org-agenda-files-track"
+ :files ("org-agenda-files-track.el"))
diff --git a/recipes/org-agenda-files-track-ql b/recipes/org-agenda-files-track-ql
@@ -0,0 +1,4 @@
+(org-agenda-files-track-ql
+ :fetcher sourcehut
+ :repo "ngraves/org-agenda-files-track"
+ :files ("org-agenda-files-track-ql.el"))
diff --git a/recipes/org-bb b/recipes/org-bb
@@ -0,0 +1 @@
+(org-bb :fetcher github :repo "akirak/org-blockers-block")
diff --git a/recipes/org-dog b/recipes/org-dog
@@ -0,0 +1 @@
+(org-dog :fetcher github :repo "akirak/org-dog")
diff --git a/recipes/org-dog-embark b/recipes/org-dog-embark
@@ -0,0 +1,2 @@
+(org-dog-embark :fetcher github :repo "akirak/org-dog"
+                :files ("extra/org-dog-embark.el"))
diff --git a/recipes/org-dog-export b/recipes/org-dog-export
@@ -0,0 +1,2 @@
+(org-dog-export :fetcher github :repo "akirak/org-dog"
+                :files ("extra/org-dog-export.el"))
diff --git a/recipes/org-dog-facade b/recipes/org-dog-facade
@@ -0,0 +1,3 @@
+(org-dog-facade :fetcher github :repo "akirak/org-dog"
+                :files ("extra/org-dog-facade.el"
+                        "extra/org-dog-datetree.el"))
diff --git a/recipes/org-dynamic-bullets b/recipes/org-dynamic-bullets
@@ -0,0 +1,2 @@
+(org-dynamic-bullets :fetcher github :repo "legalnonsense/org-visual-outline"
+                     :files ("org-dynamic-bullets.el"))
diff --git a/recipes/org-epubinfo b/recipes/org-epubinfo
@@ -0,0 +1 @@
+(org-epubinfo :fetcher github :repo "akirak/org-epubinfo")
diff --git a/recipes/org-excalidraw b/recipes/org-excalidraw
@@ -0,0 +1 @@
+(org-excalidraw :fetcher github :repo "wdavew/org-excalidraw")
diff --git a/recipes/org-hyprctl b/recipes/org-hyprctl
@@ -0,0 +1 @@
+(org-hyprctl :fetcher github :repo "akirak/org-hyprctl")
diff --git a/recipes/org-lang-env b/recipes/org-lang-env
@@ -0,0 +1 @@
+(org-lang-env :fetcher github :repo "akirak/org-lang-env")
diff --git a/recipes/org-linker b/recipes/org-linker
@@ -0,0 +1 @@
+(org-linker :repo "toshism/org-linker" :fetcher github)
diff --git a/recipes/org-linker-edna b/recipes/org-linker-edna
@@ -0,0 +1 @@
+(org-linker-edna :repo "toshism/org-linker-edna" :fetcher github)
diff --git a/recipes/org-memento b/recipes/org-memento
@@ -0,0 +1 @@
+(org-memento :fetcher github :repo "akirak/org-memento")
diff --git a/recipes/org-nlink b/recipes/org-nlink
@@ -0,0 +1,2 @@
+(org-nlink :fetcher github :repo "akirak/org-nlink.el"
+           :files (:defaults (:exclude "consult-org-nlink.el")))
diff --git a/recipes/org-pivot-search b/recipes/org-pivot-search
@@ -0,0 +1 @@
+(org-pivot-search :fetcher github :repo "akirak/org-pivot-search")
diff --git a/recipes/org-placeholder b/recipes/org-placeholder
@@ -0,0 +1 @@
+(org-placeholder :fetcher github :repo "akirak/org-placeholder")
diff --git a/recipes/org-pretty-table b/recipes/org-pretty-table
@@ -0,0 +1 @@
+(org-pretty-table :fetcher github :repo "Fuco1/org-pretty-table")
diff --git a/recipes/org-super-links b/recipes/org-super-links
@@ -0,0 +1,2 @@
+(org-super-links :fetcher github :repo "toshism/org-super-links"
+                 :files ("org-super-links.el"))
diff --git a/recipes/org-visual-indent b/recipes/org-visual-indent
@@ -0,0 +1,2 @@
+(org-visual-indent :fetcher github :repo "legalnonsense/org-visual-outline"
+                   :files ("org-visual-indent.el"))
diff --git a/recipes/org-volume b/recipes/org-volume
@@ -0,0 +1 @@
+(org-volume :fetcher github :repo "akirak/org-volume")
diff --git a/recipes/orgabilize b/recipes/orgabilize
@@ -0,0 +1 @@
+(orgabilize :fetcher github :repo "akirak/orgabilize.el")
diff --git a/recipes/pdf-tools b/recipes/pdf-tools
@@ -1,7 +1,3 @@
 (pdf-tools
- :fetcher github
- :repo "vedang/pdf-tools"
- :files (:defaults
-         "README"
-         ("build" "Makefile")
-         ("build" "server")))
+ :repo "vedang/pdf-tools" :fetcher github
+ :files (:defaults "Makefile" "lisp" "server"))
diff --git a/recipes/plain-theme b/recipes/plain-theme
@@ -1 +1 @@
-(plain-theme :fetcher github :repo "yanalunaterra/plain-theme")
+(plain-theme :fetcher github :repo "yanateras/plain-theme")
diff --git a/recipes/poly-astro b/recipes/poly-astro
@@ -0,0 +1 @@
+(poly-astro :fetcher github :repo "pablo-abc/poly-astro")
diff --git a/recipes/readable b/recipes/readable
@@ -0,0 +1 @@
+(readable :fetcher github :repo "akirak/readable.el")
diff --git a/recipes/riben b/recipes/riben
@@ -0,0 +1,2 @@
+(riben :fetcher github :repo "akirak/emacs-dumb-japanese"
+       :files (:defaults (:exclude "avy-riben.el")))
diff --git a/recipes/source-peek b/recipes/source-peek
@@ -0,0 +1 @@
+(source-peek :fetcher github :repo "iqbalansari/emacs-source-peek")
diff --git a/recipes/sweet-theme b/recipes/sweet-theme
@@ -1,3 +1,3 @@
 (sweet-theme
  :fetcher github
- :repo "2bruh4me/sweet-theme")
+ :repo "konkrotte/sweet-theme")
diff --git a/recipes/syncthing b/recipes/syncthing
@@ -1,3 +1,3 @@
 (syncthing
  :fetcher github
- :repo "keyweeusr/emacs-syncthing")
+ :repo "KeyWeeUsr/emacs-syncthing")
diff --git a/recipes/turbo-log b/recipes/turbo-log
@@ -0,0 +1 @@
+(turbo-log :fetcher github :repo "Artawower/turbo-log")
diff --git a/recipes/twist b/recipes/twist
@@ -0,0 +1 @@
+(twist :fetcher github :repo "emacs-twist/twist.el")
diff --git a/recipes/undersea-theme b/recipes/undersea-theme
@@ -1 +1 @@
-(undersea-theme :repo "jcs-elpa/undersea-theme" :fetcher github)
+(undersea-theme :repo "jcs-legacy/undersea-theme" :fetcher github)
diff --git a/recipes/use-package-dash-docs b/recipes/use-package-dash-docs
@@ -0,0 +1,3 @@
+(use-package-dash-docs :repo "dash-docs-el/dash-docs"
+                       :fetcher github
+                       :files ("use-package-dash-docs.el"))
diff --git a/recipes/vundo b/recipes/vundo
@@ -0,0 +1 @@
+(vundo :fetcher github :repo "casouri/vundo")
diff --git a/recipes/workbox b/recipes/workbox
@@ -0,0 +1 @@
+(workbox :fetcher github :repo "akirak/workbox.el")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		(acm :fetcher github :repo "manateelazycat/lsp-bridge"
		:files ("acm/*.el" "acm/icons"))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		(akirak :fetcher github :repo "akirak/emacs-config"
		:files ("emacs/lisp/*.el"))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		(apprentice :fetcher github :repo "Sasanidas/Apprentice")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		(avy-riben :fetcher github :repo "akirak/emacs-dumb-japanese"
		:files ("avy-riben.el"))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		(beancount :fetcher github :repo "beancount/beancount-mode")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		(chatgpt :fetcher github :repo "joshcho/ChatGPT.el")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		(clipurl :fetcher github :repo "akirak/clipurl.el"
		:files ("clipsave.el"))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		(clipurl :fetcher github :repo "akirak/clipurl.el"
		:files ("clipurl.el"))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		(codeium :fetcher github :repo "Exafunction/codeium.el")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		(consult-org-dog :fetcher github :repo "akirak/org-dog"
		:files ("extra/consult-org-dog.el"))