fix/upstreaming-merge-conflicts #42

Merged
teutat3s merged 26 commits from refs/pull/42/head into main 2021-10-11 22:32:01 +00:00
7 changed files with 8 additions and 8 deletions
Showing only changes of commit 804e972c57 - Show all commits

View file

@ -1 +1 @@
nix flake new -t "github:divnix/devos/master" "${2:-devos}"
nix flake new -t "github:divnix/devos/main" "${2:-devos}"

View file

@ -1,7 +1,7 @@
# Pull Requests
## TL;DR;
- **Target Branch**: `master`
- **Target Branch**: `main`
- **Merge Policy**: [`bors`][bors] is always right (→ `bors try`)
- **Docs**: every changeset is expected to contain doc updates
- **Commit Msg**: be a poet! Comprehensive and explanatory commit messages

View file

@ -63,5 +63,5 @@ specific belongs in your [host](hosts.md) files instead.
[definition]: https://nixos.org/manual/nixos/stable/index.html#sec-option-definitions
[declaration]: https://nixos.org/manual/nixos/stable/index.html#sec-option-declarations
[options]: https://nixos.org/manual/nixos/stable/index.html#sec-writing-modules
[spec]: https://github.com/divnix/devos/tree/master/lib/devos/mkProfileAttrs.nix
[spec]: https://github.com/divnix/devos/tree/main/lib/devos/mkProfileAttrs.nix
[config]: https://nixos.wiki/wiki/Module#structure

View file

@ -73,5 +73,5 @@ nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPac
```
[home-manager]: https://nix-community.github.io/home-manager
[modules-list]: https://github.com/divnix/devos/tree/master/users/modules/module-list.nix
[modules-list]: https://github.com/divnix/devos/tree/main/users/modules/module-list.nix
[portableuser]: https://digga.divnix.com/api-reference-home.html#homeusers

View file

@ -40,4 +40,4 @@ fetch.git = "https://github.com/mlvzk/manix.git" # responsible for fetching
[nvf]: https://github.com/berberman/nvfetcher
[nvf-readme]: https://github.com/berberman/nvfetcher#readme
[sources.toml]: https://github.com/divnix/devos/tree/master/pkgs/sources.toml
[sources.toml]: https://github.com/divnix/devos/tree/main/pkgs/sources.toml

View file

@ -6,8 +6,8 @@ Here is a snippet that will get you the template without the git history:
```sh
nix-shell -p cachix --run "cachix use nrdxp"
nix-shell https://github.com/divnix/devos/archive/master.tar.gz -A shell \
--run "bud get master"
nix-shell https://github.com/divnix/devos/archive/main.tar.gz -A shell \
--run "bud get main"
cd devos

View file

@ -26,7 +26,7 @@ and the examples in [nixpkgs][nixos-tests].
[test-doc]: https://nixos.org/manual/nixos/stable/index.html#sec-nixos-tests
[test-blog]: https://www.haskellforall.com/2020/11/how-to-use-nixos-for-lightweight.html
[default]: https://github.com/divnix/devos/tree/master/tests/default.nix
[default]: https://github.com/divnix/devos/tree/main/tests/default.nix
[run-test]: https://github.com/NixOS/nixpkgs/blob/6571462647d7316aff8b8597ecdf5922547bf365/lib/debug.nix#L154-L166
[nixos-tests]: https://github.com/NixOS/nixpkgs/tree/master/nixos/tests
[testing-python]: https://github.com/NixOS/nixpkgs/tree/master/nixos/lib/testing-python.nix