diff --git a/flake.lock b/flake.lock
index 247c2b9..960d1f6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -128,11 +128,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710242657,
-        "narHash": "sha256-tgaILHKZH6vC8P8N8NBMNQ/XIpTY72zMojlGLPLPLZk=",
+        "lastModified": 1714032877,
+        "narHash": "sha256-6KKe4xdHPQbGtM5icLHKxgcYyFKF47a98csTQG7vkvU=",
         "ref": "refs/heads/master",
-        "rev": "6a499c8371c6a14d11a8c2fcc9f233e7b8e688a0",
-        "revCount": 148,
+        "rev": "f6acae14927a6df78ce2304007369095e140da9c",
+        "revCount": 149,
         "type": "git",
         "url": "https://git.xinyang.life/xin/nur.git"
       },
diff --git a/flake.nix b/flake.nix
index 0ea12c7..69dd4e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,7 @@
           overlays = [
             (self: super: {
               nvboard = nur-xin.legacyPackages.${system}.nvboard;
+              mini-gdbstub = nur-xin.legacyPackages.${system}.mini-gdbstub;
             })
           ];
         };
@@ -65,23 +66,36 @@
 
           nativeBuildInputs = [
             pkgs.cmake
+            pkgs.gcc # Generate expr tests
           ];
 
           cmakeFlags = [
-            (pkgs.lib.cmakeFeature "ISA" "riscv")
-            (pkgs.lib.cmakeFeature "PLATFORM" "nemu")
+            (pkgs.lib.cmakeFeature "ARCH" "riscv-nemu")
           ];
 
           buildInputs = [
             # SDL2
             self.packages.${system}.abstract-machine
           ];
+
+          cmakeBuildType = "RelWithDebInfo";
+          dontStrip = true;
         };
 
         devShells.nemu = pkgs.mkShell {
           packages = with pkgs; [
             clang-tools
             gdb
+            SDL2
+            gnumake
+            pkg-config
+            flex
+            bison
+            dtc
+
+            readline
+            libllvm
+            mini-gdbstub
           ];
           inputsFrom = [
             self.packages.${system}.nemu