diff options
| author | lassulus <git@lassul.us> | 2023-05-02 20:43:53 +0200 |
|---|---|---|
| committer | lassulus <git@lassul.us> | 2023-05-02 20:43:53 +0200 |
| commit | 6772b8b3a4f86eaef7e7df259e211aff3b22d876 (patch) | |
| tree | 6794f00e130268e8d88af2c02ba481226f757426 | |
| parent | 40345c34bf6ff873e89e12ec66927cc5ec996d93 (diff) | |
| parent | b60be1128bf5525cf78b9b57afd19e001cd5a9d3 (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | krebs/3modules/konsens.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/simple/q-power_supply.nix | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/krebs/3modules/konsens.nix b/krebs/3modules/konsens.nix index 439bcc7f4..d27a702fb 100644 --- a/krebs/3modules/konsens.nix +++ b/krebs/3modules/konsens.nix @@ -66,6 +66,8 @@ let Type = "simple"; PermissionsStartOnly = true; ExecStart = pkgs.writeDash "konsens-${name}" '' + set -efu + git config --global --replace-all safe.directory * if ! test -e ${name}; then git clone ${repo.url} ${name} fi diff --git a/krebs/5pkgs/simple/q-power_supply.nix b/krebs/5pkgs/simple/q-power_supply.nix index 627e3f905..ef133bfbd 100644 --- a/krebs/5pkgs/simple/q-power_supply.nix +++ b/krebs/5pkgs/simple/q-power_supply.nix @@ -63,6 +63,7 @@ writeDashBin "q-power_supply" '' END { name = ENVIRON["POWER_SUPPLY_NAME"] + status = ENVIRON["POWER_SUPPLY_STATUS"] charge_unit = "Ah" charge_now = ENVIRON["POWER_SUPPLY_CHARGE_NOW"] / 10^6 @@ -132,6 +133,8 @@ writeDashBin "q-power_supply" '' out = out sprintf(" %s", print_hm(charge_now / current_now)) } + out = out " " status + print out } ' |