Commit Graph

313 Commits

Author SHA1 Message Date
a18c36a724 Merge pull request #7 from TheSirC/patch-1
Use recursive flag on `cp` for private directory
2020-03-23 13:53:48 +01:00
28f1da710e Use recursive flag on cp for private directory
If the private directory has multiple folders in it, building the derivation will omit them.
2020-03-22 23:06:24 +01:00
9b13cde0ec Merge branch 'develop' (early part) 2020-03-16 19:16:02 +01:00
4502c27759 Fix git command shim
References: https://github.com/vlaci/nix-doom-emacs/issues/5
2020-03-16 19:15:32 +01:00
7add1505c0 Ensure that doom's customizations to straight.el take effect
`nix-straight.el` used to require `straight.el` on its own before `doom`
itself was loaded. This had an unfortunate side-effect that
`straight-fix-org` was set to nil after it has been loaded so
`org-version` and `org-git-version` functions were already overloaded.
This was no problem for `org-mode` itself as it has its own overload of
the above mentioned functions, but other libraries such as `elfeed` may
also use these which causes problems.

`nix-straight.el` is updated to a version where it does not preload
`straight` and an advice is provided to `doom` so it loads our version
of `straight` when it supposed to.

References: https://github.com/vlaci/nix-doom-emacs/issues/5
2020-03-16 19:15:20 +01:00
845e0847d1 Merge remote-tracking branch 'origin/develop' 2020-03-14 23:21:38 +01:00
697b4c878c updating dependencies 2020-03-08 11:00:54 +01:00
000e26593b Merge remote-tracking branch 'origin/develop' 2020-03-08 11:00:41 +01:00
83f23c2e07 updating dependencies 2020-03-01 08:20:00 +01:00
9518d6ab02 updating dependencies 2020-02-29 16:14:01 +01:00
2143f7f7bb Fix package overriding 2020-02-29 16:13:55 +01:00
7b23e480fe Merge remote-tracking branch 'origin/develop' 2020-02-29 12:56:15 +01:00
48689e30bd Fix doom-etc-dir to contain a trailing slash
as it is needed in order to properly concatenate path parts with this folder
2020-02-25 23:40:11 +01:00
2224e8f2dc updating dependencies 2020-02-25 21:54:20 +01:00
0d69edfadd niv: nixpkgs source is not needed 2020-02-25 21:54:01 +01:00
111c97bdc1 Merge remote-tracking branch 'origin/develop' 2020-02-25 21:53:45 +01:00
f91aebe940 updating dependencies 2020-02-22 10:25:49 +01:00
7f1a9cfa94 Merge commit '8bf10a4' 2020-02-22 10:25:30 +01:00
8bf10a4fc6 Updating sources using niv to track versions
It is nice tool for the job I have not yet known about
2020-02-22 10:25:01 +01:00
87a6f3d54f Merge remote-tracking branch 'origin/develop' 2020-02-19 23:50:17 +01:00
b387be3425 Fixing doom-snippets and rotate-text features
Dependencies were missing for these (enabled by default) doom features.

Fixes #2
2020-02-15 10:58:27 +01:00
09be4ad761 updating dependencies 2020-02-15 10:58:27 +01:00
065056219a Merge remote-tracking branch 'origin/develop' 2020-02-15 10:58:20 +01:00
16cf375b54 updating dependencies 2020-02-08 11:14:26 +01:00
2a85aac53d Merge remote-tracking branch 'origin/develop' 2020-02-08 11:14:06 +01:00
4547c4c071 updating dependencies 2020-02-02 10:38:09 +01:00
2c31356b5b Merge remote-tracking branch 'origin/develop' 2020-02-02 10:37:23 +01:00
40f264bd73 updating dependencies 2020-01-25 21:30:44 +01:00
d2f5dbb393 straightBuild: simplify extra package definition 2020-01-25 21:30:44 +01:00
8e95b5f888 nix-doom-emacs: org-mode fork to support newer doom versions
commit 964291bb3662ffb19ddc9150c2f4eb0ec05b3af1
    Author: Henrik Lissner <henrik@lissner.net>
    Date:   Wed Jan 22 18:36:37 2020 -0500

        Fix #2409: switch to org mirror
2020-01-25 21:30:44 +01:00
cf7761e96e nix-doom-emacs: support versions using dependency pinning
Doom versions after the following needs an updated version of nix-straight.el

    commit 4cc14389e84937c52c248e740190e2697bfcd389
    Author: Henrik Lissner <henrik@lissner.net>
    Date:   Tue Jan 14 22:32:11 2020 -0500

        PIN ALL THE PACKAGES
2020-01-25 21:30:44 +01:00
20ec4e8a3c Merge remote-tracking branch 'origin/develop' 2020-01-25 21:29:49 +01:00
5944884462 evil-org: doom-emacs depends on hlissner's fork 2020-01-07 14:04:46 +01:00
8b72ad5ff1 updating dependencies 2020-01-07 12:29:51 +01:00
46fb4c2931 Merge remote-tracking branch 'origin/develop' 2020-01-02 13:54:36 +01:00
ebcb039098 updating dependencies 2020-01-02 13:48:09 +01:00
2fb2169006 updating dependencies 2019-12-21 14:22:46 +01:00
1f8cedb4d9 README.md: adjust configuration example to work after #1 got merged 2019-12-21 14:22:42 +01:00
28aaf07321 doom-emacs: support newer revisions
workaround breakage introduced in

    commit 6f7bdc801a0b4d1a50f25b3c6d7d74858789a540
    Author: Henrik Lissner <henrik@lissner.net>
    Date:   Mon Dec 16 16:49:34 2019 -0500

        Make print! et co always respect standard-output
2019-12-21 14:22:42 +01:00
67fac5caaa Merge pull request #1 from rossabaker/master
Make work on nixpkgs-unstable, as programs.emacs.package
2019-12-20 11:20:03 +01:00
bd13c99287 Make it work as home-manager program.emacs.package 2019-12-13 17:54:23 -05:00
a041d16de8 Make work on runCommand-based emacsWithPackages 2019-12-12 20:07:33 -05:00
a9de74107f updating dependencies
* evil-quick-fix is a new dependency of doom
2019-12-01 15:53:51 +01:00
fe148fd0a5 README: clarify doomPrivateDir 2019-11-23 22:33:41 +01:00
829f2f46bc Merge remote-tracking branch 'origin/develop' 2019-11-23 22:27:41 +01:00
56089c8774 ~/.doom.d no longer needs to be installed
`extraConfig` is merged into doom user's `config.el` file
2019-11-23 22:19:19 +01:00
982a9d36b0 Merge remote-tracking branch 'origin/develop' 2019-11-23 16:10:13 +01:00
af9e4fc3b3 update dependencies 2019-11-23 16:08:56 +01:00
1f8cc61365 dependencies: adding so-long, evil-markdown and php-extras 2019-11-23 16:08:50 +01:00
f2423d9e54 Updating doom and dependencies 2019-11-23 10:41:20 +01:00