diff --git a/shell.nix b/shell.nix
index a28913e..6ad5826 100644
--- a/shell.nix
+++ b/shell.nix
@@ -16,23 +16,16 @@ pkgs.mkShell rec {
       texinfo
       isl
     ];
-    RUSTC_VERSION = "nightly";
-    hardeningDisable = [ "all" ];
-    # https://github.com/rust-lang/rust-bindgen#environment-variables
+    RUSTC_VERSION = "nightly"; # Required for some experimental cargo features
+    hardeningDisable = [ "all" ]; # Required to compile gcc
     LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.llvmPackages_latest.libclang.lib ];
 	shellHook = ''
-      rustup default nightly
-	  rustup component add rust-analyzer
-      rustup component add rust-src
-	  rustup target add x86_64-unknown-none
+      rustup component add rust-analyzer
+      rustup component add rust-src # Needed for compiling to a custom target
       export PATH=$PATH:''${CARGO_HOME:-~/.cargo}/bin
       export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/nightly-x86_64-unknown-linux-gnu/bin/
-      export PATH=$PATH:$PWD/opt/bin
+      export PATH="$PATH:$PWD/opt/bin"
       '';
-    # Add precompiled library to rustc search path
-    RUSTFLAGS = (builtins.map (a: ''-L ${a}/lib'') [
-      # add libraries here (e.g. pkgs.libvmi)
-    ]);
     # Add glibc, clang, glib, and other headers to bindgen search path
     BINDGEN_EXTRA_CLANG_ARGS = 
     # Includes normal include path