b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/basic-iso

Browse source
This commit is contained in:
teutat3s 2021-10-26 01:00:30 +02:00
parent 74241b459e 6475e7563f
commit 09371808ae
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.drone.yml
View file

@ -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

5
modules/x-os/boot.nix
View file

@ -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;