Merge remote-tracking branch 'ni/master'

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

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
       }
     '