From cd66da7f53cf7cbd961387ce6d21e8512d1bbef8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Aug 2022 01:47:29 +0000 Subject: [PATCH 1/4] flake.lock: Updating 'doom-emacs (doomemacs/doomemacs)' - 35a89bdf -> bcca96a6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Changes for doom-emacs On branch: master Commits: https://github.com/doomemacs/doomemacs/compare/35a89bdfa6064e507f8848b1d162433fe92ca829...bcca96a69a44c1a752dd58761f8c7e2b43695f0b - [df62fcba](https://github.com/doomemacs/doomemacs/commit/df62fcba26d33af2e31f6ab823d2790fd84cc4db) docs: add category readmes - [0aad1399](https://github.com/doomemacs/doomemacs/commit/0aad1399ccae03720e9e9aff53096176c97ccf25) refactor(file-templates): doom readme templates - [5b354ae4](https://github.com/doomemacs/doomemacs/commit/5b354ae4f378f4c3884e3ef8f4601030b82d74bb) docs(:app): update READMEs to new format - [b898fbe3](https://github.com/doomemacs/doomemacs/commit/b898fbe303cfbf26d39377cf974258310b2a11fb) docs(:checkers): update READMEs to new format - [11793094](https://github.com/doomemacs/doomemacs/commit/11793094ba4b165aabf961fb23760e5650f3bfdf) docs(:completion): update READMEs to new format - [c27f0050](https://github.com/doomemacs/doomemacs/commit/c27f0050115487e2a4d783ac368435fce5abf50b) docs(:config): update READMEs to new format - [9ada4008](https://github.com/doomemacs/doomemacs/commit/9ada400805e2cd443649b4333748e1c92f7d9e38) docs(:editor): update READMEs to new format - [73c1dd13](https://github.com/doomemacs/doomemacs/commit/73c1dd13381fa0c657aa8effda04dbe8d139b326) docs(:emacs): update READMEs to new format - [2dcef764](https://github.com/doomemacs/doomemacs/commit/2dcef764f18b9a887ecc4ac033e29a9a4d682799) docs(:email): update READMEs to new format - [ca7579a1](https://github.com/doomemacs/doomemacs/commit/ca7579a1e94416b6107fde7561ecd5a501f18378) docs(:input): update READMEs to new format - [20cac97c](https://github.com/doomemacs/doomemacs/commit/20cac97c08efe548f2c7f457b8b0ac6751d77835) docs(:lang): update READMEs to new format - [f6335bef](https://github.com/doomemacs/doomemacs/commit/f6335befb481a318b68fa72ea1a55bcab4ccede4) docs(:os): update READMEs to new format - [a2266554](https://github.com/doomemacs/doomemacs/commit/a226655486240866cd0cdb494f05993a2f1c469b) docs(:term): update READMEs to new format - [6da20e45](https://github.com/doomemacs/doomemacs/commit/6da20e45bd69dcf4f6552811474b7bc6cedca2aa) docs(:tools): update READMEs to new format - [b5a2aa48](https://github.com/doomemacs/doomemacs/commit/b5a2aa48fe3b92b813151d7c442aca7f892a141f) docs(:ui): update READMEs to new format - [7bc0033d](https://github.com/doomemacs/doomemacs/commit/7bc0033d0aba3bdd307ba91f8b59ca9cc5787cdd) docs: add doom-docs-mode & doom-docs-org-mode - [4b6e15d4](https://github.com/doomemacs/doomemacs/commit/4b6e15d4198e8c3a971cdb008c1941c5a4bf8aa1) dev: add 'doom make' commands - [3766523f](https://github.com/doomemacs/doomemacs/commit/3766523f1ef0ae166bafe7c95be523d6304c1e5f) docs: move modules.org to modules/README.org - [ccb5fde9](https://github.com/doomemacs/doomemacs/commit/ccb5fde99bcc6412354b8149a1e3597f088bf78a) docs: delete old org files - [1decc382](https://github.com/doomemacs/doomemacs/commit/1decc382375e08ea0b8b70b98707ad070092b60f) docs: fix module readme CREATED & SINCE attrs - [88844e9c](https://github.com/doomemacs/doomemacs/commit/88844e9cec3423a16d770b4628f4183d400eab6a) docs: simplify internal docs links - [2236c3bc](https://github.com/doomemacs/doomemacs/commit/2236c3bcda1838c8c85821ebb1e286229fadcb46) docs(rust): rustic-format-{on-save,trigger} - [08071f92](https://github.com/doomemacs/doomemacs/commit/08071f92b7c2359c4759901c63cb52ccdfd636d4) docs(doom): fix doom-variable-pitch-font reference - [f6ee39ab](https://github.com/doomemacs/doomemacs/commit/f6ee39abe3363f754903123254587befd483135b) docs(vertico): fix #+CREATED and #+SINCE keywords - [a5f8d44d](https://github.com/doomemacs/doomemacs/commit/a5f8d44d1551d53466b918aff84baef7f3ee2f84) docs(magit): add docs for [doomemacs/doomemacs⁠#5846](http://r.duckduckgo.com/l/?uddg=https://github.com/doomemacs/doomemacs/issues/5846) - [7423eef2](https://github.com/doomemacs/doomemacs/commit/7423eef243aba154fcd75dd29ea2d0937a243990) docs(lookup): fix typos - [c9399c1a](https://github.com/doomemacs/doomemacs/commit/c9399c1a19ca8e2cebfdd3474aa48bfe718202a3) docs(coq): expand README - [23503cfb](https://github.com/doomemacs/doomemacs/commit/23503cfb442d6a2f70582b446897751f994a5e2f) docs(haskell): fix docs for alternative formatter - [b2c366d9](https://github.com/doomemacs/doomemacs/commit/b2c366d9461c191021b541f8f82c3cda41096de6) docs(org): fix typo in capture example - [58192633](https://github.com/doomemacs/doomemacs/commit/58192633aa76541530421af35868df2192d1a8d6) docs(vterm): update nixos install instructions - [71535d7f](https://github.com/doomemacs/doomemacs/commit/71535d7ffcd209e87e6ed140a014538916cb5901) docs(julia): update lsp environment to recent LTS - [4bdcf48a](https://github.com/doomemacs/doomemacs/commit/4bdcf48a0b216412c285f290bf8c75d0c910fbac) docs(org): add org-pretty-table to readme - [8fa1f4bb](https://github.com/doomemacs/doomemacs/commit/8fa1f4bb6b84670168d6aaf4b05c415aad3a92b6) docs(mu4e): enable automatic email fetching - [0451c9b0](https://github.com/doomemacs/doomemacs/commit/0451c9b0bc08cdddbf0085abe12e3991684a8821) docs(lsp): link to LSP tuning guide - [402e5eb7](https://github.com/doomemacs/doomemacs/commit/402e5eb723293eca58bfb2b0df01e893422bf5f7) docs(modeline): mention modeline hiding & strange icons - [97ac6708](https://github.com/doomemacs/doomemacs/commit/97ac6708815522c6e2c47a1f4de3fe48f22ef560) docs(snippets): document how to write your own snippets - [1fb67e3c](https://github.com/doomemacs/doomemacs/commit/1fb67e3cf79a9325f827a4ed0c6b4184684d92bf) docs(org): remove org-pretty-table - [7246db45](https://github.com/doomemacs/doomemacs/commit/7246db457c5568d81570453f7b71191508d4607e) docs: replace doom-source with doom-repo links - [1daecbe5](https://github.com/doomemacs/doomemacs/commit/1daecbe59c56e55f4990d957817a03ebbda8d259) fix(lib): cache errors in doom-docs-mode - [6fcb99b3](https://github.com/doomemacs/doomemacs/commit/6fcb99b35af85bc87e9de81b04cfa5c475bff57f) docs(company): code completion with multiple keywords - [8d8ec41c](https://github.com/doomemacs/doomemacs/commit/8d8ec41c5cad7896f6214181ecbdda9e008a68ed) docs(agda): document +local flag - [b21de243](https://github.com/doomemacs/doomemacs/commit/b21de24311883596484becb4fe412ad058953d88) docs(latex): add texlive-latexextra dependency for pdflatex exports - [969c6ae8](https://github.com/doomemacs/doomemacs/commit/969c6ae8aa211ab122526260fbd8d3fd5598b315) docs(tree-sitter): document +tree-sitter flag in :lang readmes - [cf0696f5](https://github.com/doomemacs/doomemacs/commit/cf0696f54b84a1569356bbeaa75329b78f928504) docs(fold): mention ts-fold package - [3ac5d6d5](https://github.com/doomemacs/doomemacs/commit/3ac5d6d51a90e4fbdde15b6cda93ff0e02cd6dc6) docs(spell): can't add word to personal dict - [fd6056bc](https://github.com/doomemacs/doomemacs/commit/fd6056bc239c4522283591817da5bbcb95d04d46) docs(org): add reference to evil-org keybindings - [839970c2](https://github.com/doomemacs/doomemacs/commit/839970c2ded4077efac146173705e2d28b8b3284) docs(mu4e): fix incorrect variable name in snippet - [7d93feb9](https://github.com/doomemacs/doomemacs/commit/7d93feb98c7842dca5a5a9f9a9ca984469e9c132) nit: minor reformatting, comment revision, & sharpquoting - [7a9f8b18](https://github.com/doomemacs/doomemacs/commit/7a9f8b18ab6034ec4f0b1c6c35a8dc39b118d3c4) refactor: resolve doom-{core,modules}-dir properly - [493a049d](https://github.com/doomemacs/doomemacs/commit/493a049dff088e021373c3f1c76774660a527c8f) tweak: disable tty optimization in debug mode - [068966a4](https://github.com/doomemacs/doomemacs/commit/068966a4cd415ac9d9a9ceb6ffddf41d04f4d587) bump: :core - [491f49cf](https://github.com/doomemacs/doomemacs/commit/491f49cfe565bc98db71908598695808bd235d72) refactor(cli): better error for missing profiles.el - [6ffee6ec](https://github.com/doomemacs/doomemacs/commit/6ffee6ece7473bce81ad3dd92f37c60dc2b07940) fix(cli): ensure type specs are case insensitive - [04a09128](https://github.com/doomemacs/doomemacs/commit/04a09128d4857bc8e0fe757d0314ad4802d227a8) nit(cli): stub 'doom test' - [a2d22067](https://github.com/doomemacs/doomemacs/commit/a2d22067974d25c08b419e8f89d04791352db1bf) feat(cli): allow defcli! in ci.el - [a79b2ec6](https://github.com/doomemacs/doomemacs/commit/a79b2ec69ecaa166f98f539a3ec1e9aedb825fa9) fix(cli): ensure order of subcommands in 'doom help' - [f8fb8b18](https://github.com/doomemacs/doomemacs/commit/f8fb8b189df265b41b2ad5a71ceb391623d9e293) refactor(cli): remove unused synopsis examples - [964b7dcb](https://github.com/doomemacs/doomemacs/commit/964b7dcbeef4ce16bd677221c389b7ce4ca35ae2) fix(cli): indentation & docstring highlights for defstub! - [510032bc](https://github.com/doomemacs/doomemacs/commit/510032bcb03553af03503b75efdb8c4a79602226) refactor(lib): s/doom--debug-/doom-debug-/ - [9ea6ea68](https://github.com/doomemacs/doomemacs/commit/9ea6ea68b085e1ed723640e9593cc1da464aa1a5) tweak(lib): show chemacs version in doom-info - [a9866e37](https://github.com/doomemacs/doomemacs/commit/a9866e37e45b43785116ef474c8cd6aa9b5185dd) feat(lib): add doom-theme-face-attribute function - [b9933e66](https://github.com/doomemacs/doomemacs/commit/b9933e6637713ecf518e9ab26fccad5569c0d9fd) refactor!: restructure Doom core - [29dc2fed](https://github.com/doomemacs/doomemacs/commit/29dc2fed29caab337bf6c75f061591830e5098a7) refactor(cli): use sh! instead of doom-call-process - [615848e3](https://github.com/doomemacs/doomemacs/commit/615848e3a71ca9ecd4e50cd7abc49eedc2fbea23) fix(cli): more future resistant 'doom upgrade' - [55736ac2](https://github.com/doomemacs/doomemacs/commit/55736ac2a65c6f4f6d5124a933f2d11b8d8a8198) fix(lib): prevent autoload failure at startup - [614a54b0](https://github.com/doomemacs/doomemacs/commit/614a54b036cb2111e4c5421b8edd07533d75841f) fix(literate): Doom core load paths - [dd348025](https://github.com/doomemacs/doomemacs/commit/dd348025233c2302bafc51d8832c5cc691a91b0f) revert: compat - [61d7200e](https://github.com/doomemacs/doomemacs/commit/61d7200e649d005ce80df0b74a6ee47b4db0a9d0) revert: compat - [4ee7f011](https://github.com/doomemacs/doomemacs/commit/4ee7f0113e9cc480090bf5e1685d4748277e7290) fix(cli): show straight logs after straight error - [d3f2b4d9](https://github.com/doomemacs/doomemacs/commit/d3f2b4d9cad397ea6957cbfb91a36ec65f447c03) docs(cli): fix issue tracker URL in 'doom help' - [bfa90e82](https://github.com/doomemacs/doomemacs/commit/bfa90e82e968c74fec9dab70c8b798310626e14c) refactor(docs): use org-with-wide-buffer - [c4b70713](https://github.com/doomemacs/doomemacs/commit/c4b7071397e51e3fb3b450db3364836672039a07) fix(docs): don't hide src blocks indiscriminately - [4661ea89](https://github.com/doomemacs/doomemacs/commit/4661ea89f20e03162395437893b86d5ce0624f41) tweak(docs): move point to first heading on visit - [6bba5f8c](https://github.com/doomemacs/doomemacs/commit/6bba5f8c0354edb848dee934d46161e458e76360) tweak(docs): disable save-place when in documentation - [cee641dd](https://github.com/doomemacs/doomemacs/commit/cee641ddc81ec67d7c500ae31c10e0a67f8c8699) feat(docs): hide leading stars - [9744946a](https://github.com/doomemacs/doomemacs/commit/9744946a66b6fe11821d49df45835ff21b5c4251) docs(ligatures): mention doom-unicode-font incompatibilities - [e77a45bc](https://github.com/doomemacs/doomemacs/commit/e77a45bc22448aaa3d836b3cea8ff24a58aabee5) docs: use lowercase keywords - [3deba740](https://github.com/doomemacs/doomemacs/commit/3deba740d313ee4bfa855b266c3ec07de9a3be6f) feat(docs): add face:X link type to docs - [cf2024b3](https://github.com/doomemacs/doomemacs/commit/cf2024b3560613b12e9ad0a5265f44c921ab9ca6) tweak(docs): org-footnote-section = nil - [4ec0ea96](https://github.com/doomemacs/doomemacs/commit/4ec0ea963e2b8de9d8dd3a05a8c2c40bce605fb9) fix(docs): use org-fold-core-region - [51440021](https://github.com/doomemacs/doomemacs/commit/514400215fe8fb004bacb8eca99cd2c732425fca) refactor(docs): s/doom--docs-/doom-docs--/ - [24fab124](https://github.com/doomemacs/doomemacs/commit/24fab1242a2f0cd35bcfe161fbc778a052b4860e) docs(rest): mention +jq flag - [c34168fb](https://github.com/doomemacs/doomemacs/commit/c34168fb2ac9fc65c2ade7f8b201ae9948c122db) docs(lsp): flesh out lsp-mode vs eglot comparison - [1255315b](https://github.com/doomemacs/doomemacs/commit/1255315bfc15ec67d19c2b5a73e997b3a8ae14b9) refactor(docs): replace nav menus with virtual one - [a634eb54](https://github.com/doomemacs/doomemacs/commit/a634eb549710833d7055e3b2e3c38226ea2dbd76) refactor(docs): remove kbd expansion & table realignment - [6fde2f63](https://github.com/doomemacs/doomemacs/commit/6fde2f634cc910d6a26a4a6fc44c62951753bb7d) fix(docs): update to reflect upstream changes - [2bb052ac](https://github.com/doomemacs/doomemacs/commit/2bb052ac174080c98bf9b7948b588f01fe81adfb) tweak(lib): fix doomemacs URLs in help commands - [58992a18](https://github.com/doomemacs/doomemacs/commit/58992a1885eb393226815f41f08669cf8b1a327d) dev: use maintainers team in global codeowners rule - [2d53fe61](https://github.com/doomemacs/doomemacs/commit/2d53fe6123e5640a13cc7ae0e43a5441f634aa6d) refactor: resolve doom-core-dir relative to source file - [3a5e34d6](https://github.com/doomemacs/doomemacs/commit/3a5e34d67b5470aa0670d30b037d8214f2c4f8f9) fix: premature doom init in doom sub-profiles - [90c510ca](https://github.com/doomemacs/doomemacs/commit/90c510caca3ad8289406d753627807fe76ee6e82) refactor(evil): remove evil-want-C-w-scroll - [59745437](https://github.com/doomemacs/doomemacs/commit/59745437327df0f2061350c779b96271ac9bff44) feat(vc): add next conflict in project to +vc/smerge-hydra - [16af1dee](https://github.com/doomemacs/doomemacs/commit/16af1dee6ea34c09d24df71f3104be6c594b678c) fix(rust): enable rainbow-delimiters-mode in rustic-mode - [8fc2d67e](https://github.com/doomemacs/doomemacs/commit/8fc2d67eb965d639f92f52350b3b14e7ec26bc5b) tweak(latex): ask Skim.app to reload pdf - [4a71d217](https://github.com/doomemacs/doomemacs/commit/4a71d217bddfdf6a7c6cea043006401fc505fcd1) nit(php): license => licence - [6e06bbb0](https://github.com/doomemacs/doomemacs/commit/6e06bbb062fca9c19ef729c84d2c59fba57c6c2a) fix(docs): remove redundant doom-docs-dir - [acf7a8a4](https://github.com/doomemacs/doomemacs/commit/acf7a8a48dd5b3e8bb6f727b4649663c46ad2f74) feat(docs): add org-glossary support - [64496a6c](https://github.com/doomemacs/doomemacs/commit/64496a6c6651d9d12d9d5ae5c4b408e06ad9afa1) refactor(docs): tidy up - [893434a5](https://github.com/doomemacs/doomemacs/commit/893434a5db398cb3342229d6c93e83e5a6a8d5f9) tweak(docs): org-display-remote-inline-images = 'cache - [7e400abd](https://github.com/doomemacs/doomemacs/commit/7e400abdc00eb4bf324dc43cbe27414985078086) fix(docs): set mode in file-local vars - [b777300e](https://github.com/doomemacs/doomemacs/commit/b777300e2cb0a116b9bdd84a2844a8beef801cf2) tweak(org): move org caches to {doom-cache-dir}/org/ - [283e279d](https://github.com/doomemacs/doomemacs/commit/283e279dce00b678db46a1f4e2f0cd643804e22c) bump: :lang org - [52bda5f4](https://github.com/doomemacs/doomemacs/commit/52bda5f4e7a1b15257f30c63ffc97e225472690c) fix: move bookmark-default-file to doom-etc-dir - [6d4b2b48](https://github.com/doomemacs/doomemacs/commit/6d4b2b48c21bab82b08e573d99d90bab5bdc541e) fix(doom-dashboard): revert unintended changes - [c1512fee](https://github.com/doomemacs/doomemacs/commit/c1512feea13f3f216c2a96911011083b53723cc9) fix(docs): disable doom-docs--hide-stars-h - [00f39280](https://github.com/doomemacs/doomemacs/commit/00f39280526e2b70297cfcbf69dceebd6d74f8ad) fix(mu4e): add missing icons for mu 1.8.X - [08dac140](https://github.com/doomemacs/doomemacs/commit/08dac1400fe20a526acb5d66af384a5261a15fb9) fix(default): +default/yank-buffer-path echos the file name as nil - [d6ffd2bf](https://github.com/doomemacs/doomemacs/commit/d6ffd2bfaa47b9e5b2da32b2b70c842feb8c4499) fix(file-templates): update doom doc templates - [304774cf](https://github.com/doomemacs/doomemacs/commit/304774cf393d79c75842ab05ad1796d66eea48fd) docs(biblio,tree-sitter): update READMEs to new format - [1b59b9a8](https://github.com/doomemacs/doomemacs/commit/1b59b9a83a5f589abe0add4f132ad15724507ad7) docs(fortran,graphql): update READMEs to new format - [3eb6f663](https://github.com/doomemacs/doomemacs/commit/3eb6f663fea64597c37dca655889e6f04c946f77) docs(bidi): update READMEs to new format - [ed04aef2](https://github.com/doomemacs/doomemacs/commit/ed04aef2a9f0d5e4bbeede893d35f2d74d72699a) docs: add PR ref to #+since lines - [0cee8b4b](https://github.com/doomemacs/doomemacs/commit/0cee8b4beee85d90f93e39c2979e5888fb922571) docs: rewrite faq.org - [fc73a81d](https://github.com/doomemacs/doomemacs/commit/fc73a81d695613da6febed94c2b216f7840472dd) docs: add appendix.org - [55544200](https://github.com/doomemacs/doomemacs/commit/55544200be1a7334418024715f9878e04ed0e3b9) release(modules): 22.08.0-dev - [887e9fd1](https://github.com/doomemacs/doomemacs/commit/887e9fd12cf748f0ae9db1b43981ee00a655cdb4) feat(go): add test-file function and keybinding - [3dc14870](https://github.com/doomemacs/doomemacs/commit/3dc14870af957785e89cc055b14d7e81e18c00ba) docs(php): add @elken - [ea254509](https://github.com/doomemacs/doomemacs/commit/ea254509aa4a5758dfa666c77e843247507d57d4) docs(javascript): add @elken, @iyefrat - [b7cd35e4](https://github.com/doomemacs/doomemacs/commit/b7cd35e43cb84d538d476d3b881a2f6a7ac54855) docs(haskell): add @iyefrat - [bacb84f6](https://github.com/doomemacs/doomemacs/commit/bacb84f6c6ced7cbd37a83542468d1d93afba9e4) docs(default): add @hlissner, @UndeadKernel - [1e9d8ab3](https://github.com/doomemacs/doomemacs/commit/1e9d8ab35e658b8b8a7b0c6c0d54304c800862e2) bump: :lang python - [293b3f9b](https://github.com/doomemacs/doomemacs/commit/293b3f9be56b6b19bb3c382d8ee62b90e45c1c67) dev: update CODEOWNERS - [ba668f7c](https://github.com/doomemacs/doomemacs/commit/ba668f7cb025a1b4cea5d182f5595145f81d6963) fix(file-templates): indentation for licenses - [2254b8c5](https://github.com/doomemacs/doomemacs/commit/2254b8c56165052b2944687dfd03aa96224c3f68) fix(cli): doom-cli-context persistence - [06db69bf](https://github.com/doomemacs/doomemacs/commit/06db69bf761c7bd20e6aa8972ca05c0af79129c1) fix(emacs-lisp): suppress popup warnings from flycheck - [bcca96a6](https://github.com/doomemacs/doomemacs/commit/bcca96a69a44c1a752dd58761f8c7e2b43695f0b) refactor(literate): remove unused envvar __DOOMRESTART --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1dc967a..8e4f9dd 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "doom-emacs": { "flake": false, "locked": { - "lastModified": 1659040172, - "narHash": "sha256-cl9CWknGL+PadiFSXTKlf07JQ15b4hkHETQs7z/Ksm0=", + "lastModified": 1659653357, + "narHash": "sha256-uYwLEie18FCjjapzT0AYcUPSiPeTPMpwLtxpnV+EHO4=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "35a89bdfa6064e507f8848b1d162433fe92ca829", + "rev": "bcca96a69a44c1a752dd58761f8c7e2b43695f0b", "type": "github" }, "original": { From f63432b89b0c6b987c0ba05bd43c363bed456207 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 5 Aug 2022 22:47:20 +0100 Subject: [PATCH 2/4] Update patches --- patches/fix-paths.patch | 29 +++++-- patches/nix-integration.patch | 154 +++++++++++++++++----------------- 2 files changed, 98 insertions(+), 85 deletions(-) diff --git a/patches/fix-paths.patch b/patches/fix-paths.patch index 385487b..df450e1 100644 --- a/patches/fix-paths.patch +++ b/patches/fix-paths.patch @@ -1,10 +1,20 @@ -diff --git a/core/autoload/config.el b/core/autoload/config.el -index 1e643cf49..501cbfba4 100644 ---- a/core/autoload/config.el -+++ b/core/autoload/config.el -@@ -23,7 +23,7 @@ +From fd75a170a515e35dcbb10b96a484ad1eb9a1a3f0 Mon Sep 17 00:00:00 2001 +From: Thiago Kenji Okada +Date: Fri, 5 Aug 2022 22:45:00 +0100 +Subject: [PATCH] Fix paths + +--- + lisp/lib/config.el | 2 +- + modules/app/rss/config.el | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lisp/lib/config.el b/lisp/lib/config.el +index 92532c0f5..34c6f9156 100644 +--- a/lisp/lib/config.el ++++ b/lisp/lib/config.el +@@ -19,7 +19,7 @@ (defun doom/find-file-in-private-config () - "Search for a file in `doom-private-dir' inside nixos-config." + "Search for a file in `doom-private-dir'." (interactive) - (doom-project-find-file doom-private-dir)) + (doom-project-find-file "@private@")) @@ -12,10 +22,10 @@ index 1e643cf49..501cbfba4 100644 ;;;###autoload (defun doom/goto-private-init-file () diff --git a/modules/app/rss/config.el b/modules/app/rss/config.el -index c5657eec8..34f303420 100644 +index a8078d18f..075a5c8a7 100644 --- a/modules/app/rss/config.el +++ b/modules/app/rss/config.el -@@ -18,8 +18,8 @@ easier to scroll through.") +@@ -20,8 +20,8 @@ easier to scroll through.") (use-package! elfeed :commands elfeed :init @@ -26,3 +36,6 @@ index c5657eec8..34f303420 100644 :config (setq elfeed-search-filter "@2-week-ago " elfeed-show-entry-switch #'pop-to-buffer +-- +2.36.0 + diff --git a/patches/nix-integration.patch b/patches/nix-integration.patch index efdf240..22f316a 100644 --- a/patches/nix-integration.patch +++ b/patches/nix-integration.patch @@ -1,89 +1,16 @@ -From 612ce4127568020cd482ff119616a74cf1c1c29e Mon Sep 17 00:00:00 2001 +From 4a98147cd1c74398347900312d9a9b8766c7b632 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 29 Jul 2022 10:32:00 +0100 Subject: [PATCH] Nix integration --- - core/core-cli-lib.el | 2 +- - core/core.el | 18 +++++---------- early-init.el | 55 +------------------------------------------- + lisp/doom-cli-lib.el | 2 +- + lisp/doom.el | 18 +++++---------- 3 files changed, 8 insertions(+), 67 deletions(-) -diff --git a/core/core-cli-lib.el b/core/core-cli-lib.el -index 158254ff7..bd7adccb5 100644 ---- a/core/core-cli-lib.el -+++ b/core/core-cli-lib.el -@@ -116,7 +116,7 @@ If nil, falls back to less.") - - Only applies if (exit! :pager) or (exit! :pager?) are called.") - --(defvar doom-cli-log-file-format (expand-file-name "logs/cli.%s.%s.%s" doom-local-dir) -+(defvar doom-cli-log-file-format (expand-file-name "logs/cli.%s.%s.%s" doom-cache-dir) - "Where to write any output/log file to. - - Must have two arguments, one for session id and the other for log type.") -diff --git a/core/core.el b/core/core.el -index 15df30f35..1ca3011e6 100644 ---- a/core/core.el -+++ b/core/core.el -@@ -131,15 +131,7 @@ - (defconst doom-docs-dir (concat doom-emacs-dir "docs/") - "Where Doom's documentation files are stored. Must end with a slash.") - --(defconst doom-private-dir -- (if-let (doomdir (getenv-internal "DOOMDIR")) -- (expand-file-name (file-name-as-directory doomdir)) -- (or (let ((xdgdir -- (expand-file-name "doom/" -- (or (getenv-internal "XDG_CONFIG_HOME") -- "~/.config")))) -- (if (file-directory-p xdgdir) xdgdir)) -- "~/.doom.d/")) -+(defconst doom-private-dir (expand-file-name (file-name-as-directory (getenv-internal "DOOMDIR"))) - "Where your private configuration is placed. - - Defaults to ~/.config/doom, ~/.doom.d or the value of the DOOMDIR envvar; -@@ -208,7 +200,7 @@ downloaded/installed by packages. Must end in a slash.") - (expand-file-name (file-name-as-directory localdir)) - (if doom-profile - doom-profile-dir -- (expand-file-name ".local/" doom-emacs-dir))) -+ "@local@/")) - "Root directory for local storage. - - Use this as a storage location for this system's installation of Doom Emacs. -@@ -216,10 +208,11 @@ Use this as a storage location for this system's installation of Doom Emacs. - These files should not be shared across systems. By default, it is used by - `doom-etc-dir' and `doom-cache-dir'. Must end with a slash.") - -+; nix-doom-emacs: This doesn't meet XDG but backwards compatibility is a thing. - (defconst doom-etc-dir - (if doom-profile - doom-profile-data-dir -- (concat doom-local-dir "etc/")) -+ "~/.local/doom") - "Directory for non-volatile local storage. - - Use this for files that don't change much, like server binaries, external -@@ -228,7 +221,7 @@ dependencies or long-term shared data. Must end with a slash.") - (defconst doom-cache-dir - (if doom-profile - doom-profile-cache-dir -- (concat doom-local-dir "cache/")) -+ "~/.cache/doom") - "Directory for volatile local storage. - - Use this for files that change often, like cache files. Must end with a slash.") -@@ -294,6 +287,7 @@ users).") - ;; Don't store eln files in ~/.emacs.d/eln-cache (where they can easily be - ;; deleted by 'doom upgrade'). - (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "eln/")) -+ (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "cache/eln/")) - - (with-eval-after-load 'comp - ;; HACK Disable native-compilation for some troublesome packages diff --git a/early-init.el b/early-init.el -index 19ff8a768..088125cda 100644 +index 4335f8db1..c6c29cdd5 100644 --- a/early-init.el +++ b/early-init.el @@ -73,60 +73,7 @@ @@ -148,6 +75,79 @@ index 19ff8a768..088125cda 100644 ;; +diff --git a/lisp/doom-cli-lib.el b/lisp/doom-cli-lib.el +index 309a1fa88..97129d7c0 100644 +--- a/lisp/doom-cli-lib.el ++++ b/lisp/doom-cli-lib.el +@@ -116,7 +116,7 @@ If nil, falls back to less.") + + Only applies if (exit! :pager) or (exit! :pager?) are called.") + +-(defvar doom-cli-log-file-format (expand-file-name "logs/cli.%s.%s.%s" doom-local-dir) ++(defvar doom-cli-log-file-format (expand-file-name "logs/cli.%s.%s.%s" doom-cache-dir) + "Where to write any output/log file to. + + Must have two arguments, one for session id and the other for log type.") +diff --git a/lisp/doom.el b/lisp/doom.el +index 981190612..26baf8b33 100644 +--- a/lisp/doom.el ++++ b/lisp/doom.el +@@ -132,15 +132,7 @@ + (defconst doom-docs-dir (concat doom-emacs-dir "docs/") + "Where Doom's documentation files are stored. Must end with a slash.") + +-(defconst doom-private-dir +- (if-let (doomdir (getenv-internal "DOOMDIR")) +- (expand-file-name (file-name-as-directory doomdir)) +- (or (let ((xdgdir +- (expand-file-name "doom/" +- (or (getenv-internal "XDG_CONFIG_HOME") +- "~/.config")))) +- (if (file-directory-p xdgdir) xdgdir)) +- "~/.doom.d/")) ++(defconst doom-private-dir (expand-file-name (file-name-as-directory (getenv-internal "DOOMDIR"))) + "Where your private configuration is placed. + + Defaults to ~/.config/doom, ~/.doom.d or the value of the DOOMDIR envvar; +@@ -209,7 +201,7 @@ downloaded/installed by packages. Must end in a slash.") + (expand-file-name (file-name-as-directory localdir)) + (if doom-profile + doom-profile-dir +- (expand-file-name ".local/" doom-emacs-dir))) ++ "@local@/")) + "Root directory for local storage. + + Use this as a storage location for this system's installation of Doom Emacs. +@@ -217,10 +209,11 @@ Use this as a storage location for this system's installation of Doom Emacs. + These files should not be shared across systems. By default, it is used by + `doom-etc-dir' and `doom-cache-dir'. Must end with a slash.") + ++; nix-doom-emacs: This doesn't meet XDG but backwards compatibility is a thing. + (defconst doom-etc-dir + (if doom-profile + doom-profile-data-dir +- (concat doom-local-dir "etc/")) ++ "~/.local/doom") + "Directory for non-volatile local storage. + + Use this for files that don't change much, like server binaries, external +@@ -229,7 +222,7 @@ dependencies or long-term shared data. Must end with a slash.") + (defconst doom-cache-dir + (if doom-profile + doom-profile-cache-dir +- (concat doom-local-dir "cache/")) ++ "~/.cache/doom") + "Directory for volatile local storage. + + Use this for files that change often, like cache files. Must end with a slash.") +@@ -295,6 +288,7 @@ users).") + ;; Don't store eln files in ~/.emacs.d/eln-cache (where they can easily be + ;; deleted by 'doom upgrade'). + (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "eln/")) ++ (add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "cache/eln/")) + + (with-eval-after-load 'comp + ;; HACK Disable native-compilation for some troublesome packages -- 2.36.0 From d60b73a09055ce3df120ef13b138d2b0d6f3d6d3 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 7 Aug 2022 13:43:37 +0100 Subject: [PATCH 3/4] Update doom-emacs config paths --- default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 52d539a..ff88fb3 100644 --- a/default.nix +++ b/default.nix @@ -209,15 +209,16 @@ let # Stage 5: catch-all wrapper capable to run doom-emacs even # without installing ~/.emacs.d - # TODO: remove once Emacs 29+ is released and commonly available emacs = let load-config-from-site = writeTextDir "share/emacs/site-lisp/default.el" '' (message "doom-emacs is not placed in `doom-private-dir', loading from `site-lisp'") - ${lib.optionalString (!isEmacs29) '' + ${# TODO: remove once Emacs 29+ is released and commonly available + lib.optionalString (!isEmacs29) '' (load "${doom-emacs}/early-init.el") - (load "${doom-emacs}/core/core-start.el") ''} + (load "${doom-emacs}/lisp/doom.el") + (load "${doom-emacs}/lisp/doom-start.el") ''; in (emacsPackages.emacsWithPackages (epkgs: [ load-config-from-site ])); @@ -230,7 +231,7 @@ let (load "${doom-emacs}/early-init.el") EOF cat > $out/init.el << EOF - (load "${doom-emacs}/core/core-start.el") + (load "default.el") EOF ''; From 85f4d4381a62f2e8340997b81403a2a234cd7d58 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 9 Aug 2022 20:54:57 +0100 Subject: [PATCH 4/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'doom-emacs': 'github:doomemacs/doomemacs/bcca96a69a44c1a752dd58761f8c7e2b43695f0b' (2022-08-04) → 'github:doomemacs/doomemacs/b06fd63dcb686045d0c105f93e07f80cb8de6800' (2022-08-08) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8e4f9dd..3637143 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "doom-emacs": { "flake": false, "locked": { - "lastModified": 1659653357, - "narHash": "sha256-uYwLEie18FCjjapzT0AYcUPSiPeTPMpwLtxpnV+EHO4=", + "lastModified": 1659994866, + "narHash": "sha256-6lxvYfoPtzvinBHKvuUDpCz44IJpmZMLfLMy5q9UcFk=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "bcca96a69a44c1a752dd58761f8c7e2b43695f0b", + "rev": "b06fd63dcb686045d0c105f93e07f80cb8de6800", "type": "github" }, "original": {