diff --git a/Makefile b/Makefile
index 7d39ca8..1d1946a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CXX = g++
+CXX = clang++
 CXXFLAGS = -std=c++20 -O3 -Wall -Wextra -Wpedantic
 LDFLAGS = -lsfml-graphics -lsfml-window -lsfml-system
 
diff --git a/nix/shell.nix b/nix/shell.nix
index 4bee28a..c913cd6 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -1,19 +1,21 @@
 {
   mkShell,
-  gcc,
+  clang,
   gnumake,
   clang-tools,
   sfml,
+  bear,
   ...
 }:
 mkShell {
   name = "osu++";
 
   nativeBuildInputs = [
-    gcc
+    clang
     gnumake
     # for clang-format
     clang-tools
+    bear
   ];
 
   buildInputs = [