1 files changed, 37 insertions, 26 deletions

diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 2237b708..fd4b4cf4 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -171,6 +171,8 @@ in {
       };
       Unit = {
         StopWhenUnneeded = true;
+        StartLimitInterval = "2s";
+        StartLimitBurst = 25;
       };
     };
     "autossh-socks@proxy.mathw0h:8123" = {
@@ -205,11 +207,6 @@ in {
         StartLimitBurst = 7;
       };
     };
-    swayidle = {
-      Service = {
-        RuntimeDirectory = "swayidle";
-      };
-    };
     psi-notify = {
       Install = {
         WantedBy = ["graphical-session.target"];
@@ -242,7 +239,7 @@ in {
           "-${lib.getExe pkgs.playerctl} -a pause"
           "-${lib.getExe (pkgs.writeShellApplication {
             name = "generate-css";
-            runtimeInputs = with pkgs; [cfg.programs.wpaperd.package jq coreutils imagemagick findutils];
+            runtimeInputs = with pkgs; [cfg.services.wpaperd.package jq coreutils imagemagick findutils];
             text = ''
               declare -A monitors
               monitors=()
@@ -333,26 +330,24 @@ in {
         ExecStopPost = "${pkgs.coreutils}/bin/rm -rfv \"$CACHE_DIRECTORY\"";
       };
     };
-    wpaperd = {
-      Install = {
-        WantedBy = ["graphical-session.target"];
-      };
-      Unit = {
-        After = [ "graphical-session.target" ];
-        PartOf = [ "graphical-session.target" ];
-      };
-      Service = {
-        ExecStart = lib.getExe cfg.programs.wpaperd.package;
-        Type = "simple";
-        Restart = "always";
-        RestartSec = "2s";
-      };
-    };
+    # wpaperd = {
+    #   Install = {
+    #     WantedBy = ["graphical-session.target"];
+    #   };
+    #   Unit = {
+    #     After = [ "graphical-session.target" ];
+    #     PartOf = [ "graphical-session.target" ];
+    #   };
+    #   Service = {
+    #     ExecStart = lib.getExe cfg.services.wpaperd.package;
+    #     Type = "simple";
+    #     Restart = "always";
+    #     RestartSec = "2s";
+    #   };
+    # };
     xembed-sni-proxy = {
       Unit = {
         PartOf = lib.mkForce ["tray.target"];
-        BindsTo = ["xwayland-satellite.service"];
-        After = ["xwayland-satellite.service"];
       };
     };
     poweralertd = {
@@ -385,16 +380,32 @@ in {
       };
       Service = {
         ExecStart = "${config.systemd.package}/lib/systemd/systemd-socket-proxyd --exit-idle-time=60s 127.0.0.1:${toString (port + 1)}";
+        Restart = "always";
+        RestartSec = "23s";
       };
   }) [{ host = "proxy.ssh.math.lmu.de"; port = 8118; } { host = "proxy.vidhar"; port = 8120; } { host = "proxy.mathw0h"; port = 8122; } { host = "proxy.mathw0e"; port = 8124; }]);
   sockets = listToAttrs (map (port: nameValuePair "proxy-to-autossh-socks@${toString port}" {
     Socket = {
       ListenStream = "%I";
+      TriggerLimitIntervalSec = 0;
+      PollLimitIntervalSec = "180s";
+      PollLimitBurst = 6;
     };
     Install = {
       WantedBy = ["default.target"];
     };
-  }) [8118 8120 8122 8124]) // {
+  }) [8118 8122 8124]) // {
+    "proxy-to-autossh-socks@8120" = {
+      Socket = {
+        ListenStream = "%I";
+        TriggerLimitIntervalSec = 0;
+        PollLimitIntervalSec = "2s";
+        PollLimitBurst = 20;
+      };
+      Install = {
+        WantedBy = ["default.target"];
+      };
+    };
     "yt-dlp" = {
       Socket = {
         SocketMode = "0600";
@@ -439,8 +450,8 @@ in {
     tray = {
       Unit = {
         PartOf = [ "graphical-session.target" ];
-        Requires = [ "waybar.service" ];
-        After = [ "graphical-session.target" "waybar.service" ];
+        # Requires = [ "waybar.service" ];
+        After = [ "graphical-session.target" ]; # "waybar.service" ];
         Wants = ["blueman-applet.service" "udiskie.service" "network-manager-applet.service"];
       };
     };