Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Documentation overhaul #266

Merged
merged 21 commits into from
Jan 17, 2023
Merged

Conversation

ribosomerocker
Copy link

@ribosomerocker ribosomerocker commented Sep 8, 2022

This makes a few assumptions about what will happen to the future of nix-doom-emacs. It expects 1. the packages attribute to exist in the flake 2. for it to be an attribute set, not a function 3. that it has a default attribute and a nix-doom-emacs attribute. 4. that they're overridable with module settings

For that reason, this is a draft. I will unmark it as a draft once all of the changes have been made.

@ribosomerocker ribosomerocker marked this pull request as draft September 8, 2022 18:56
docs/faq.md Outdated Show resolved Hide resolved
docs/faq.md Outdated Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
docs/faq.md Outdated Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
docs/faq.md Outdated Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
docs/faq.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@ribosomerocker ribosomerocker marked this pull request as ready for review September 12, 2022 21:23
@ribosomerocker ribosomerocker changed the title WIP: Documentation overhaul Documentation overhaul Sep 12, 2022
docs/README.md Outdated Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
docs/README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
docs/faq.md Show resolved Hide resolved
docs/faq.md Outdated Show resolved Hide resolved
docs/faq.md Outdated Show resolved Hide resolved
docs/faq.md Outdated Show resolved Hide resolved
docs/faq.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
docs/faq.md Outdated Show resolved Hide resolved
docs/faq.md Outdated Show resolved Hide resolved
docs/reference.md Outdated Show resolved Hide resolved

If you encounter any issues while using nix-doom-emacs, you can find some of us in the [Matrix room](https://matrix.to/#/#doom-emacs:nixos.org). Only bugs should be filed in our [issue tracker](https://github.com/nix-community/nix-doom-emacs/issues).

nix-doom-emacs uses [`nix-straight.el`](https://github.com/nix-community/nix-straight.el) under the hood to install dependencies. It's a low level wrapper to integrate Nix with [`straight.el`](https://github.com/radian-software/straight.el). It is maintained by the same people as this project.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is dev/contributing docs. Bad place.

docs/reference.md Outdated Show resolved Hide resolved
docs/reference.md Outdated Show resolved Hide resolved
Ordered from most suggested to least suggested.
In all of these methods, you'll need your Doom Emacs configuration. It 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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unreviewed after here since I'd like to see how things look moved around first.

Copy link
Member

@ckiee ckiee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Partial, don't feel like going over everything right now.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
docs/reference.md Outdated Show resolved Hide resolved
docs/reference.md Outdated Show resolved Hide resolved
programs.doom-emacs = {
enable = true;
doomPrivateDir = ./doom.d;
emacsPackage = pkgs.emacsPgtkNativeComp;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

error: anonymous function at /nix/store/1q10ylzzjmxwz5a4zy3dbdd9dzw8n0l6-source/default.nix:1:1 called with unexpected argument 'emacsPackage'

       at /nix/store/4idp9fvcbrp511x4vykas35yiiaqfbw6-nixos/nixos/lib/customisation.nix:72:16:

           71|     let
           72|       result = f origArgs;
             |                ^
           73|
       Did you mean emacsPackages?
(use '--show-trace' to show detailed location information)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With some more digging, it's not obvious how to compose emacs-overlay with the non-flake home manager, since one uses home.packages, and the other uses the module enable method.

Copy link
Member

@ckiee ckiee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's still messy, but an overall improvement. We're going to merge.

@thiagokokada thiagokokada merged commit 3bae7af into nix-community:master Jan 17, 2023
@ribosomerocker
Copy link
Author

Nice. Sorry for not having the time to work on this, thank you for merging. I'll be deleting this branch.

@ribosomerocker ribosomerocker deleted the doc-branch branch January 18, 2023 06:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants