forked from pub-solar/os
Merge remote-tracking branch 'origin/main' into b12f
This commit is contained in:
commit
5a6ec0d6ff
2
.github/workflows/check.yml
vendored
2
.github/workflows/check.yml
vendored
|
@ -2,7 +2,7 @@ name: "Check & Cachix"
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
- trying
|
- trying
|
||||||
- staging
|
- staging
|
||||||
jobs:
|
jobs:
|
||||||
|
|
2
.github/workflows/mdbook_docs.yml
vendored
2
.github/workflows/mdbook_docs.yml
vendored
|
@ -3,7 +3,7 @@ name: Deploy Docs to GitHub Pages
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
|
|
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
|
@ -19,7 +19,7 @@ jobs:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
ref: master
|
ref: main
|
||||||
- name: Update Changelog
|
- name: Update Changelog
|
||||||
uses: heinrichreimer/github-changelog-generator-action@v2.1.1
|
uses: heinrichreimer/github-changelog-generator-action@v2.1.1
|
||||||
with:
|
with:
|
||||||
|
@ -49,7 +49,7 @@ jobs:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
ref: master
|
ref: main
|
||||||
|
|
||||||
- name: Get Changelog Entry
|
- name: Get Changelog Entry
|
||||||
id: changelog_reader
|
id: changelog_reader
|
||||||
|
|
|
@ -82,7 +82,7 @@ DevOS is licensed under the [MIT License][mit].
|
||||||
[giants]: https://en.wikipedia.org/wiki/Standing_on_the_shoulders_of_giants
|
[giants]: https://en.wikipedia.org/wiki/Standing_on_the_shoulders_of_giants
|
||||||
[home-manager]: https://nix-community.github.io/home-manager
|
[home-manager]: https://nix-community.github.io/home-manager
|
||||||
[mit]: https://mit-license.org
|
[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
|
[nix]: https://nixos.org/manual/nix/stable
|
||||||
[nixos]: https://nixos.org/manual/nixos/stable
|
[nixos]: https://nixos.org/manual/nixos/stable
|
||||||
[nixpkgs]: https://github.com/NixOS/nixpkgs
|
[nixpkgs]: https://github.com/NixOS/nixpkgs
|
||||||
|
|
|
@ -47,8 +47,5 @@ This calls `nixos-rebuild` with sudo to build and install your configuration.
|
||||||
> ##### _Notes:_
|
> ##### _Notes:_
|
||||||
> - Instead of `switch`, you can pass `build`, `test`, `boot`, etc just as with
|
> - Instead of `switch`, you can pass `build`, `test`, `boot`, etc just as with
|
||||||
> `nixos-rebuild`.
|
> `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.
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue