Merge branch 'main' into feature/basic-iso
This commit is contained in:
commit
09371808ae
|
@ -22,6 +22,7 @@ steps:
|
||||||
- git checkout -b devos --track origin/devos
|
- git checkout -b devos --track origin/devos
|
||||||
- git merge -X theirs devos/main
|
- git merge -X theirs devos/main
|
||||||
- git push origin devos
|
- git push origin devos
|
||||||
|
- git remote set-url origin https://git.b12f.io/pub-solar/os.git
|
||||||
|
|
||||||
- name: "Sync $BRANCH with upstream"
|
- name: "Sync $BRANCH with upstream"
|
||||||
image: alpine/git
|
image: alpine/git
|
||||||
|
|
|
@ -4,11 +4,6 @@ let
|
||||||
cfg = config.pub-solar.x-os;
|
cfg = config.pub-solar.x-os;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.pub-solar.x-os.iso-options.enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Feature flag for iso builds";
|
|
||||||
};
|
|
||||||
config = {
|
config = {
|
||||||
# Enable plymouth for better experience of booting
|
# Enable plymouth for better experience of booting
|
||||||
boot.plymouth.enable = true;
|
boot.plymouth.enable = true;
|
||||||
|
|
Loading…
Reference in a new issue