diff --git a/container/webserver/config.nix b/container/webserver/config.nix
index c29058a..8c6184e 100644
--- a/container/webserver/config.nix
+++ b/container/webserver/config.nix
@@ -8,6 +8,7 @@
     "d /etc/container-matrix/telegram 0775 1337 1337"
     "d /etc/container-matrix/signald 0775 0 0"
     "d /etc/container-matrix/signal 0775 1337 1337"
+    "d /etc/container-matrix/whatsapp 0775 1337 1337"
   ];
 
   # mosquitto
@@ -124,4 +125,13 @@
     uid = 1337;
     gid = 1337;
   };
+
+  # Matrix: WhatsApp
+
+  environment.etc."container-matrix/whatsapp/config.yaml" = {
+    source = ../../secret/container/webserver/config/matrix/whatsapp.yaml;
+    mode = "0640";
+    uid = 1337;
+    gid = 1337;
+  };
 }
diff --git a/container/webserver/default.nix b/container/webserver/default.nix
index 3670bb2..9ec0064 100644
--- a/container/webserver/default.nix
+++ b/container/webserver/default.nix
@@ -149,6 +149,7 @@ in
             "/etc/container-matrix/synapse:/data"
             "/etc/container-matrix/telegram:/bridge-data/telegram:ro"
             "/etc/container-matrix/signal:/bridge-data/signal:ro"
+            "/etc/container-matrix/whatsapp:/bridge-data/whatsapp:ro"
           ];
           labels = {
             "traefik.enable" = "true";
@@ -220,6 +221,25 @@ in
           };
         };
       };
+
+      matrix-whatsapp = {
+        service = {
+          image = "dock.mau.dev/mautrix/whatsapp:latest";
+          container_name = "mautrix-whatsapp";
+          restart = "unless-stopped";
+          depends_on = [
+            "ipv6nat"
+            "synapse"
+          ];
+          networks = [ "webserver" ];
+          volumes = [
+            "/etc/container-matrix/whatsapp:/data"
+          ];
+          labels = {
+            "com.centurylinklabs.watchtower.enable" = "true";
+          };
+        };
+      };
     };
 
     networks.webserver = {
diff --git a/flake.lock b/flake.lock
index eef2bb6..0db8aa0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -102,11 +102,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1668132986,
-        "narHash": "sha256-X/I/vGlFc+p0HSFNYtevhkbarOOtX6nY0r1Ovz9l2ak=",
+        "lastModified": 1668227356,
+        "narHash": "sha256-nyxyw2kRLYDSK6vBrwFRvvHxnPAxBxsk2lZt18W0Bcw=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "ae67706535b23233d2d6f5a81b7c7284c3cc16f9",
+        "rev": "7335a67b5754255f0e892303a0f4e3521035e7d8",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1668154750,
-        "narHash": "sha256-5ccSEcgeijP9hJnAsGWx8Wz6n3EdH/8vpKR66kel+W0=",
+        "lastModified": 1668241004,
+        "narHash": "sha256-UFoUcSt8N9uPH+z6IVSHtLNuPED0YFdRMhIFO0VPDRM=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "9bc0f832263b4190f1b9e329a4c312f0af494376",
+        "rev": "cdbbeff65ac3d02bdbfea43fe48c155941fdfb8b",
         "type": "github"
       },
       "original": {
@@ -160,11 +160,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1668086072,
-        "narHash": "sha256-msFoXI5ThCmhTTqgl27hpCXWhaeqxphBaleJAgD8JYM=",
+        "lastModified": 1668231603,
+        "narHash": "sha256-/4br947zgRqABb52iLF4DCHgD49Fw5aQ6/IdTwaM95E=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "72d8853228c9758820c39b8659415b6d89279493",
+        "rev": "d8f2c4d846a2e65ad3f5a5e842b672f0b81588a2",
         "type": "github"
       },
       "original": {
diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix
index a9d0fb9..e970702 100644
--- a/home/programs/nvim/plugins.nix
+++ b/home/programs/nvim/plugins.nix
@@ -113,12 +113,12 @@ rec {
   };
   nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-treesitter";
-    version = "2022-11-11";
+    version = "2022-11-12";
     src = pkgs.fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "47bda4171aad2ee990a35ddb6319ceedc4d78b5d";
-      sha256 = "080x8j4crwrnrh4dsnzwvjz3zanmd282ax9z703i7hfavvxrpg5n";
+      rev = "692432df294ef3881f450dc80839e21c978cde28";
+      sha256 = "1lgrfkcdf9rj30rdj7kdifpn5j7hndj61z1qlr2f0ikxs07s6wxc";
       fetchSubmodules = false;
     };
     passthru.withPlugins =
