diff --git a/flake.lock b/flake.lock
index d91657d..2cbcaf5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,18 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747958103,
-        "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=",
-        "owner": "NixOS",
+        "lastModified": 1749086602,
+        "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1",
+        "rev": "4792576cb003c994bd7cc1edada3129def20b27d",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "nixos",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {
diff --git a/flake.nix b/flake.nix
index 2cc815c..100b7d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,6 @@
 {
     description = "ergogen dev env";
-
-    #inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";       Uses the cuda driver installed on the system, hence commented out.
-    #inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";    Forcing a specific version will likely result in conflicts!
+    inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
 
     outputs = { self, nixpkgs }:
     let
@@ -13,9 +11,13 @@
 
             buildInputs = with pkgs; [
               ergogen
+              librecad  # for 2D outlines
+              kicad     # for PCBs
             ];
 
             shellHook = ''
+              export __GLX_VENDOR_LIBRARY_NAME="" # To fix kicad with nvidia drivers
+
               echo loaded ergogen shell
             '';
         };