home: wait for Internet for mopidy, vesktop
This commit is contained in:
parent
293152df13
commit
fbda7137a9
@ -9,6 +9,14 @@ let
|
|||||||
vesktop-ozone-cmd = let
|
vesktop-ozone-cmd = let
|
||||||
extraFlags = lib.optionalString config.nixfiles.workarounds.nvidiaPrimary " --disable-gpu";
|
extraFlags = lib.optionalString config.nixfiles.workarounds.nvidiaPrimary " --disable-gpu";
|
||||||
in "env NIXOS_OZONE_WL=1 vesktop${extraFlags}";
|
in "env NIXOS_OZONE_WL=1 vesktop${extraFlags}";
|
||||||
|
|
||||||
|
waitNet = pkgs.writeShellScript "wait-network" ''
|
||||||
|
until ${pkgs.curl}/bin/curl -fs https://www.google.com &>/dev/null; do
|
||||||
|
sleep 5
|
||||||
|
((counter++)) && ((counter>=60)) && break
|
||||||
|
done
|
||||||
|
exec "$@"
|
||||||
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.nixfiles.packageSets.communication = {
|
options.nixfiles.packageSets.communication = {
|
||||||
@ -30,7 +38,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
nixfiles.common.wm.autostart = lib.optionals config.nixfiles.meta.graphical [
|
nixfiles.common.wm.autostart = lib.optionals config.nixfiles.meta.graphical [
|
||||||
(vesktop-ozone-cmd + " --start-minimized")
|
(waitNet + " " + vesktop-ozone-cmd + " --start-minimized")
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = with pkgs; lib.optionals config.nixfiles.meta.graphical [
|
home.packages = with pkgs; lib.optionals config.nixfiles.meta.graphical [
|
||||||
|
@ -10,6 +10,13 @@ in
|
|||||||
systemd.user.services = lib.mkIf config.services.mopidy.enable {
|
systemd.user.services = lib.mkIf config.services.mopidy.enable {
|
||||||
mopidy.Service = {
|
mopidy.Service = {
|
||||||
TimeoutStopSec = lib.mkDefault 10;
|
TimeoutStopSec = lib.mkDefault 10;
|
||||||
|
ExecStartPre = pkgs.writeShellScript "mopidy-wait-net" ''
|
||||||
|
until ${pkgs.curl}/bin/curl -fs https://www.google.com &>/dev/null ; do
|
||||||
|
sleep 5
|
||||||
|
((counter++)) && ((counter==60)) && break
|
||||||
|
done || true
|
||||||
|
# don't know why i need a true here
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user