@@ -270,12 +270,12 @@ rec {
   };
   vim-illuminate = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "vim-illuminate";
-    version = "2022-11-02";
+    version = "2022-11-11";
     src = pkgs.fetchFromGitHub {
       owner = "RRethy";
       repo = "vim-illuminate";
-      rev = "fb83d835eac50baeef49aac20c524a80727db0ac";
-      sha256 = "0xk5hhsb3gv3yrfcr3gnxj9g9bcdab8nlfi06q5c7nqgy4fryp6n";
+      rev = "a6d0b28ea7d6b9d139374be1f94a16bd120fcda3";
+      sha256 = "0wby253z3njala4syizy3m463gi8l45gcf7rj866r2jhnfxg9ba8";
       fetchSubmodules = false;
     };
   };
@@ -325,12 +325,12 @@ rec {
   };
   nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "nvim-cmp";
-    version = "2022-11-11";
+    version = "2022-11-12";
     src = pkgs.fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-cmp";
-      rev = "69c85860d7c3b39e1be3881702e13a8440cd33fc";
-      sha256 = "1pj1q04lr7mqkrcl60pymj6i2ypxn4yqczwnjind0kn263wfihx8";
+      rev = "c53dd36adcf512611fa7c523fced55447bfdbfa5";
+      sha256 = "05kgrqllfd3qd0mhqy99p3k5ikbkxpx05jr5fkxn8wv37w35pvy6";
       fetchSubmodules = false;
     };
   };
@@ -435,12 +435,12 @@ rec {
   };
   neoformat = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2022-11-05";
+    version = "2022-11-12";
     src = pkgs.fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "bb32035068b66004f79933ff09edeac273d38c1a";
-      sha256 = "1c98y3z9ik1vzydkx2cyn7rvm4smp2i8qjxjpksxcxpf9zk7xrc7";
+      rev = "1f79f6e6b2a1e2b3ace87d4760769feb4146ff35";
+      sha256 = "02vik8gfqncxjhr065sr9bw7fd9lhbwkjjkzn2j9p7y2gw0yjcis";
       fetchSubmodules = false;
     };
   };
diff --git a/secret/container/webserver/config/matrix/homeserver.yaml b/secret/container/webserver/config/matrix/homeserver.yaml
index a44a327..8b3164c 100644
Binary files a/secret/container/webserver/config/matrix/homeserver.yaml and b/secret/container/webserver/config/matrix/homeserver.yaml differ
diff --git a/secret/container/webserver/config/matrix/signal.yaml b/secret/container/webserver/config/matrix/signal.yaml
index 4b977b0..6faf8bb 100644
Binary files a/secret/container/webserver/config/matrix/signal.yaml and b/secret/container/webserver/config/matrix/signal.yaml differ
diff --git a/secret/container/webserver/config/matrix/telegram.yaml b/secret/container/webserver/config/matrix/telegram.yaml
index 68eade8..a2d9502 100644
Binary files a/secret/container/webserver/config/matrix/telegram.yaml and b/secret/container/webserver/config/matrix/telegram.yaml differ
diff --git a/secret/container/webserver/config/matrix/whatsapp.yaml b/secret/container/webserver/config/matrix/whatsapp.yaml
new file mode 100644
index 0000000..5342f6b
Binary files /dev/null and b/secret/container/webserver/config/matrix/whatsapp.yaml differ