diff --git a/.clang-tidy b/.clang-tidy
index 0887b867087..6092c4e4678 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,3 +1,13 @@
-# We use pointers to aggregates in a couple of places, intentionally.
-# void * would look weird.
-Checks: '-bugprone-sizeof-expression'
+Checks:
+  - bugprone-*
+  - clang-analyzer-*
+  - cppcoreguidelines-*
+  - modernize-*
+  - -modernize-use-trailing-return-type
+  - performance-*
+  - portability-*
+  - readability-*
+  - -readability-identifier-length
+FormatStyle: file
+InheritParentConfig: true
+User: connorbaker
\ No newline at end of file
diff --git a/packaging/dev-shell.nix b/packaging/dev-shell.nix
index b64dc0858fb..b30f1f0d830 100644
--- a/packaging/dev-shell.nix
+++ b/packaging/dev-shell.nix
@@ -113,7 +113,7 @@ in {
     # https://github.com/NixOS/nixpkgs/pull/291814 is available
     ++ lib.optional (stdenv.cc.isClang && !stdenv.buildPlatform.isDarwin) pkgs.buildPackages.bear
     ++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) [
-      (lib.hiPrio pkgs.buildPackages.clang-tools-18)
+      (lib.hiPrio pkgs.buildPackages.clang-tools_18)
       pkgs.buildPackages.llvmPackages_18.lldb
     ];