diff --git a/default.nix b/default.nix
deleted file mode 100644
index 64d20f674..000000000
--- a/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ pkgs ? import <nixpkgs> { } }:
-let
-  odin-unwrapped = pkgs.llvmPackages_11.stdenv.mkDerivation (rec {
-    name = "odin-unwrapped";
-    src = ./.;
-    dontConfigure = true;
-    nativeBuildInputs = [ pkgs.git ];
-    buildPhase = ''
-      make debug SHELL=${pkgs.llvmPackages_11.stdenv.shell}
-    '';
-    installPhase = ''
-      mkdir -p $out/bin
-      cp odin $out/bin/odin
-      cp -r core $out/bin/core
-    '';
-  });
-  path = builtins.map (path: path + "/bin") (with pkgs.llvmPackages_11; [
-    bintools
-    llvm
-    clang
-    lld
-  ]);
-in
-pkgs.writeScriptBin "odin" ''
-  #!${pkgs.llvmPackages_11.stdenv.shell} 
-  PATH="${(builtins.concatStringsSep ":" path)}" exec ${odin-unwrapped}/bin/odin $@
-''
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 000000000..21301b9d7
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,11 @@
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.mkShell {
+  name = "odin";
+  nativeBuildInputs = with pkgs; [
+    git
+    clang_17
+    llvmPackages_17.llvm
+    llvmPackages_17.bintools
+  ];
+  shellHook="CXX=clang++";
+}
diff --git a/src/gb/gb.h b/src/gb/gb.h
index 5dae7a5c4..93d250f21 100644
--- a/src/gb/gb.h
+++ b/src/gb/gb.h
@@ -448,7 +448,7 @@ typedef i32 b32; // NOTE(bill): Prefer this!!!
 		#define gb_inline __forceinline
 		#endif
 	#else
-		#define gb_inline __attribute__ ((__always_inline__))
+		#define gb_inline inline __attribute__ ((__always_inline__))
 	#endif
 #endif