...

4 files changed, 6 insertions, 5 deletions

diff --git a/accounts/gkleen@skadhi/rzm/default.nix b/accounts/gkleen@skadhi/rzm/default.nix
index ef30278b..124fcc32 100644
--- a/accounts/gkleen@skadhi/rzm/default.nix
+++ b/accounts/gkleen@skadhi/rzm/default.nix
@@ -232,7 +232,7 @@ in {
           User = "git";
           IdentityFile = "~/.ssh/gkleen@gitlab.lrz.de";
         };
-        "vrt-kvm05" = {
+        "Match host vrt-kvm*" = {
           User = "root";
           inherit (config.programs.ssh.autosshProxies."mathw0e") ProxyCommand;
           PasswordAuthentication = "yes";
diff --git a/accounts/gkleen@skadhi/shell/quickshell/BatteryWidget.qml b/accounts/gkleen@skadhi/shell/quickshell/BatteryWidget.qml
index f465fa20..ba9b2f62 100644
--- a/accounts/gkleen@skadhi/shell/quickshell/BatteryWidget.qml
+++ b/accounts/gkleen@skadhi/shell/quickshell/BatteryWidget.qml
@@ -46,11 +46,11 @@ Item {
           if (!root.batteryDevice?.ready)
             return "#555";
 
-          if (root.batteryDevice.state != UPowerDeviceState.FullyCharged && root.batteryDevice.state != UPowerDeviceState.Charging && root.batteryDevice.timeToEmpty < 20 * 60)
+          if (root.batteryDevice.state != UPowerDeviceState.FullyCharged && (root.batteryDevice.state != UPowerDeviceState.PendingCharge || root.batteryDevice.percentage < 0.8) && root.batteryDevice.state != UPowerDeviceState.Charging && root.batteryDevice.timeToEmpty < 20 * 60)
             return "#f2201f";
-          if (root.batteryDevice.state != UPowerDeviceState.FullyCharged && root.batteryDevice.state != UPowerDeviceState.Charging && root.batteryDevice.timeToEmpty < 40 * 60)
+          if (root.batteryDevice.state != UPowerDeviceState.FullyCharged && (root.batteryDevice.state != UPowerDeviceState.PendingCharge || root.batteryDevice.percentage < 0.8) && root.batteryDevice.state != UPowerDeviceState.Charging && root.batteryDevice.timeToEmpty < 40 * 60)
             return "#f28a21";
-          if (root.batteryDevice.state != UPowerDeviceState.FullyCharged)
+          if (root.batteryDevice.state != UPowerDeviceState.FullyCharged && (root.batteryDevice.state != UPowerDeviceState.PendingCharge || root.batteryDevice.percentage < 0.8))
             return "#fff";
           return "#555";
         }
diff --git a/hosts/surtr/vpn/default.nix b/hosts/surtr/vpn/default.nix
index 92223144..1ebcc760 100644
--- a/hosts/surtr/vpn/default.nix
+++ b/hosts/surtr/vpn/default.nix
@@ -90,7 +90,7 @@ in {
               wireguardPeers = imap1 (i: { name, ip ? i }: {
                 AllowedIPs = ["${prefix6}:${toString ip}::/96" "${prefix4}.${toString ip}/32"];
                 PublicKey = trim (readFile (./. + "/${name}.pub"));
-              }) [ { name = "geri"; } { name = "sif"; } ];
+              }) [ { name = "geri"; } { name = "sif"; } { name = "skadhi"; } ];
             };
           };
 
diff --git a/hosts/surtr/vpn/skadhi.pub b/hosts/surtr/vpn/skadhi.pub
new file mode 100644
index 00000000..045952c5
--- /dev/null
+++ b/hosts/surtr/vpn/skadhi.pub
@@ -0,0 +1 @@
+rrKm3gvBtFK6WB5A6FCpQ+w6/0aOuvsBDNQLFW7s9jQ=