diff --git a/hosts/desktop/monitors.nix b/hosts/desktop/monitors.nix
index 827b040..b18b2af 100644
--- a/hosts/desktop/monitors.nix
+++ b/hosts/desktop/monitors.nix
@@ -1,7 +1,7 @@
 _: {
   monitors = [
     {
-      name = "DP-2";
+      name = "DP-3";
       resolution = {
         width = 2560;
         height = 1440;
@@ -14,7 +14,7 @@ _: {
       };
     }
     {
-      name = "DP-3";
+      name = "DP-2";
       resolution = {
         width = 2560;
         height = 1440;
diff --git a/justfile b/justfile
index f681c54..9dc4a9a 100644
--- a/justfile
+++ b/justfile
@@ -39,6 +39,7 @@ switch hostname=`hostname -s` target='':
     else
         {{ nixcmd }} run nixpkgs#nixos-rebuild -- switch \
             --flake .#{{ hostname }} \
+            --use-substitutes \
             --target-host {{ target }} \
             --sudo
     fi
diff --git a/modules/homelab/home-assistant.nix b/modules/homelab/home-assistant.nix
index 0fea1ab..d363afd 100644
--- a/modules/homelab/home-assistant.nix
+++ b/modules/homelab/home-assistant.nix
@@ -79,6 +79,36 @@ in {
             hash = "sha256-W9xO3JjnRKHk/dlXMA6y5nEJl/KsGzPvJoumGw+nohw=";
           };
         })
+        (pkgs.buildHomeAssistantComponent rec {
+          owner = "snicker";
+          domain = "zwift";
+          version = "v3.3.5";
+          src = pkgs.fetchFromGitHub {
+            inherit owner;
+            repo = "zwift_hass";
+            rev = version;
+            hash = "sha256-+lJ6Otp8lT+xVtjiQLSQrqT5cVinRTRPTzS+HB1AxB0=";
+          };
+          propagatedBuildInputs = [
+            (pkgs.python313.pkgs.buildPythonPackage rec {
+              pname = "zwift-client";
+              version = "0.2.0";
+              pyproject = true;
+              src = pkgs.fetchFromGitHub {
+                owner = "nickolaj-jepsen";
+                repo = "zwift-client";
+                rev = "882fb881f1271dc104fd0250cab4ceb6e3710a59";
+                hash = "sha256-4gOlWG+QVwODlIhiNH7rhiD0rzNv2WxY2ty9o/51eHU=";
+              };
+              doCheck = false;
+              propagatedBuildInputs = with pkgs.python313.pkgs; [
+                hatchling
+                requests
+                protobuf
+              ];
+            })
+          ];
+        })
       ];
       extraComponents = [
         "default_config"
@@ -110,8 +140,14 @@ in {
             "127.0.0.1"
             "::1"
           ];
-          # base_url = "https://ha.nickolaj.com";
         };
+        sensor = [
+          {
+            platform = "zwift";
+            username = "!secret zwift_username";
+            password = "!secret zwift_password";
+          }
+        ];
 
         automation = "!include automations.yaml";
         script = "!include scripts.yaml";
diff --git a/modules/homelab/sso.nix b/modules/homelab/sso.nix
index f4927f5..032dacd 100644
--- a/modules/homelab/sso.nix
+++ b/modules/homelab/sso.nix
@@ -108,4 +108,9 @@ in {
       cookie-domain = ".${rootDomain}";
     };
   };
+
+  systemd.services.oauth2-proxy.serviceConfig = {
+    Restart = "always";
+    RestartSec = "5s";
+  };
 })
diff --git a/modules/programs/opencode.nix b/modules/programs/opencode.nix
index 5cdbe6f..45f8704 100644
--- a/modules/programs/opencode.nix
+++ b/modules/programs/opencode.nix
@@ -7,8 +7,8 @@
 }: {
   config = lib.mkIf config.fireproof.dev.enable {
     environment.systemPackages = with inputs.opencode.packages.${pkgs.stdenv.hostPlatform.system}; [
-      opencode
-      desktop
+      # opencode
+      # desktop
     ];
   };
 }
diff --git a/secrets/hosts/homelab/.rekey/1e5aaf1fb1cd9e147d47728d2b7a59ac-hassSecrets.age b/secrets/hosts/homelab/.rekey/1e5aaf1fb1cd9e147d47728d2b7a59ac-hassSecrets.age
new file mode 100644
index 0000000..2a2ba6f
Binary files /dev/null and b/secrets/hosts/homelab/.rekey/1e5aaf1fb1cd9e147d47728d2b7a59ac-hassSecrets.age differ
diff --git a/secrets/hosts/homelab/.rekey/89aac8fd4d365506669c2d35e6d3abc5-hassSecrets.age b/secrets/hosts/homelab/.rekey/89aac8fd4d365506669c2d35e6d3abc5-hassSecrets.age
deleted file mode 100644
index 79e50f8..0000000
--- a/secrets/hosts/homelab/.rekey/89aac8fd4d365506669c2d35e6d3abc5-hassSecrets.age
+++ /dev/null
@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 uxq+Zw reTHDLwj8jaI7giq5hw77+cvVurKP2vR8KeonjAJ+nY
-Pe6Df2WQawEnCp5GVCzegzEJaK868bhwZm2hEEwAc/I
--> 6`Rk-grease K=O ttrh.^ [o4vdGR
-9xDUT+18cwMzzTgWlQzWBAniL9GAv+e4rmhwu3Vdwdh/mBeXJdfgEMxTqyRZk9TX
-BSW+CifV9iGZXmYm9b+NzKwWJUQ
---- /NXPE/9QIghJoaXFNtmPMvs78dD2RdXbDWiBnwgXIzo
-����e���r��12�G��� �[�sM[#�ԝ��,��I<���*~a��Y�vYX��OQ��K�:�#g&:��m�H���K�Ƿ
�EZ�-��pj����!�]
\ No newline at end of file
diff --git a/secrets/hosts/homelab/hass.yaml.age b/secrets/hosts/homelab/hass.yaml.age
index 8bb8ad4..dc704fa 100644
Binary files a/secrets/hosts/homelab/hass.yaml.age and b/secrets/hosts/homelab/hass.yaml.age differ