diff --git a/flake.lock b/flake.lock
index 66edfb3..bb2211e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "lastModified": 1678901627,
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
         "type": "github"
       },
       "original": {
@@ -32,16 +32,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1669833724,
-        "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=",
+        "lastModified": 1679943299,
+        "narHash": "sha256-RsGh4KrY4rnhTI7vTv0eVS6P5/MbakSKkGFXOnuN3q4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e",
+        "rev": "2749074b2e2960fc97aaeca251f3152d6e6effb7",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "22.11",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -75,16 +75,16 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1678455318,
-        "narHash": "sha256-CGO1l4UMkBRaUE2uCVWjtNGD5MaCWlEPU4eZGMRl8dQ=",
+        "lastModified": 1679883731,
+        "narHash": "sha256-s+JOzKRcAOSCkMdjwKNXRX3cCJS99IrzXMb17PRHahU=",
         "owner": "lopsided98",
         "repo": "nix-ros-overlay",
-        "rev": "da01dd9a2be0001c193acf1aa25b0e2b1fe9d060",
+        "rev": "3ae8887f8c0344d6d926a261c958993887487971",
         "type": "github"
       },
       "original": {
         "owner": "lopsided98",
-        "ref": "nix-bot-nueuxlFifM",
+        "ref": "staging",
         "repo": "nix-ros-overlay",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index c7fb072..7b5770f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,9 @@
 {
   description = "Robossembler Development Environments on Nix";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/22.11";
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=master";
     flake-utils.url = "github:numtide/flake-utils";
-    ros-flake.url = "github:lopsided98/nix-ros-overlay?ref=nix-bot-nueuxlFifM";
+    ros-flake.url = "github:lopsided98/nix-ros-overlay?ref=staging";
   };
 
   outputs = { self, nixpkgs, ros-flake, flake-utils }:
@@ -78,15 +78,16 @@
                 moveit-ros-planning-interface
                 # gazebo
                 # gazebo-ros2-control
-                plansys2-bringup
                 # rbs-skill-interfaces
+                # plansys2-bringup
               ]) ++ (with pkgs; [ nlohmann_json ]);
               RMW_IMPLEMENTATION = "rmw_fastrtps_dynamic_cpp";
             };
 
-          devShells.bpy = pkgs.mkShell { packages = [ bpy pysdf pkgs.freecad ]; };
-          devShells.mayo = pkgs.mkShell { packages = [ mayo ]; };
-          devShells.blender = pkgs.mkShell { packages = [ blender ]; };
+          devShells.all = pkgs.mkShell { 
+            packages = [ mayo blender bpy pysdf fstl darknet slic3r ];
+          };
+          devShells.bpy = pkgs.mkShell { packages = [ bpy pysdf pkgs.freecad blender ]; };
           devShells.up =
             let
               my-python-packages = p: with p; [ unified-planning ];