Merge remote-tracking branch 'origin/main' into b12f

.github/workflows/check.yml

@@ -2,7 +2,7 @@ name: "Check & Cachix"
 on:
   push:
     branches:
-      - master
+      - main
       - trying
       - staging
 jobs:

.github/workflows/mdbook_docs.yml

@@ -3,7 +3,7 @@ name: Deploy Docs to GitHub Pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   deploy:

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
-          ref: master
+          ref: main
       - name: Update Changelog
         uses: heinrichreimer/github-changelog-generator-action@v2.1.1
         with:
@@ -49,7 +49,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
         with:
-          ref: master
+          ref: main
 
       - name: Get Changelog Entry
         id: changelog_reader

README.md

@@ -82,7 +82,7 @@ DevOS is licensed under the [MIT License][mit].
 [giants]: https://en.wikipedia.org/wiki/Standing_on_the_shoulders_of_giants
 [home-manager]: https://nix-community.github.io/home-manager
 [mit]: https://mit-license.org
-[mk-flake]: https://github.com/divnix/digga/tree/master/src/mkFlake
+[mk-flake]: https://github.com/divnix/digga/tree/main/src/mkFlake
 [nix]: https://nixos.org/manual/nix/stable
 [nixos]: https://nixos.org/manual/nixos/stable
 [nixpkgs]: https://github.com/NixOS/nixpkgs

doc/start/from-nixos.md

@@ -47,8 +47,5 @@ This calls `nixos-rebuild` with sudo to build and install your configuration.
 > ##### _Notes:_
 > - Instead of `switch`, you can pass `build`, `test`, `boot`, etc just as with
 >   `nixos-rebuild`.
->
+
-> - It is convenient to have the template living at `/etc/nixos` so you can
->   simply `sudo nixos-rebuild switch` from anywhere on the system, but it is
->   not required.