### Changes for org-mode On branch: master Commits:cb8e50ed15...c5573bdf4c
- [88fbe21a](88fbe21a88
) Add Luc Pellissier as maintainer for two ob-* files - [dcb6013f](dcb6013fb6
) agenda: Fix org-duration-to-minutes error (take 2) - [34bbb03c](34bbb03cca
) CONTRIBUTE: Small enhancements - [0e39bf83](0e39bf839a
) Throw user errors when trying to drag inline tasks - [3581f373](3581f3730f
) CONTRIBUTE: Small enhancements - [8544f555](8544f555ac
) lisp/org-inlinetask.el: Silent the byte-compiler - [78e39d58](78e39d58d4
) lisp/org-id.el: Small enhancements - [f98e3ef6](f98e3ef65a
) lisp/ox-md.el: Mark some arguments as unused - [06c064e9](06c064e97c
) lisp/org-agenda.el: Fix bug in `org-agenda-highlight-todo' - [d285831a](d285831af3
) org-refile.el: Fix the case of emtpy buffer name - [b2c5028e](b2c5028e5b
) lisp/org.el: Minor aesthetic clean-up - [f313b818](f313b81841
) Improve org-link-plain-re - [d37e8a14](d37e8a14b7
) lisp/org.el: Fix indenting of planning line - [4ce78810](4ce78810ac
) lisp/org.el: Don't let RET indent in source code blocks - [6ab5299e](6ab5299e5b
) Fix test-org-element/cache "Preserve local structures when re-parenting." - [8b0b206b](8b0b206b52
) lisp/org.el: Use "[BUG]" instead of "Bug:" for bug reports - [ba273278](ba273278a5
) Use cache in org-up-heading-safe - [9e127a72](9e127a720c
) New command `org-refile-reverse' bound to C-c C-M-w - [77213acb](77213acb8f
) Fix code typo in 06c064e9 - [ed5e2893](ed5e28939b
) Fix code typo in 06c064e9 (take 2) - [b72b718a](b72b718ac6
) Add a test for known bug in org-element-cache - [d85f4158](d85f4158e2
) Set org-adapt-indentation explicitly in some tests - [4764a2fb](4764a2fbf9
) Set org-adapt-indentation explicitly in some tests - [34fc1804](34fc18040d
) lisp/org-agenda.el: Use "09:00" instead of " 9:00" - [4da4b3aa](4da4b3aa66
) Allow moving inlinetasks using org-metaup/down - [e0bc2b37](e0bc2b37fb
) lisp/ox-latex.el: Allow arbitrary float environments - [89040fbf](89040fbf95
) ox-latex.el: Support specific attributes for verse block - [bfb35077](bfb350777d
) etc/ORG-NEWS: Various enhancements - [bab1b26e](bab1b26eb1
) lisp/org-attach-git.el: New option `org-attach-git-dir' - [fa3c9c8b](fa3c9c8b69
) lisp/org-id.el: Small enhancements - [dd88356d](dd88356d3a
) lisp/org-inlinetask.el: Silent the byte-compiler - [5a0f6c9f](5a0f6c9f75
) lisp/ox-md.el: Mark some arguments as unused - [90a9ee17](90a9ee1741
) lisp/org-agenda.el: Fix bug in `org-agenda-highlight-todo' - [8531bb61](8531bb615c
) lisp/org.el: Minor aesthetic clean-up - [f00ad09e](f00ad09e25
) org-refile.el: Fix the case of emtpy buffer name - [7dcb1afb](7dcb1afb69
) Improve org-link-plain-re - [99d873b9](99d873b9c3
) lisp/org.el: Fix indenting of planning line - [bfda3cc7](bfda3cc7df
) lisp/org.el: Don't let RET indent in source code blocks - [f318cd6c](f318cd6c40
) Fix test-org-element/cache "Preserve local structures when re-parenting." - [24473b5e](24473b5e08
) lisp/org.el: Use "[BUG]" instead of "Bug:" for bug reports - [8f39743c](8f39743ce6
) Use cache in org-up-heading-safe - [33027f99](33027f992d
) New command `org-refile-reverse' bound to C-c C-M-w - [e53572e1](e53572e130
) Fix code typo in 06c064e9 - [c6d11502](c6d11502e0
) Fix code typo in 06c064e9 (take 2) - [3f59ea98](3f59ea981c
) Add a test for known bug in org-element-cache - [b183315e](b183315e16
) Set org-adapt-indentation explicitly in some tests - [f0447de9](f0447de941
) Set org-adapt-indentation explicitly in some tests - [81c7a2de](81c7a2dee8
) lisp/org-agenda.el: Use "09:00" instead of " 9:00" - [72894cde](72894cde6f
) Allow moving inlinetasks using org-metaup/down - [ee40458d](ee40458d00
) lisp/ox-latex.el: Allow arbitrary float environments - [91373e15](91373e15c8
) ox-latex.el: Support specific attributes for verse block - [83ab8524](83ab852478
) etc/ORG-NEWS: Various enhancements - [df9b509a](df9b509a6c
) lisp/org-attach-git.el: New option `org-attach-git-dir' - [307e722d](307e722dd9
) org-agenda.el: Fix clocking issues regex - [702fefe9](702fefe9f6
) ox-html: Fix typography in a docstring - [e860fbf2](e860fbf22a
) lisp/org-list.el: Fix bug wrt updating statistics - [5c8e735a](5c8e735af4
) lisp/org-list.el: Fix bug wrt updating statistics - [747b10c2](747b10c2e0
) etc/ORG-NEWS: Add a news entry about ditaa.jar not being bundled - [1d99f5a6](1d99f5a65a
) lisp/org.el: Minor enhancement to `org-priority' - [589962b7](589962b730
) lisp/org.el: Fix bug in `org-sort-remove-invisible' - [60fccc75](60fccc752e
) lisp/org.el: Explicit the docstrings of org-priority-highest/lowest - [c50c92bc](c50c92bc45
) lisp/ol.el: Enhance message when the link has already been stored - [e444181e](e444181ee3
) lisp/*: Use version number when obsoleting - [ef495b76](ef495b76ec
) ox-html: Fix typography in a docstring - [cbc450d0](cbc450d03c
) lisp/org-list.el: Fix bug wrt updating statistics - [c77066dd](c77066dd7f
) etc/ORG-NEWS: Add a news entry about ditaa.jar not being bundled - [b91e934a](b91e934a59
) lisp/org.el: Minor enhancement to `org-priority' - [f63cbd36](f63cbd36c5
) lisp/org.el: Fix bug in `org-sort-remove-invisible' - [f4b881eb](f4b881eb03
) lisp/org.el: Explicit the docstrings of org-priority-highest/lowest - [b4133552](b4133552e1
) lisp/ol.el: Enhance message when the link has already been stored - [336efd6d](336efd6dd9
) lisp/*: Use version number when obsoleting - [8846ea71](8846ea71fa
) element: Fix drawer parsing - [9802877f](9802877fbe
) doc/Makefile: Use the .info extension for org.info and orgguide.info - [d02ad1f2](d02ad1f207
) lisp/org-src.el: Use `replace-buffer-contents' - [d65ae82f](d65ae82f4b
) lisp/org-src.el: Continue the previous fix (d02ad1f2) - [8cf704e3](8cf704e3fe
) lisp/org.el: Fix org-update-statistics-cookies error - [e4943d0b](e4943d0bfa
) lisp/org.el: Fix some indentation issues - [a9af1faa](a9af1faaa1
) org-src.el (org-edit-src-exit): Fix write-back-buf not getting killed - [c670379a](c670379adf
) Fix `org-agenda-todo' undo behavior when logging (not adding note) - [823f9744](823f9744e9
) lisp/org-agenda.el: Let tags-todo searches include DONE keywords - [a34d7156](a34d71560b
) Revert "lisp/org-agenda.el: Let tags-todo searches include DONE keywords" - [857ae366](857ae366b3
) org.el (org-src--contents-for-write-back): Indent blank lines - [6de34f28](6de34f2891
) Move `org-file-url-p' to "org-macs.el", rename it to `org-url-p' - [53fd5b77](53fd5b774e
) ob-comint.el, ob-python.el: Async session evaluation - [038aff34](038aff34db
) * lisp/org-clock.el (org-clock-get-table-data): Use proper closures - [71c40314](71c40314f5
) * lisp/org-colview.el (org-columns-map): Use proper closures - [1a5a326f](1a5a326f10
) * lisp/org-timer.el (org-timer--run-countdown-timer): Use closures - [ab9f2af3](ab9f2af34f
) lisp/org.el: Bump version number - [65243012](6524301288
) mk/server.mk: Complete and fix 9802877fb - [a8134b2c](a8134b2c58
) Backport commit af68b4956 from Emacs - [08d7b359](08d7b359b8
) Backport commit 4e240bf09 from Emacs - [64689d9b](64689d9bb7
) Backport commit 5746fd57a from Emacs - [ca300ada](ca300ada21
) Backport commit 09ed51b9c from Emacs - [507cf71d](507cf71de2
) etc/ORG-NEWS: Suggest against disabling `electric-indent-mode' - [13c78a59](13c78a5900
) footnote: Allow new footnotes in empty cells - [7ca7d8dd](7ca7d8dd18
) manual: Fix capitalization of "ATTR_LATEX" - [846801e8](846801e82c
) manual: More capitalization - [21eb69c4](21eb69c413
) org-agenda-files: Work with relative file paths - [f72a658b](f72a658bd0
) org-plot: Use consistent method to find table - [37f69bf8](37f69bf86d
) org-refile: Fix double slashes in the refile targets
nix-doom-emacs
Status | |
---|---|
Build on master |
|
Build on develop |
|
Dependency updater |
Nix expression to install and configure doom-emacs.
The expression builds a doom-emacs
distribution with dependencies
pre-installed based on an existing ~/.doom.d
directory.
It is not a fully fledged experience as some dependencies are not installed and
some may not be fully compatible as the version available in NixOS or
emacs-overlay may not be
compatible with the doom-emacs
requirements.
Getting started
Using home-manager:
{ pkgs, ... }:
let
doom-emacs = pkgs.callPackage (builtins.fetchTarball {
url = https://github.com/vlaci/nix-doom-emacs/archive/master.tar.gz;
}) {
doomPrivateDir = ./doom.d; # Directory containing your config.el init.el
# and packages.el files
};
in {
home.packages = [ doom-emacs ];
home.file.".emacs.d/init.el".text = ''
(load "default.el")
'';
}
./doom.d
should contain the following three files: config.el
, init.el
and
packages.el
. If you don't already have an existing doom-emacs
configuration,
you can use the contents of test/doom.d
as a template.
Using flake.nix
:
{
inputs = {
home-manager.url = "github:rycee/home-manager";
nix-doom-emacs.url = "github:vlaci/nix-doom-emacs";
};
outputs = {
self,
nixpkgs,
home-manager,
nix-doom-emacs,
...
}: {
nixosConfigurations.exampleHost = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
{
home-manager.users.exampleUser = { pkgs, ... }: {
imports = [ nix-doom-emacs.hmModule ];
programs.doom-emacs = {
enable = true;
doomPrivateDir = ./doom.d;
};
};
}
];
};
};
}
Under the hood
This expression leverages nix-straight.el under the hood for installing dependencies. The restrictions of that package apply here too.
Usage
instead of running emacs.d/bin/doom, once you have update your config files (packages.el, init.el, config.el), rebuild doom-emacs with nix. If you are using home-manager, simply run home-manager switch
Troubleshooting
On macOS on a fresh install, you might run into the error Too many files open
. running ulimit -S -n 2048
will only work for the duration of your shell and will fix the error
Installing emacs packages
In the initial packages.el instructions for how to install packages can be
found. However some packages might require a particular software dependency to
be installed. Trying to install those would give you an error of the type:
Searching for program: No such file or directory, git
(Missing git dependency)
Here is how you would go installing
magit-delta for example (which
requires git).
Under the line:
doomPrivateDir = ./doom.d;
in your configuration, you would add the following:
emacsPackagesOverlay = self: super: {
magit-delta = super.magit-delta.overrideAttrs (esuper: {
buildInputs = esuper.buildInputs ++ [ pkgs.git ];
});
};
To make the git dependency available. trying to rebuild doom-emacs with
home-manager switch
should work correctly now.
Using the daemon
To use the daemon, simply enable the emacs service (with NixOS
, home-manager
or nix-darwin
) and use the doom emacs package. doom-emacs
will need to be
referenced at the top of your config file.
services.emacs = {
enable = true;
package = doom-emacs; # use programs.emacs.package instead if using home-manager
}
to connect to the daemon you can now run emacsclient -c