256 lines
15 KiB
Plaintext
256 lines
15 KiB
Plaintext
[[ch-contributing]]
|
|
== Contributing
|
|
|
|
:open-issues: https://github.com/rycee/home-manager/issues
|
|
:new-issue: https://github.com/rycee/home-manager/issues/new
|
|
:fork-a-repo: https://help.github.com/articles/fork-a-repo/
|
|
:create-a-pull-request: https://help.github.com/articles/creating-a-pull-request/
|
|
:seven-rules: https://chris.beams.io/posts/git-commit/#seven-rules
|
|
:news-nix: https://github.com/rycee/home-manager/blob/master/modules/misc/news.nix
|
|
:nixfmt: https://github.com/serokell/nixfmt/
|
|
:example-commit-message: https://github.com/rycee/home-manager/commit/69f8e47e9e74c8d3d060ca22e18246b7f7d988ef
|
|
|
|
Contributions to Home Manager are very welcome. To make the process as smooth as possible for both you and the Home Manager maintainers we provide some guidelines that we ask you to follow. See <<sec-contrib-getting-started>> for information on how to set up a suitable development environment and <<sec-guidelines>> for the actual guidelines.
|
|
|
|
This text is mainly directed at those who would like to make code contributions to Home Manager. If you just want to report a bug then first look among the already {open-issues}[open issues], if you find one matching yours then feel free to comment on it to add any additional information you may have. If no matching issue exists then go to the {new-issue}[new issue] page and write a description of your problem. Include as much information as you can, ideally also include relevant excerpts from your Home Manager configuration.
|
|
|
|
[[sec-contrib-getting-started]]
|
|
=== Getting started
|
|
|
|
If you have not previously forked Home Manager then you need to do that first. Have a look at GitHub's {fork-a-repo}[Fork a repo] for instructions on how to do this.
|
|
|
|
Once you have a fork of Home Manager you should create a branch starting at the most recent `master` branch. Give your branch a reasonably descriptive name. Commit your changes to this branch and when you are happy with the result and it fulfills <<sec-guidelines>> then push the branch to GitHub and {create-a-pull-request}[create a pull request].
|
|
|
|
Assuming your clone is at `$HOME/devel/home-manager` then you can make the `home-manager` command use it by either
|
|
|
|
1. overriding the default path by using the `-I` command line option:
|
|
+
|
|
[source,console]
|
|
$ home-manager -I home-manager=$HOME/devel/home-manager
|
|
+
|
|
or
|
|
|
|
2. changing the default path by ensuring your configuration includes
|
|
+
|
|
[source,nix]
|
|
----
|
|
programs.home-manager.enable = true;
|
|
programs.home-manager.path = "$HOME/devel/home-manager";
|
|
----
|
|
+
|
|
and running `home-manager switch` to activate the change. Afterwards, `home-manager build` and `home-manager switch` will use your cloned repository.
|
|
|
|
The first option is good if you only temporarily want to use your clone.
|
|
|
|
[[sec-guidelines]]
|
|
=== Guidelines
|
|
:irc-home-manager: https://webchat.freenode.net/?url=irc%3A%2F%2Firc.freenode.net%2Fhome-manager
|
|
:valuable-options: https://github.com/Infinisil/rfcs/blob/config-option/rfcs/0042-config-option.md#valuable-options
|
|
:rfc-42: https://github.com/Infinisil/rfcs/blob/config-option/rfcs/0042-config-option.md
|
|
|
|
If your contribution satisfy the following rules then there is a good chance it will be merged without too much trouble. The rules are enforced by the Home Manager maintainers and to a lesser extent the Home Manager CI system.
|
|
|
|
If you are uncertain how these rules affect the change you would like to make then feel free to start a discussion in the {irc-home-manager}[#home-manager] IRC channel, ideally before you start developing.
|
|
|
|
[[sec-guidelines-back-compat]]
|
|
==== Maintain backward compatibility
|
|
|
|
Your contribution should never cause another user's existing configuration to break. Home Manager is used in many different environments and you should consider how you change may effect others. For example,
|
|
|
|
- Does your change work for people that do not use NixOS? Consider other GNU/Linux distributions and macOS.
|
|
- Does your change work for people whose configuration is built on one system and deployed on another system?
|
|
|
|
[[sec-guidelines-forward-compat]]
|
|
==== Keep forward compatibility in mind
|
|
|
|
The master branch of Home Manager tracks the unstable channel of Nixpkgs, which may update package versions at any time. It is therefore important to consider how a package update may affect your code and try to reduce the risk of breakage.
|
|
|
|
The most effective way to reduce this risk is to follow the advice in <<sec-guidelines-valuable-options>>.
|
|
|
|
[[sec-guidelines-valuable-options]]
|
|
==== Add only valuable options
|
|
|
|
When creating a new module it is tempting to include every option supported by the software. This is _strongly_ discouraged. Providing many options increases maintenance burden and risk of breakage considerably. This is why only the most {valuable-options}[important software options] should be modeled explicitly. Less important options should be expressible through an `extraConfig` escape hatch.
|
|
|
|
A good rule of thumb for the first implementation of a module is to only add explicit options for those settings that absolutely must be set for the software to function correctly. It follows that a module for software that provides sensible default values for all settings would require no explicit options at all.
|
|
|
|
If the software uses a structured configuration format like a JSON, YAML, INI, TOML, or even a plain list of key/value pairs then consider using a `settings` option as described in {rfc-42}[Nix RFC 42].
|
|
|
|
[[sec-guidelines-add-tests]]
|
|
==== Add relevant tests
|
|
|
|
If at all possible, make sure to add new tests and expand existing tests so that your change will keep working in the future. See <<sec-tests>> for more information about the Home Manager test suite.
|
|
|
|
All contributed code _must_ pass the test suite.
|
|
|
|
[[sec-guidelines-module-maintainer]]
|
|
|
|
==== Add relevant documentation
|
|
:docbook: https://tdg.docbook.org/
|
|
:asciidoc: https://asciidoc.org/
|
|
:docbook-rocks: https://docbook.rocks/
|
|
|
|
Many code changes require changing the documentation as well. Module options should be documented with DocBook. See {docbook-rocks}[DocBook rocks!] for a quick introduction and {docbook}[DocBook 5: The Definitive Guide] for in-depth information of DocBook. Home Manager is itself documented using a combination of DocBook and {asciidoc}[AsciiDoc]. All text is hosted in Home Manager's Git repository.
|
|
|
|
The HTML version of the manual containing both the module option descriptions and the documentation of Home Manager can be generated and opened by typing the following in a shell within a clone of the Home Manager Git repository:
|
|
|
|
[source,console]
|
|
$ nix-build -A docs.html
|
|
$ xdg-open ./result/share/doc/home-manager/index.html
|
|
|
|
When you have made changes to a module, it is a good idea to check that the man page version of the module options looks good:
|
|
|
|
[source,console]
|
|
$ nix-build -A docs.manPages
|
|
$ man ./result/share/man/man5/home-configuration.nix.5
|
|
|
|
==== Add yourself as a module maintainer
|
|
|
|
Every new module _must_ include a named maintainer using the `meta.maintainers` attribute. If you are a user of a module that currently lacks a maintainer then please consider adopting it.
|
|
|
|
If you are present in the NixOS maintainer list then you can use that entry. If you are not then you can add yourself to `modules/lib/maintainers.nix` in the Home Manager project.
|
|
|
|
Also add yourself to `.github/CODEOWNERS` as owner of the associated module files, including the test files. You will then be automatically added as a reviewer on any new pull request that touches your files.
|
|
|
|
Maintainers are encouraged to join the IRC channel and participate when they have opportunity.
|
|
|
|
[[sec-guidelines-code-style]]
|
|
==== Format your code
|
|
|
|
Make sure your code is formatted as described in <<sec-code-style>>. To maintain consistency throughout the project you are encouraged to browse through existing code and adopt its style also in new code.
|
|
|
|
[[sec-guidelines-commit-message-style]]
|
|
==== Format your commit messages
|
|
|
|
Similar to <<sec-guidelines-code-style>> we encourage a consistent commit message format as described in <<sec-commit-style>>.
|
|
|
|
[[sec-guidelines-news-style]]
|
|
==== Format your news entries
|
|
|
|
If your contribution includes a change that should be communicated to users of Home Manager then you can add a news entry. The entry must be formatted as described in <<sec-news>>.
|
|
|
|
When new modules are added a news entry should be included but you do not need to create this entry manually. The merging maintainer will create the entry for you. This is to reduce the risk of merge conflicts.
|
|
|
|
[[sec-guidelines-conditional-modules]]
|
|
==== Use conditional modules and news
|
|
|
|
Home Manager includes a number of modules that are only usable on some of the supported platforms. The most common example of platform specific modules are those that define systemd user services, which only works on Linux systems.
|
|
|
|
If you add a module that is platform specific then make sure to include a condition in the `loadModule` function call. This will make the module accessible only on systems where the condition evaluates to `true`.
|
|
|
|
Similarly, if you are adding a news entry then it should be shown only to users that may find it relevant, see <<sec-news>> for a description of conditional news.
|
|
|
|
[[sec-guidelines-licensing]]
|
|
==== Mind the license
|
|
|
|
The Home Manager project is covered by the MIT license and we can only accept contributions that fall under this license, or are licensed in a compatible way. When you contribute self written code and documentation it is assumed that you are doing so under the MIT license.
|
|
|
|
A potential gotcha with respect to licensing are option descriptions. Often it is convenient to copy from the upstream software documentation. When this is done it is important to verify that the license of the upstream documentation allows redistribution under the terms of the MIT license.
|
|
|
|
[[sec-commit-style]]
|
|
=== Commits
|
|
|
|
The commits in your pull request should be reasonably self-contained, that is, each commit should make sense in isolation. In particular, you will be asked to amend any commit that introduces syntax errors or similar problems even if they are fixed in a later commit.
|
|
|
|
The commit messages should follow the {seven-rules}[seven rules]. We also ask you to include the affected code component or module in the first line. That is, a commit message should follow the template
|
|
|
|
----
|
|
{component}: {description}
|
|
|
|
{long description}
|
|
----
|
|
|
|
where `{component}` refers to the code component (or module) your change affects, `{description}` is a very brief description of your change, and `{long description}` is an optional clarifying description. Note, `{description}` should start with a lower case letter. As a rare exception, if there is no clear component, or your change affects many components, then the `{component}` part is optional. See <<ex-commit-message>> for a commit message that fulfills these requirements.
|
|
|
|
[[ex-commit-message]]
|
|
.Compliant commit message
|
|
===============================================================================
|
|
The commit {example-commit-message}[69f8e47e9e74c8d3d060ca22e18246b7f7d988ef] contains the commit message
|
|
|
|
----
|
|
starship: allow running in Emacs if vterm is used
|
|
|
|
The vterm buffer is backed by libvterm and can handle Starship prompts
|
|
without issues.
|
|
----
|
|
|
|
which ticks all the boxes necessary to be accepted in Home Manager.
|
|
===============================================================================
|
|
|
|
Finally, when adding a new module, say `programs/foo.nix`, we use the fixed commit format `foo: add module`. You can, of course, still include a long description if you wish.
|
|
|
|
[[sec-code-style]]
|
|
=== Code Style
|
|
|
|
The code in Home Manager is formatted by the {nixfmt}[nixfmt] tool and the formatting is checked in the pull request tests. Run the `format` tool inside the project repository before submitting your pull request.
|
|
|
|
Keep lines at a reasonable width, ideally 80 characters or less. This also applies to string literals.
|
|
|
|
We prefer `lowerCamelCase` for variable and attribute names with the accepted exception of variables directly referencing packages in Nixpkgs which use a hyphenated style. For example, the Home Manager option `services.gpg-agent.enableSshSupport` references the `gpg-agent` package in Nixpkgs.
|
|
|
|
[[sec-news]]
|
|
=== News
|
|
|
|
Home Manager includes a system for presenting news to the user. When making a change you, therefore, have the option to also include an associated news entry. In general, a news entry should only be added for truly noteworthy news. For example, a bug fix or new option does generally not need a news entry.
|
|
|
|
If you do have a change worthy of a news entry then please add one in {news-nix}[`news.nix`] but you should follow some basic guidelines:
|
|
|
|
- The entry timestamp should be in ISO-8601 format having "+00:00" as time zone. For example, "2017-09-13T17:10:14+00:00". A suitable timestamp can be produced by the command
|
|
+
|
|
[source,console]
|
|
$ date --iso-8601=second --universal
|
|
|
|
- The entry condition should be as specific as possible. For example, if you are changing or deprecating a specific option then you could restrict the news to those users who actually use this option.
|
|
|
|
- Wrap the news message so that it will fit in the typical terminal, that is, at most 80 characters wide. Ideally a bit less.
|
|
|
|
- Unlike commit messages, news will be read without any connection to the Home Manager source code. It is therefore important to make the message understandable in isolation and to those who do not have knowledge of the Home Manager internals. To this end it should be written in more descriptive, prose like way.
|
|
|
|
- If you refer to an option then write its full attribute path. That is, instead of writing
|
|
+
|
|
----
|
|
The option 'foo' has been deprecated, please use 'bar' instead.
|
|
----
|
|
+
|
|
it should read
|
|
+
|
|
----
|
|
The option 'services.myservice.foo' has been deprecated, please
|
|
use 'services.myservice.bar' instead.
|
|
----
|
|
|
|
- A new module, say `foo.nix`, should always include a news entry that has a message along the lines of
|
|
+
|
|
----
|
|
A new module is available: 'services.foo'.
|
|
----
|
|
+
|
|
If the module is platform specific, e.g., a service module using systemd, then a condition like
|
|
+
|
|
[source,nix]
|
|
condition = hostPlatform.isLinux;
|
|
+
|
|
should be added. If you contribute a module then you don't need to add this entry, the merger will create an entry for you.
|
|
|
|
[[sec-tests]]
|
|
=== Tests
|
|
|
|
Home Manager includes a basic test suite and it is highly recommended to include at least one test when adding a module. Tests are typically in the form of "golden tests" where, for example, a generated configuration file is compared to a known correct file.
|
|
|
|
It is relatively easy to create tests by modeling the existing tests, found in the `tests` project directory.
|
|
|
|
The full Home Manager test suite can be run by executing
|
|
|
|
[source,console]
|
|
$ nix-shell --pure tests -A run.all
|
|
|
|
in the project root. List all test cases through
|
|
|
|
[source,console]
|
|
$ nix-shell --pure tests -A list
|
|
|
|
and run an individual test, for example `alacritty-empty-settings`, through
|
|
|
|
[source,console]
|
|
$ nix-shell --pure tests -A run.alacritty-empty-settings
|