From 469b3746cfe1c2698b9c23d352d23b6c1133014e Mon Sep 17 00:00:00 2001 From: Parthiv Seetharaman Date: Mon, 4 Oct 2021 11:59:33 -0700 Subject: [PATCH 1/4] flake: update bud input --- flake.lock | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index f8da619..02e7a7d 100644 --- a/flake.lock +++ b/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" @@ -206,6 +230,21 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1623875721, + "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home": { "inputs": { "nixpkgs": [ @@ -418,6 +457,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", From 74208fb88f7832e0354e0646145784e55071b7af Mon Sep 17 00:00:00 2001 From: Parthiv Seetharaman Date: Mon, 4 Oct 2021 12:18:28 -0700 Subject: [PATCH 2/4] workflows: add check to run bud --- .github/workflows/check.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index e80861b..8fdf8d1 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -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 From 8684105d21c1c59db27e499a5801023dd3ce2c7d Mon Sep 17 00:00:00 2001 From: Joel Date: Thu, 7 Oct 2021 19:11:21 +1000 Subject: [PATCH 3/4] docs: fix typos in concepts/suites --- doc/concepts/suites.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/concepts/suites.md b/doc/concepts/suites.md index 42a3db8..e9eef34 100644 --- a/doc/concepts/suites.md +++ b/doc/concepts/suites.md @@ -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. From 804e972c5701884f8f0891dc68e8a60802d9f03b Mon Sep 17 00:00:00 2001 From: Trevor Riles Date: Sat, 9 Oct 2021 11:17:42 -0500 Subject: [PATCH 4/4] Update docs and scripts to use main branch. When following the getting started guide commands were failing due to the mater branch not existing. I went through and updated all references in the docs and other scripts from master to main. --- bud/get.bash | 2 +- doc/CONTRIBUTING.md | 2 +- doc/concepts/profiles.md | 2 +- doc/concepts/users.md | 2 +- doc/integrations/nvfetcher.md | 2 +- doc/start/index.md | 4 ++-- doc/tests.md | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bud/get.bash b/bud/get.bash index 770c002..b88081b 100644 --- a/bud/get.bash +++ b/bud/get.bash @@ -1 +1 @@ -nix flake new -t "github:divnix/devos/master" "${2:-devos}" +nix flake new -t "github:divnix/devos/main" "${2:-devos}" diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 2b5241a..86f5dd7 100644 --- a/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -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 diff --git a/doc/concepts/profiles.md b/doc/concepts/profiles.md index 36e423f..7e592cc 100644 --- a/doc/concepts/profiles.md +++ b/doc/concepts/profiles.md @@ -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 diff --git a/doc/concepts/users.md b/doc/concepts/users.md index d18d51d..3ab7c39 100644 --- a/doc/concepts/users.md +++ b/doc/concepts/users.md @@ -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 diff --git a/doc/integrations/nvfetcher.md b/doc/integrations/nvfetcher.md index 107a169..c26c5fb 100644 --- a/doc/integrations/nvfetcher.md +++ b/doc/integrations/nvfetcher.md @@ -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 diff --git a/doc/start/index.md b/doc/start/index.md index ed1a114..2cd14d9 100644 --- a/doc/start/index.md +++ b/doc/start/index.md @@ -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 diff --git a/doc/tests.md b/doc/tests.md index 6a62c72..4844912 100644 --- a/doc/tests.md +++ b/doc/tests.md @@ -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