diff --git a/modules/base/nix/environment.nix b/modules/base/nix/environment.nix
index 69b1a19d..99dd77d1 100644
--- a/modules/base/nix/environment.nix
+++ b/modules/base/nix/environment.nix
@@ -12,11 +12,6 @@ let
   inherit (lib.modules) mkForce;
 in
 {
-  # git is required for flakes
-  garden.packages = {
-    inherit (pkgs) gitMinimal;
-  };
-
   environment = {
     # https://github.com/NixOS/nixpkgs/blob/eca4605163a534aed1981de0f5f1d7d7639d1640/nixos/modules/programs/environment.nix#L18
     variables.NIXPKGS_CONFIG = mkForce "";
diff --git a/modules/flake/programs/shell.nix b/modules/flake/programs/shell.nix
index 680fc53f..38322b89 100644
--- a/modules/flake/programs/shell.nix
+++ b/modules/flake/programs/shell.nix
@@ -20,6 +20,7 @@
             [
               pkgs.just # quick and easy task runner
               pkgs.cocogitto # git helpers
+              pkgs.gitMinimal # we need git
               self'.formatter # nix formatter
               pkgs.nix-output-monitor # get clean diff between generations
               inputs'.agenix.packages.agenix # secrets
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 00000000..1f947f17
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,9 @@
+let
+  compat = fetchTarball {
+    url = "https://git.lix.systems/lix-project/flake-compat/archive/6588972962297c7abd300a72c55b2c7e21c1dc54.tar.gz";
+    sha256 = "sha256-PplvwAEkj+/MFkM6Q9V59L6f6i3Tbdc/9yLRf/iwECg=";
+  };
+
+  flake = import compat { src = ./.; };
+in
+flake.shellNix