diff --git a/common/home/neovim/langs/default.nix b/common/home/neovim/langs/default.nix
index 166a0235..853d08c2 100644
--- a/common/home/neovim/langs/default.nix
+++ b/common/home/neovim/langs/default.nix
@@ -29,6 +29,22 @@ in {
         lua
         */
         ''
+          -- Get rid of deprecated functions
+          vim.tbl_add_reverse_lookup = function(tbl)
+              for k, v in pairs(tbl) do
+                  tbl[v] = k;
+              end
+          end;
+          vim.diagnostic.is_disabled = function()
+              return not vim.diagnostic.is_enabled();
+          end;
+          vim.tbl_islist = function(tbl)
+              return vim.islist(tbl);
+          end;
+          vim.lsp.buf_get_clients = function()
+              return vim.lsp.get_clients();
+          end;
+
           -- Start completion / snippet stuff
           vim.g.coq_settings = {
             auto_start = 'shut-up',
diff --git a/devices/nos/modules/arion/media/calibre/images/calibre.nix b/devices/nos/modules/arion/media/calibre/images/calibre.nix
index 357f8ef8..558c6c3c 100644
--- a/devices/nos/modules/arion/media/calibre/images/calibre.nix
+++ b/devices/nos/modules/arion/media/calibre/images/calibre.nix
@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/linuxserver/calibre";
-  imageDigest = "sha256:7d19a20a9e4f5e7f6d5fac9baf7f60944554904de46a5bef3d0d6cf2c5118bf4";
-  sha256 = "1xf4bgfg9qsdqnr4mxgshv0m9g1c4a49i9nkmnfciwna6nf8qrh4";
+  imageDigest = "sha256:7231defed20430b259d5fe3d4905978f9e8c3feb8f318f045d37501c3d847479";
+  sha256 = "1bllmbzggwphdc65c5vbijqcn6k23cvd7j9sc0brji2lsrmh9cwr";
   finalImageName = "ghcr.io/linuxserver/calibre";
   finalImageTag = "latest";
 }
diff --git a/devices/nos/modules/arion/media/prowlarr/images/flaresolverr.nix b/devices/nos/modules/arion/media/prowlarr/images/flaresolverr.nix
index 45e8ca87..ea78a1ff 100644
--- a/devices/nos/modules/arion/media/prowlarr/images/flaresolverr.nix
+++ b/devices/nos/modules/arion/media/prowlarr/images/flaresolverr.nix
@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/flaresolverr/flaresolverr";
-  imageDigest = "sha256:c255852b9a9f81d9ade5945222dddb0be00a85ef4fa6f9b18159b52a6f634893";
-  sha256 = "1m7mszxvh6ndg5kdy1fxiksc4p6dxbbaynwxh86w0fa87q9m5jnl";
+  imageDigest = "sha256:0bdf9ed48f3c54c998bc160be46244ce3a88a7783b6cfd31eec9c1667786152f";
+  sha256 = "12a82g88kzsr9xdvvk9vwqpxl5xif063s8lwlas7h9iix0i5fqmb";
   finalImageName = "ghcr.io/flaresolverr/flaresolverr";
   finalImageTag = "latest";
 }
diff --git a/devices/nos/modules/arion/media/sonarr/images/sonarr.nix b/devices/nos/modules/arion/media/sonarr/images/sonarr.nix
index 7d9704a9..e191f158 100644
--- a/devices/nos/modules/arion/media/sonarr/images/sonarr.nix
+++ b/devices/nos/modules/arion/media/sonarr/images/sonarr.nix
@@ -1,8 +1,8 @@
 pkgs:
 pkgs.dockerTools.pullImage {
   imageName = "ghcr.io/linuxserver/sonarr";
-  imageDigest = "sha256:25e0f3b3741cf8df6c322d6c9016b5be91ca6e154653b4d01c8c125bf1ce75c0";
-  sha256 = "1fbp6b1z4z1d7p3xq1zwsgqrs11siq7mgn8l6b92xmsf16ygwps4";
+  imageDigest = "sha256:be3ef05cda03e27a32f23ec073ce65b53a115338559abe3639f796436a652f9c";
+  sha256 = "1sd5v4fz9cli2jhq95n5rx243yyc3dgy2bnzi5ahzlg2djn7ryyl";
   finalImageName = "ghcr.io/linuxserver/sonarr";
   finalImageTag = "latest";
 }
