worbling...

dibbler/menus/helpermenus.py

@@ -645,7 +645,7 @@ class ConfirmMenu(Menu):
         options = {True: "[Y/n]", False: "[y/N]", None: "[y/n]"}[self.default]
         while True:
             result = self.input_str(
-                f"{self.prompt} {options}",
+                f"{self.prompt} ({options})",
                 end_prompt=": ",
                 timeout=self.timeout,
             )

nix/module.nix

@@ -1,8 +1,16 @@
-{ config, pkgs, lib, ... }: let
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
   cfg = config.services.dibbler;
+  worbleCfg = config.services.worblehat;
 
   format = pkgs.formats.toml { };
-in {
+in
+{
   options.services.dibbler = {
     enable = lib.mkEnableOption "dibbler, the little kiosk computer";
 
@@ -56,7 +64,8 @@ in {
     };
   };
 
-  config = lib.mkIf cfg.enable (lib.mkMerge [
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
       {
         services.dibbler.settings = lib.pipe ../example-config.toml [
           builtins.readFile
@@ -65,7 +74,10 @@ in {
         ];
       }
       {
-      environment.systemPackages = [ cfg.package ];
+        environment.systemPackages = [
+          cfg.package
+          worbleCfg.package
+        ];
 
         environment.etc."dibbler/dibbler.toml".source = format.generate "dibbler.toml" cfg.settings;
 
@@ -84,11 +96,13 @@ in {
 
         services.postgresql = lib.mkIf cfg.createLocalDatabase {
           ensureDatabases = [ "dibbler" ];
-        ensureUsers = [{
+          ensureUsers = [
+            {
               name = "dibbler";
               ensureDBOwnership = true;
               ensureClauses.login = true;
-        }];
+            }
+          ];
         };
 
         systemd.services.dibbler-setup-database = lib.mkIf cfg.createLocalDatabase {
@@ -114,10 +128,11 @@ in {
           "console=tty1"
         ];
 
-
         users.users.dibbler = {
           extraGroups = [ "lp" ];
-        shell = (pkgs.writeShellScriptBin "login-shell" "${lib.getExe' cfg.screenPackage "screen"} -x dibbler") // {
+          shell =
+            (pkgs.writeShellScriptBin "login-shell" "${lib.getExe' cfg.screenPackage "screen"} -x dibbler")
+            // {
               shellPath = "/bin/login-shell";
             };
         };
@@ -132,10 +147,14 @@ in {
           wantedBy = [
             "default.target"
           ];
-        after = if cfg.createLocalDatabase then [
+          after =
+            if cfg.createLocalDatabase then
+              [
                 "postgresql.service"
                 "dibbler-setup-database.service"
-        ] else [
+              ]
+            else
+              [
                 "network.target"
               ];
           serviceConfig = {
@@ -149,7 +168,8 @@ in {
             Group = "dibbler";
 
             ExecStartPre = "-${lib.getExe' cfg.screenPackage "screen"} -X -S dibbler kill";
-          ExecStart = let
+            ExecStart =
+              let
                 screenArgs = lib.escapeShellArgs [
                   # -dm creates the screen in detached mode without accessing it
                   "-dm"
@@ -163,24 +183,33 @@ in {
 
                   # Enable login mode, updates utmp entries
                   "-l"
+
+                  # Set window name
+                  "-t"
+                  "dibblerino"
                 ];
 
                 dibblerArgs = lib.cli.toCommandLineShellGNU { } {
                   config = "/etc/dibbler/dibbler.toml";
                 };
 
-          in "${lib.getExe' cfg.screenPackage "screen"} ${screenArgs} ${lib.getExe cfg.package} ${dibblerArgs} loop";
+              in
+              "${lib.getExe' cfg.screenPackage "screen"} ${screenArgs} ${lib.getExe cfg.package} ${dibblerArgs} loop";
             ExecStartPost =
               lib.optionals (cfg.limitScreenWidth != null) [
                 "${lib.getExe' cfg.screenPackage "screen"} -X -S dibbler width ${toString cfg.limitScreenWidth}"
               ]
               ++ lib.optionals (cfg.limitScreenHeight != null) [
                 "${lib.getExe' cfg.screenPackage "screen"} -X -S dibbler height ${toString cfg.limitScreenHeight}"
+              ]
+              ++ [
+                "${lib.getExe' cfg.screenPackage "screen"} -S dibbler -X screen -t worblehat ${lib.getExe worbleCfg.package}"
               ];
           };
         };
 
         services.getty.autologinUser = "dibbler";
       })
-  ]);
+    ]
+  );
 }