diff --git a/.gitignore b/.gitignore
index cf0b59550..c47680528 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,7 @@ node/.nyc_output/
 
 # Nix symlink.
 result
+
+# direnv
+.envrc
+.direnv
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index 3ab77cef8..862b186d4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,8 +111,6 @@
         mkWin64RustPackage = packageName:
           let
             rustTarget = "x86_64-pc-windows-gnu";
-          in
-          let
             toolchainWin = fenixPkgs.combine [
               fenixPkgs.stable.rustc
               fenixPkgs.stable.cargo
@@ -179,13 +177,12 @@
                     model = "win32";
                     package = null;
                   };
-                })).overrideAttrs (oldAttr: rec{
+                })).overrideAttrs (oldAttr: {
                 configureFlags = oldAttr.configureFlags ++ [
                   "--disable-sjlj-exceptions --with-dwarf2"
                 ];
               })
             );
-            winStdenv = pkgsWin32.buildPackages.overrideCC pkgsWin32.stdenv winCC;
           in
           naerskWin.buildPackage rec {
             pname = packageName;
@@ -279,8 +276,6 @@
         mkAndroidRustPackage = arch: packageName:
           let
             rustTarget = androidAttrs.${arch}.rustTarget;
-          in
-          let
             toolchain = fenixPkgs.combine [
               fenixPkgs.stable.rustc
               fenixPkgs.stable.cargo
@@ -446,7 +441,7 @@
               };
 
             libdeltachat =
-              pkgs.stdenv.mkDerivation rec {
+              pkgs.stdenv.mkDerivation {
                 pname = "libdeltachat";
                 version = manifest.version;
                 src = rustSrc;
@@ -488,7 +483,7 @@
               };
 
             deltachat-rpc-client =
-              pkgs.python3Packages.buildPythonPackage rec {
+              pkgs.python3Packages.buildPythonPackage {
                 pname = "deltachat-rpc-client";
                 version = manifest.version;
                 src = pkgs.lib.cleanSource ./deltachat-rpc-client;
@@ -499,7 +494,7 @@
               };
 
             deltachat-python =
-              pkgs.python3Packages.buildPythonPackage rec {
+              pkgs.python3Packages.buildPythonPackage {
                 pname = "deltachat-python";
                 version = manifest.version;
                 src = pkgs.lib.cleanSource ./python;
@@ -535,6 +530,21 @@
                 installPhase = ''mkdir -p $out; cp -av dist/html $out'';
               };
           };
+
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            (fenixPkgs.complete.withComponents [
+              "cargo"
+              "clippy"
+              "rust-src"
+              "rustc"
+              "rustfmt"
+            ])
+            cargo-deny
+            fenixPkgs.rust-analyzer
+            perl # needed to build vendored OpenSSL
+          ];
+        };
       }
     );
 }