Merge branch 'main' into teutat3s

.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

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}"

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 

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

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.
 

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

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

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
 

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

flake.lock

@@ -30,11 +30,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1627571355,
-        "narHash": "sha256-iB+s0R/d/bBISo9+JtyytNtS2YMP5oLFqcyfqhXO1qU=",
+        "lastModified": 1630693543,
+        "narHash": "sha256-7Sly3ReaJZw60Qo0rpfN4jF6zy94nwQz6ENgUUFzJfg=",
         "owner": "lovesegfault",
         "repo": "beautysh",
-        "rev": "1ad178d756f1f7e77d5215b768bc5c9d4ff8e4fa",
+        "rev": "5609593961b70428f58d5c1b4b25cdda43b0d0bd",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1630939671,
-        "narHash": "sha256-ugNOm7DUHk9kxtD+FNZcRdzyiZKm/wpA0SYeBTg+DO4=",
+        "lastModified": 1633373878,
+        "narHash": "sha256-9+ziZ8l6rq3yXyY6B0wYXrVdfxr6cdpEbPEGRHywBKc=",
         "owner": "divnix",
         "repo": "bud",
-        "rev": "26ba27616647dcd08dac2ee818721bc748c4ac61",
+        "rev": "4e709a2fcf19df500ba87d9c3b1b1481401cd53b",
         "type": "github"
       },
       "original": {