diff --git a/shell.nix b/shell.nix
index 447947cf52..b758a6fe8f 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,24 +1,31 @@
-{ pkgs ? import <nixpkgs> { } }:
-
+let
+  pkgs = import <nixpkgs> { };
+in
 pkgs.mkShell {
-  name = "Choreo";
+  nativeBuildInputs = with pkgs; [
+    pkg-config
+    wrapGAppsHook4
+    cargo
+    rustc
+    cargo-tauri
+    nodejs
+    corepack
 
-  packages = with pkgs; [
-    cmake
+    pipx
+    ninja
     gcc
-    git
-    nodejs
-    pnpm
-    rustup
+    cmake
+    clang-tools
+  ];
 
-    cacert
-    gnome.libsoup
+  buildInputs = with pkgs; [
     librsvg
-    pkg-config
-    webkitgtk
+    webkitgtk_4_1
   ];
 
   shellHook = ''
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/src-tauri
+    export XDG_DATA_DIRS="$GSETTINGS_SCHEMAS_PATH" # Needed on Wayland to report the correct display scale
+    pipx install wpiformat
+    export PATH="~/.local/bin:$PATH"
   '';
 }