diff --git a/flake.nix b/flake.nix
index 2ca5914..065242d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,10 @@
           );
 
           devenv.shells.default = {
-            imports = [ "${self}/shells/nix.nix" ];
+            imports = [
+              "${self}/shells/base.nix"
+              "${self}/shells/nix.nix"
+            ];
           };
 
           formatter = pkgs.nixfmt-rfc-style;
diff --git a/shells/base.nix b/shells/base.nix
new file mode 100644
index 0000000..a928c85
--- /dev/null
+++ b/shells/base.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+  packages = with pkgs; [
+    gnupg
+    git
+  ];
+
+  env.GPG_TTY = "\$(tty)";
+}