fix type stuff for cli args

This commit is contained in:
Vegard Bieker Matthey
2026-03-17 15:55:21 +01:00
parent 98e3e316c4
commit 2c85161654

View File

@@ -82,6 +82,7 @@ in
}; };
config = lib.mkIf cfg.enable ( config = lib.mkIf cfg.enable (
lib.mkMerge [
{ {
environment.systemPackages = [ environment.systemPackages = [
cfg.dibblerPackage cfg.dibblerPackage
@@ -156,8 +157,7 @@ in
}; };
} }
( (lib.mkIf cfg.kioskMode {
lib.mkIf cfg.kioskMode {
boot.kernelParams = [ boot.kernelParams = [
"console=tty1" "console=tty1"
]; ];
@@ -171,7 +171,12 @@ in
}; };
}; };
services.drumknotty.settings.general = { services.drumknotty.dibblerSettings.general = {
quit_allowed = false;
stop_allowed = false;
};
services.drumknotty.worblehatSettings.general = {
quit_allowed = false; quit_allowed = false;
stop_allowed = false; stop_allowed = false;
}; };
@@ -237,8 +242,9 @@ in
in in
"${lib.getExe' cfg.screenPackage "screen"} ${screenArgs} ${lib.getExe cfg.dibblerPackage} ${dibblerArgs} loop"; "${lib.getExe' cfg.screenPackage "screen"} ${screenArgs} ${lib.getExe cfg.dibblerPackage} ${dibblerArgs} loop";
ExecStartPost = ExecStartPost = [
"${lib.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} -t worblehat ${lib.getExe cfg.worblehatPackage} ${worblehatArgs} cli" "${lib.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} -t worblehat ${lib.getExe cfg.worblehatPackage} ${worblehatArgs} cli"
]
++ lib.optionals (cfg.limitScreenWidth != null) [ ++ lib.optionals (cfg.limitScreenWidth != null) [
"${lib.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} width ${toString cfg.limitScreenWidth}" "${lib.getExe' cfg.screenPackage "screen"} -X -S ${cfg.screenSessionName} width ${toString cfg.limitScreenWidth}"
] ]
@@ -249,7 +255,7 @@ in
}; };
services.getty.autologinUser = "drumknotty"; services.getty.autologinUser = "drumknotty";
} })
) ]
); );
} }