diff --git a/flake.lock b/flake.lock
index b97c78f4..de5aa60c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -85,11 +85,11 @@
     },
     "basedpyright": {
       "locked": {
-        "lastModified": 1716460331,
+        "lastModified": 1716562718,
         "narHash": "sha256-udyDLE9+QW/tu2FkUKe/wmsbYnwPlvS9zLvF/IPxWuM=",
         "owner": "kiike",
         "repo": "nixpkgs",
-        "rev": "7deb2bb5d740681a0110007b421a60449378e0fc",
+        "rev": "3e8ec09e4a37707b323043968675747233109016",
         "type": "github"
       },
       "original": {
@@ -792,11 +792,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716327911,
-        "narHash": "sha256-PI+wygItS/TKzi4gEAROvKTUzTx9GT+PGBttS/IOA/Q=",
+        "lastModified": 1716576411,
+        "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "27ca640abeef2d425b5dbecf804f5eb622cef56d",
+        "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621",
         "type": "github"
       },
       "original": {
@@ -839,16 +839,17 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1716491954,
-        "narHash": "sha256-Qf1mEPacXhhM5KFm7HG2F/UBfzkjSBK57gKquA5TAVY=",
-        "ref": "refs/heads/main",
-        "rev": "4e42107d25dc47ee94da282db233f85f1e4c6bd0",
-        "revCount": 4733,
+        "lastModified": 1716586171,
+        "narHash": "sha256-YEEiM5DrVDcBEeF7n/THugmQdGvWnc/iY72GTogjEL8=",
+        "ref": "xwayland-rewrite",
+        "rev": "cb80ea4005dc23d52970b441946b3ae775c96b3d",
+        "revCount": 4726,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
       },
       "original": {
+        "ref": "xwayland-rewrite",
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -915,11 +916,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715791527,
-        "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=",
+        "lastModified": 1716473782,
+        "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee",
+        "rev": "87d5d984109c839482b88b4795db073eb9ed446f",
         "type": "github"
       },
       "original": {
@@ -1013,11 +1014,11 @@
     "jellyfin-ultrachromic-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1688568900,
-        "narHash": "sha256-DnmvmRTkgmaZVNeOpnqPF6vBouFYGTypRxjyvq0AWI0=",
+        "lastModified": 1716569042,
+        "narHash": "sha256-F9lunfs+rMVl0rVqCBApImuNtPA/wAWgqd18Rqw9PzM=",
         "owner": "CTalvio",
         "repo": "Ultrachromic",
-        "rev": "b56db9cfdd40c83e563158d50787374708e92c9b",
+        "rev": "41ec342223ce22ddcb358176be474a25cb30d2c5",
         "type": "github"
       },
       "original": {
@@ -1154,11 +1155,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1716503225,
-        "narHash": "sha256-5EG1FkoRgs1SHAS+NdEcaUDnp5jXhq+MtLoM2n2RyMc=",
+        "lastModified": 1716561825,
+        "narHash": "sha256-v9V74Xd1/n0n/1eB3gZ+LqcOCurWqTfBum5azqjWMII=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "6045b353d451becbdc8764a2ba62a57242909e2b",
+        "rev": "d83afee1f19108100bd2fef1f86d87d2942d734d",
         "type": "github"
       },
       "original": {
@@ -1301,11 +1302,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716409168,
-        "narHash": "sha256-EhfEm11GRKDJVWeCRZ9uH6PZC6I0rAKTTEOedOlEfEI=",
+        "lastModified": 1716513383,
+        "narHash": "sha256-WKO8A3PvMRTXB5wNhFyTNXnYQThSazIyVqY5Yh4YIiI=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "72a38144721f978979d09f01e0929457c347d1f3",
+        "rev": "a1b37351bf0fe01192eeb93f643749f2e0f944eb",
         "type": "github"
       },
       "original": {
@@ -1591,11 +1592,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716506298,
-        "narHash": "sha256-AuyiiMPCzYzl5hmCIggT94OHoyta1t9gUtFDHjSrXTU=",
+        "lastModified": 1716589021,
+        "narHash": "sha256-m7+ogvgw6tCk5P1H9OqS2yTFlZOus9I+Genv3PUWkno=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "f9d6426bc18e49d560a79aedc55f42a24dca4b89",
+        "rev": "8746004cd97164c89f0997ea06642b819e5bc3fb",
         "type": "github"
       },
       "original": {
@@ -1712,11 +1713,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1716507882,
-        "narHash": "sha256-/nOeyzEvW7kNDSLjBTSajV6BUDX1V2N6I63jwPkwA/8=",
+        "lastModified": 1716608772,
+        "narHash": "sha256-NwCsVWGOIp4AzaOR03baECOFSgn0B2C6TMnjgzp56qc=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "341b00e4275d17419aa379df934ebd19ab697632",
+        "rev": "50414398b20e90a57b17e83ed9f30ba13b973c1c",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7316c616..66ca9b04 100644
--- a/flake.nix
+++ b/flake.nix
@@ -126,6 +126,7 @@
     };
     hyprland = {
       inputs.nixpkgs.follows = "nixpkgs";
+      ref = "xwayland-rewrite";
       submodules = true;
       type = "git";
       url = "https://github.com/hyprwm/Hyprland";
diff --git a/inputs.nix b/inputs.nix
index 3f79eef8..ef9f6609 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -136,6 +136,9 @@ let
         type = "git";
         url = "https://github.com/hyprwm/Hyprland";
         submodules = true;
+
+        # FIXME: remove when this is merged https://github.com/hyprwm/Hyprland/pull/6086
+        ref = "xwayland-rewrite";
       };
 
       hypr-official-plugins = mkHyprDep {