Too much stuff

hosts/hs/default.nix

@@ -248,6 +248,15 @@
             proxyPass = "http://192.168.1.71:80";
           };
         };
+
+        "wstunnel.ccr.ydns.eu" = {
+          enableACME = true;
+          addSSL = true;
+          locations."/" = {
+            proxyPass = "http://localhost:8080";
+            proxyWebsockets = true;
+          };
+        };
       };
     };
   };
@@ -275,6 +284,17 @@
     };
   };
 
+  systemd.services.wstunnel = {
+    description = "WSTunnel";
+    wantedBy = ["multi-user.target"];
+    after = ["network.target"];
+    serviceConfig = {
+      User = "root";
+      Type = "oneshot";
+      ExecStart = "${pkgs.wstunnel}/bin/wstunnel wstunnel --server ws://0.0.0.0:8080";
+    };
+  };
+
   # TODO It seems to not work
   systemd.timers.ydnsUpdater = {
     wantedBy = ["timers.target"];

hosts/thinkpad/default.nix

@@ -11,46 +11,48 @@
       ./hardware-configuration.nix
     ]
     ++ fleetModules [
-      "common"
-      "ccr"
-      "fonts"
-      "dbus"
+      "adb"
       "audio"
       "battery"
-      "ssh"
-      "adb"
-      "qmk-udev"
-      "bluetooth"
-      "docker"
-      "transmission"
-      "fprintd"
       "binfmt"
-      "udisks2"
+      "bluetooth"
+      "ccr"
+      "common"
+      "dbus"
+      "docker"
+      "fonts"
+      "fprintd"
       "printing"
+      "qmk-udev"
+      "ssh"
+      "transmission"
+      "udisks2"
+      "xdg"
     ];
 
   ccr = {
     enable = true;
     autologin = true;
     modules = [
-      "shell"
-      "sway"
+      "chrome"
+      "cura"
+      "digikam"
+      "discord"
+      "element"
       "emacs"
-      "mpv"
       "firefox"
-      "qutebrowser"
       "git"
       "gpg"
-      "password-store"
-      "slack"
-      "chrome"
-      "vscode"
-      "element"
-      "udiskie"
-      "discord"
-      "cura"
-      "xdg"
       "helix"
+      "mpv"
+      "password-store"
+      "qutebrowser"
+      "shell"
+      "slack"
+      "sway"
+      "udiskie"
+      "vscode"
+      "xdg"
     ];
     packages = with pkgs; [
       comma