diff --git a/packages/orcinusWM/flake.lock b/packages/orcinusWM/flake.lock
index b7da4f81..1141be60 100644
--- a/packages/orcinusWM/flake.lock
+++ b/packages/orcinusWM/flake.lock
@@ -53,6 +53,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1654275867,
@@ -69,6 +87,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1681358109,
+        "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "cargo2nix": "cargo2nix",
@@ -79,7 +113,8 @@
         "nixpkgs": [
           "cargo2nix",
           "nixpkgs"
-        ]
+        ],
+        "rust-overlay": "rust-overlay_2"
       }
     },
     "rust-overlay": {
@@ -106,6 +141,40 @@
         "repo": "rust-overlay",
         "type": "github"
       }
+    },
+    "rust-overlay_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1688524421,
+        "narHash": "sha256-EFauqXKKjbJKPWv3kbzl1lm1GnXl0+DBK4RcLuFndZQ=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "ab050286f18ea354bfe7a49ca8ddcbd633cae1ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/packages/orcinusWM/flake.nix b/packages/orcinusWM/flake.nix
index df060dae..cdcd8cdb 100644
--- a/packages/orcinusWM/flake.nix
+++ b/packages/orcinusWM/flake.nix
@@ -1,65 +1,72 @@
+# Regernate Cargo2Nix: nix run github:cargo2nix/cargo2nix
 {
   inputs = {
     cargo2nix.url = "github:cargo2nix/cargo2nix/release-0.11.0";
     flake-utils.follows = "cargo2nix/flake-utils";
     nixpkgs.follows = "cargo2nix/nixpkgs";
-    rust.url = "github:oxalica/rust-overlay";
+    rust-overlay.url = "github:oxalica/rust-overlay";
   };
 
-  outputs = inputs:
-    with inputs;
-      flake-utils.lib.eachDefaultSystem (
-        system: let
-          pkgs = import nixpkgs {
-            inherit system;
-            overlays = [cargo2nix.overlays.default];
-          };
+  outputs = {
+    self,
+    cargo2nix,
+    rust-overlay,
+    nixpkgs,
+    flake-utils,
+  }:
+    flake-utils.lib.eachDefaultSystem (
+      system: let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [cargo2nix.overlays.default rust-overlay.overlays.default];
+        };
 
-          rustPkgs = pkgs.rustBuilder.makePackageSet {
-            rustChannel = "nightly";
-            packageFun = import ./default.nix;
-            packageOverrides = pkgs:
-              pkgs.rustBuilder.overrides.all
-              ++ [
-                (pkgs.rustBuilder.rustLib.makeOverride {
-                  name = "orcinus-wm";
-                  overrideAttrs = drv: {
-                    propagatedNativeBuildInputs =
-                      drv.propagatedNativeBuildInputs
-                      or []
-                      ++ [
-                        pkgs.xorg.libxcb
-                        pkgs.xorg.xmodmap
-                      ];
-                  };
-                })
-              ];
-          };
-
-          workspaceShell = rustPkgs.workspaceShell {
-            buildInputs = with pkgs; [
-              rust-analyzer
-              xorg.libxcb
-              xorg.xmodmap
-              alejandra
+        rustPkgs = pkgs.rustBuilder.makePackageSet {
+          rustChannel = "stable";
+          rustVersion = "1.70.0";
+          packageFun = import ./default.nix;
+          packageOverrides = pkgs:
+            pkgs.rustBuilder.overrides.all
+            ++ [
+              (pkgs.rustBuilder.rustLib.makeOverride {
+                name = "orcinus-wm";
+                overrideAttrs = drv: {
+                  propagatedNativeBuildInputs =
+                    drv.propagatedNativeBuildInputs
+                    or []
+                    ++ [
+                      pkgs.xorg.libxcb
+                      pkgs.xorg.xmodmap
+                    ];
+                };
+              })
             ];
+        };
 
-            nativeBuildInputs = with pkgs; [
-              rust-bin.stable.latest.default
-            ];
-          };
-        in rec {
-          # Executed by `nix build`
-          packages = {
-            orcinusWM = (rustPkgs.workspace.orcinus-wm {}).bin;
-            default = packages.orcinusWM;
-          };
+        workspaceShell = rustPkgs.workspaceShell {
+          buildInputs = with pkgs; [
+            rust-analyzer
+            xorg.libxcb
+            xorg.xmodmap
+            alejandra
+          ];
+
+          nativeBuildInputs = with pkgs; [
+            rust-bin.stable.latest.default
+          ];
+        };
+      in rec {
+        # Executed by `nix build`
+        packages = {
+          orcinusWM = (rustPkgs.workspace.orcinus-wm {}).bin;
+          default = packages.orcinusWM;
+        };
 
-          # Used by `nix develop`
-          devShells.default = workspaceShell;
+        # Used by `nix develop`
+        devShells.default = workspaceShell;
 
-          # Executed by `nix run` :TODO| xephyr script on run
-          # apps.default = packages.orcinusWM;
-        }
-      );
+        # Executed by `nix run` :TODO| xephyr script on run
+        # apps.default = packages.orcinusWM;
+      }
+    );
 }