diff --git a/flake.lock b/flake.lock
index 7192ab8d..4978dab4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -223,15 +223,15 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1723503926,
-        "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
-        "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
+        "lastModified": 1729298361,
+        "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
+        "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
       }
     },
     "lix-module": {
@@ -244,15 +244,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1723510904,
-        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
-        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
+        "lastModified": 1729360442,
+        "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
+        "rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
       },
       "original": {
         "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
       }
     },
     "nix-darwin": {
@@ -332,6 +332,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1729880355,
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-24-05": {
       "locked": {
         "lastModified": 1729973466,
         "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
@@ -373,6 +389,7 @@
         "nixos-22-05": "nixos-22-05",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-24-05": "nixpkgs-24-05",
         "triton-vmtools": "triton-vmtools",
         "tritonshell": "tritonshell",
         "unstable": "unstable"
diff --git a/flake.nix b/flake.nix
index cacd1a33..fc001554 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,8 @@
   inputs = {
     # Track channels with commits tested and built by hydra
     nixos-22-05.url = "github:nixos/nixpkgs/nixos-22.05";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs-24-05.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     flake-compat.url = "github:edolstra/flake-compat";
@@ -36,7 +37,7 @@
     nixos-hardware.url = "github:nixos/nixos-hardware";
 
     lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
+      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/overlays/default.nix b/overlays/default.nix
index 5f016b15..ccf01877 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -36,6 +36,7 @@
             (import ./mdbook-multilang.nix inputs)
             (import ./nix-index.nix)
             (import ./prr.nix)
+            (import ./sway.nix inputs)
             (import ./neovim-plugins.nix)
           ];
         }
diff --git a/overlays/sway.nix b/overlays/sway.nix
new file mode 100644
index 00000000..87d5136b
--- /dev/null
+++ b/overlays/sway.nix
@@ -0,0 +1,28 @@
+inputs: final: prev:
+let
+  unstable = import inputs.unstable {
+    system = prev.system;
+  };
+in
+{
+  sway-unwrapped =
+    (unstable.sway-unwrapped.override { wlroots = unstable.wlroots_0_18; }).overrideAttrs
+      (
+        finalAttrs: prevAttrs: {
+          version = "1.10";
+          src = prevAttrs.src.override {
+            hash = "sha256-PzeU/niUdqI6sf2TCG19G2vNgAZJE5JCyoTwtO9uFTk=";
+          };
+
+          mesonFlags =
+            let
+              inherit (final.lib.strings) mesonEnable mesonOption;
+              sd-bus-provider = if finalAttrs.systemdSupport then "libsystemd" else "basu";
+            in
+            [
+              (mesonOption "sd-bus-provider" sd-bus-provider)
+              (mesonEnable "tray" finalAttrs.trayEnabled)
+            ];
+        }
+      );
+}