forked from colin/nix-files
Compare commits
2 Commits
patch-gite
...
tx-to-desk
Author | SHA1 | Date | |
---|---|---|---|
24ff2feb70 | |||
21c033f63c |
19
flake.nix
19
flake.nix
@@ -325,6 +325,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
deploy = {
|
deploy = {
|
||||||
|
crappy = deployApp "crappy" "crappy" "switch";
|
||||||
|
crappy-light = deployApp "crappy-light" "crappy" "switch";
|
||||||
|
crappy-min = deployApp "crappy-min" "crappy" "switch";
|
||||||
desko = deployApp "desko" "desko" "switch";
|
desko = deployApp "desko" "desko" "switch";
|
||||||
desko-light = deployApp "desko-light" "desko" "switch";
|
desko-light = deployApp "desko-light" "desko" "switch";
|
||||||
lappy = deployApp "lappy" "lappy" "switch";
|
lappy = deployApp "lappy" "lappy" "switch";
|
||||||
@@ -347,10 +350,14 @@
|
|||||||
nix run '.#deploy.moby'
|
nix run '.#deploy.moby'
|
||||||
nix run '.#deploy.desko'
|
nix run '.#deploy.desko'
|
||||||
nix run '.#deploy.servo'
|
nix run '.#deploy.servo'
|
||||||
|
nix run '.#deploy.crappy'
|
||||||
'');
|
'');
|
||||||
};
|
};
|
||||||
preDeploy = {
|
preDeploy = {
|
||||||
# build the host and copy the runtime closure to that host, but don't activate it.
|
# build the host and copy the runtime closure to that host, but don't activate it.
|
||||||
|
crappy = deployApp "crappy" "crappy" null;
|
||||||
|
crappy-light = deployApp "crappy-light" "crappy" null;
|
||||||
|
crappy-min = deployApp "crappy-min" "crappy" null;
|
||||||
desko = deployApp "desko" "desko" null;
|
desko = deployApp "desko" "desko" null;
|
||||||
desko-light = deployApp "desko-light" "desko" null;
|
desko-light = deployApp "desko-light" "desko" null;
|
||||||
lappy = deployApp "lappy" "lappy" null;
|
lappy = deployApp "lappy" "lappy" null;
|
||||||
@@ -365,13 +372,16 @@
|
|||||||
# copy the -min/-light variants first; this might be run while waiting on a full build. or the full build failed.
|
# copy the -min/-light variants first; this might be run while waiting on a full build. or the full build failed.
|
||||||
nix run '.#preDeploy.moby-min' -- "$@"
|
nix run '.#preDeploy.moby-min' -- "$@"
|
||||||
nix run '.#preDeploy.lappy-min' -- "$@"
|
nix run '.#preDeploy.lappy-min' -- "$@"
|
||||||
|
nix run '.#preDeploy.crappy-min' -- "$@"
|
||||||
nix run '.#preDeploy.moby-light' -- "$@"
|
nix run '.#preDeploy.moby-light' -- "$@"
|
||||||
nix run '.#preDeploy.lappy-light' -- "$@"
|
nix run '.#preDeploy.lappy-light' -- "$@"
|
||||||
nix run '.#preDeploy.desko-light' -- "$@"
|
nix run '.#preDeploy.desko-light' -- "$@"
|
||||||
|
nix run '.#preDeploy.crappy-light' -- "$@"
|
||||||
nix run '.#preDeploy.lappy' -- "$@"
|
nix run '.#preDeploy.lappy' -- "$@"
|
||||||
nix run '.#preDeploy.servo' -- "$@"
|
nix run '.#preDeploy.servo' -- "$@"
|
||||||
nix run '.#preDeploy.moby' -- "$@"
|
nix run '.#preDeploy.moby' -- "$@"
|
||||||
nix run '.#preDeploy.desko' -- "$@"
|
nix run '.#preDeploy.desko' -- "$@"
|
||||||
|
nix run '.#preDeploy.crappy' -- "$@"
|
||||||
'');
|
'');
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -475,41 +485,48 @@
|
|||||||
# this gives me a minimal image i can deploy or copy over, early.
|
# this gives me a minimal image i can deploy or copy over, early.
|
||||||
${checkHost "lappy-min"}
|
${checkHost "lappy-min"}
|
||||||
${checkHost "moby-min"}
|
${checkHost "moby-min"}
|
||||||
|
${checkHost "crappy-min"}
|
||||||
|
|
||||||
${checkHost "desko-light"}
|
${checkHost "desko-light"}
|
||||||
${checkHost "moby-light"}
|
${checkHost "moby-light"}
|
||||||
${checkHost "lappy-light"}
|
${checkHost "lappy-light"}
|
||||||
|
${checkHost "crappy-light"}
|
||||||
|
|
||||||
${checkHost "desko"}
|
${checkHost "desko"}
|
||||||
${checkHost "lappy"}
|
${checkHost "lappy"}
|
||||||
${checkHost "servo"}
|
${checkHost "servo"}
|
||||||
${checkHost "moby"}
|
${checkHost "moby"}
|
||||||
|
${checkHost "crappy"}
|
||||||
${checkHost "rescue"}
|
${checkHost "rescue"}
|
||||||
|
|
||||||
# still want to build the -light variants first so as to avoid multiple simultaneous webkitgtk builds
|
# still want to build the -light variants first so as to avoid multiple simultaneous webkitgtk builds
|
||||||
${checkHost "desko-light-next"}
|
${checkHost "desko-light-next"}
|
||||||
${checkHost "moby-light-next"}
|
${checkHost "moby-light-next"}
|
||||||
|
${checkHost "crappy-light-next"}
|
||||||
|
|
||||||
${checkHost "desko-next"}
|
${checkHost "desko-next"}
|
||||||
${checkHost "lappy-next"}
|
${checkHost "lappy-next"}
|
||||||
${checkHost "servo-next"}
|
${checkHost "servo-next"}
|
||||||
${checkHost "moby-next"}
|
${checkHost "moby-next"}
|
||||||
|
${checkHost "crappy-next"}
|
||||||
${checkHost "rescue-next"}
|
${checkHost "rescue-next"}
|
||||||
|
|
||||||
echo "desko: $RC_desko"
|
echo "desko: $RC_desko"
|
||||||
echo "lappy: $RC_lappy"
|
echo "lappy: $RC_lappy"
|
||||||
echo "servo: $RC_servo"
|
echo "servo: $RC_servo"
|
||||||
echo "moby: $RC_moby"
|
echo "moby: $RC_moby"
|
||||||
|
echo "crappy: $RC_crappy"
|
||||||
echo "rescue: $RC_rescue"
|
echo "rescue: $RC_rescue"
|
||||||
|
|
||||||
echo "desko-next: $RC_desko_next"
|
echo "desko-next: $RC_desko_next"
|
||||||
echo "lappy-next: $RC_lappy_next"
|
echo "lappy-next: $RC_lappy_next"
|
||||||
echo "servo-next: $RC_servo_next"
|
echo "servo-next: $RC_servo_next"
|
||||||
echo "moby-next: $RC_moby_next"
|
echo "moby-next: $RC_moby_next"
|
||||||
|
echo "crappy-next: $RC_crappy_next"
|
||||||
echo "rescue-next: $RC_rescue_next"
|
echo "rescue-next: $RC_rescue_next"
|
||||||
|
|
||||||
# i don't really care if the -next hosts fail. i build them mostly to keep the cache fresh/ready
|
# i don't really care if the -next hosts fail. i build them mostly to keep the cache fresh/ready
|
||||||
exit $(($RC_desko | $RC_lappy | $RC_servo | $RC_moby | $RC_rescue))
|
exit $(($RC_desko | $RC_lappy | $RC_servo | $RC_moby | $RC_crappy | $RC_rescue))
|
||||||
''
|
''
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@@ -63,6 +63,9 @@ let
|
|||||||
CONFIG_DMIID=y
|
CONFIG_DMIID=y
|
||||||
CONFIG_MODULE_COMPRESS_ZSTD=y
|
CONFIG_MODULE_COMPRESS_ZSTD=y
|
||||||
|
|
||||||
|
CONFIG_DRM_LIMA=y
|
||||||
|
CONFIG_DRM_MALI_DISPLAY=m
|
||||||
|
|
||||||
#
|
#
|
||||||
# Extra sane-specific options
|
# Extra sane-specific options
|
||||||
#
|
#
|
||||||
|
Reference in New Issue
Block a user