fix/upstreaming-merge-conflicts (#42)
Co-authored-by: Anton <fetsorn@gmail.com> Co-authored-by: Chris Montgomery <chris@cdom.io> Co-authored-by: Timothy DeHerrera <tim.deh@pm.me> Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info> Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Co-authored-by: GTrunSec <gtrunsec@hardenedlinux.org> Co-authored-by: Pacman99 <pachum99@myrdd.info> Co-authored-by: Joel <joel@joel.tokyo> Co-authored-by: Trevor Riles <trevor@trevorriles.com> Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/42 Co-authored-by: teutat3s <teutates@mailbox.org> Co-committed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
parent
1a4ab1a93f
commit
134fcb9a0d
1
.github/workflows/check.yml
vendored
1
.github/workflows/check.yml
vendored
|
@ -26,3 +26,4 @@ jobs:
|
|||
- run: nix -Lv flake check
|
||||
- run: nix -Lv build ".#nixosConfigurations.NixOS.config.system.build.toplevel"
|
||||
- run: nix -Lv develop -c echo OK
|
||||
- run: nix -Lv develop --command bud --help
|
||||
|
|
|
@ -1 +1 @@
|
|||
nix flake new -t "github:divnix/devos/master" "${2:-devos}"
|
||||
nix flake new -t "github:divnix/devos/main" "${2:-devos}"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
# Suites
|
||||
Suites provide a mechanism for users to easily combine and name collecitons of
|
||||
Suites provide a mechanism for users to easily combine and name collections of
|
||||
profiles.
|
||||
|
||||
`suites` are defined in the `importables` argument in either the `home` or `nixos`
|
||||
namespace. They are a special case of an `importable` which get passed as a special
|
||||
namespace. They are a special case of an `importable` which is passed as a special
|
||||
argument (one that can be use in an `imports` line) to your hosts. All lists defined
|
||||
in `suites` are flattened and type-checked as paths.
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
59
flake.lock
59
flake.lock
|
@ -20,6 +20,29 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"beautysh": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"bud",
|
||||
"nixpkgs"
|
||||
],
|
||||
"poetry2nix": "poetry2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1630693543,
|
||||
"narHash": "sha256-7Sly3ReaJZw60Qo0rpfN4jF6zy94nwQz6ENgUUFzJfg=",
|
||||
"owner": "lovesegfault",
|
||||
"repo": "beautysh",
|
||||
"rev": "5609593961b70428f58d5c1b4b25cdda43b0d0bd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lovesegfault",
|
||||
"repo": "beautysh",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"blank": {
|
||||
"locked": {
|
||||
"lastModified": 1625557891,
|
||||
|
@ -37,6 +60,7 @@
|
|||
},
|
||||
"bud": {
|
||||
"inputs": {
|
||||
"beautysh": "beautysh",
|
||||
"devshell": [
|
||||
"digga",
|
||||
"devshell"
|
||||
|
@ -46,11 +70,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1627855680,
|
||||
"narHash": "sha256-snDOrUp8nth2Vs3GeEXr7Xji+HaHy25htZLNvid/U3I=",
|
||||
"lastModified": 1633373878,
|
||||
"narHash": "sha256-9+ziZ8l6rq3yXyY6B0wYXrVdfxr6cdpEbPEGRHywBKc=",
|
||||
"owner": "divnix",
|
||||
"repo": "bud",
|
||||
"rev": "612228a68d404d559405225427a5d8b3cef9d27c",
|
||||
"rev": "4e709a2fcf19df500ba87d9c3b1b1481401cd53b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -125,7 +149,7 @@
|
|||
"blank": "blank",
|
||||
"deploy": "deploy",
|
||||
"devshell": "devshell",
|
||||
"flake-utils": "flake-utils",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils-plus": "flake-utils-plus",
|
||||
"home-manager": [
|
||||
"home"
|
||||
|
@ -468,6 +492,33 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"poetry2nix": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"bud",
|
||||
"beautysh",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"bud",
|
||||
"beautysh",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1625240517,
|
||||
"narHash": "sha256-2E1gaOP+bCplhf3kliVQWK5N1NV2h06mkJk2KTiRTJQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "poetry2nix",
|
||||
"rev": "e40e8ed0e8c11e709e4c8c7c20174facd265a021",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "poetry2nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
|
|
Loading…
Reference in a new issue