diff --git a/.gitignore b/.gitignore
index e27d8f8..e58c804 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@
 # Nitro
 .output/
 
+# Turborepo
+.turbo/
+
 ### Node ###
 
 # Logs
diff --git a/bun.lock b/bun.lock
index 411c208..c1e4337 100644
--- a/bun.lock
+++ b/bun.lock
@@ -39,6 +39,7 @@
         "effect": "^3.19.14",
         "nitro": "npm:nitro-nightly@latest",
         "tailwindcss": "^4.1.18",
+        "turbo": "^2.7.5",
         "typescript": "^5.9.3",
         "vite": "^8.0.0-beta.8",
         "vite-tsconfig-paths": "^6.0.4",
@@ -926,6 +927,20 @@
 
     "tsx": ["tsx@4.21.0", "", { "dependencies": { "esbuild": "~0.27.0", "get-tsconfig": "^4.7.5" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "bin": { "tsx": "dist/cli.mjs" } }, "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw=="],
 
+    "turbo": ["turbo@2.7.5", "", { "optionalDependencies": { "turbo-darwin-64": "2.7.5", "turbo-darwin-arm64": "2.7.5", "turbo-linux-64": "2.7.5", "turbo-linux-arm64": "2.7.5", "turbo-windows-64": "2.7.5", "turbo-windows-arm64": "2.7.5" }, "bin": { "turbo": "bin/turbo" } }, "sha512-7Imdmg37joOloTnj+DPrab9hIaQcDdJ5RwSzcauo/wMOSAgO+A/I/8b3hsGGs6PWQz70m/jkPgdqWsfNKtwwDQ=="],
+
+    "turbo-darwin-64": ["turbo-darwin-64@2.7.5", "", { "os": "darwin", "cpu": "x64" }, "sha512-nN3wfLLj4OES/7awYyyM7fkU8U8sAFxsXau2bYJwAWi6T09jd87DgHD8N31zXaJ7LcpyppHWPRI2Ov9MuZEwnQ=="],
+
+    "turbo-darwin-arm64": ["turbo-darwin-arm64@2.7.5", "", { "os": "darwin", "cpu": "arm64" }, "sha512-wCoDHMiTf3FgLAbZHDDx/unNNonSGhsF5AbbYODbxnpYyoKDpEYacUEPjZD895vDhNvYCH0Nnk24YsP4n/cD6g=="],
+
+    "turbo-linux-64": ["turbo-linux-64@2.7.5", "", { "os": "linux", "cpu": "x64" }, "sha512-KKPvhOmJMmzWj/yjeO4LywkQ85vOJyhru7AZk/+c4B6OUh/odQ++SiIJBSbTG2lm1CuV5gV5vXZnf/2AMlu3Zg=="],
+
+    "turbo-linux-arm64": ["turbo-linux-arm64@2.7.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-8PIva4L6BQhiPikUTds9lSFSHXVDAsEvV6QUlgwPsXrtXVQMVi6Sv9p+IxtlWQFvGkdYJUgX9GnK2rC030Xcmw=="],
+
+    "turbo-windows-64": ["turbo-windows-64@2.7.5", "", { "os": "win32", "cpu": "x64" }, "sha512-rupskv/mkIUgQXzX/wUiK00mKMorQcK8yzhGFha/D5lm05FEnLx8dsip6rWzMcVpvh+4GUMA56PgtnOgpel2AA=="],
+
+    "turbo-windows-arm64": ["turbo-windows-arm64@2.7.5", "", { "os": "win32", "cpu": "arm64" }, "sha512-G377Gxn6P42RnCzfMyDvsqQV7j69kVHKlhz9J4RhtJOB5+DyY4yYh/w0oTIxZQ4JRMmhjwLu3w9zncMoQ6nNDw=="],
+
     "type-fest": ["type-fest@5.4.1", "", { "dependencies": { "tagged-tag": "^1.0.0" } }, "sha512-xygQcmneDyzsEuKZrFbRMne5HDqMs++aFzefrJTgEIKjQ3rekM+RPfFCVq2Gp1VIDqddoYeppCj4Pcb+RZW0GQ=="],
 
     "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],
diff --git a/package.json b/package.json
index 354cfb2..ad0f2b3 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "bun run build:vite && bun run build:compile",
+    "build": "turbo build:compile",
     "build:compile": "bun build.ts",
     "build:tauri": "tauri build",
     "build:vite": "vite build",
@@ -11,7 +11,7 @@
     "db:migrate": "drizzle-kit migrate",
     "db:push": "drizzle-kit push",
     "db:studio": "drizzle-kit studio",
-    "dev": "bun run dev:vite",
+    "dev": "turbo dev:tauri",
     "dev:tauri": "tauri dev",
     "dev:vite": "vite dev",
     "fix": "biome check --write",
@@ -52,6 +52,7 @@
     "effect": "^3.19.14",
     "nitro": "npm:nitro-nightly@latest",
     "tailwindcss": "^4.1.18",
+    "turbo": "^2.7.5",
     "typescript": "^5.9.3",
     "vite": "^8.0.0-beta.8",
     "vite-tsconfig-paths": "^6.0.4"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 9cd0be4..4f44e3c 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -3,10 +3,6 @@
   "productName": "tauri-shell",
   "version": "0.1.0",
   "identifier": "com.imbytecat.tauri-shell",
-  "build": {
-    "beforeDevCommand": "bun run dev:vite",
-    "beforeBuildCommand": "bun run build"
-  },
   "app": {
     "withGlobalTauri": true,
     "windows": [],
diff --git a/turbo.json b/turbo.json
new file mode 100644
index 0000000..25980a8
--- /dev/null
+++ b/turbo.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "./node_modules/turbo/schema.json",
+  "ui": "tui",
+  "dangerouslyDisablePackageManagerCheck": true,
+  "tasks": {
+    "build:compile": {
+      "dependsOn": ["build:vite"]
+    },
+    "build:tauri": {
+      "dependsOn": ["build:compile"]
+    },
+    "dev": {
+      "persistent": true,
+      "cache": false
+    },
+    "dev:tauri": {
+      "persistent": true,
+      "cache": false,
+      "dependsOn": ["build:compile"],
+      "with": ["dev:vite"]
+    }
+  }
+}