diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..92b2793
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.direnv
diff --git a/home/shell/default.nix b/home/shell/default.nix
index 77a9967..c346f5d 100644
--- a/home/shell/default.nix
+++ b/home/shell/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./direnv.nix
     ./fish.nix
     ./other.nix
     ./repl
diff --git a/home/shell/direnv.nix b/home/shell/direnv.nix
new file mode 100644
index 0000000..2b51c9d
--- /dev/null
+++ b/home/shell/direnv.nix
@@ -0,0 +1,6 @@
+{
+  programs.direnv = {
+    enable = true;
+    nix-direnv.enable = true;
+  };
+}
diff --git a/system/nix/default.nix b/system/nix/default.nix
index cfcdec5..0cb22f4 100644
--- a/system/nix/default.nix
+++ b/system/nix/default.nix
@@ -9,6 +9,7 @@
     ./nh.nix
     ./nixpkgs.nix
     ./substituters.nix
+    ./nix-index.nix
   ];
 
   # we need git for flakes
diff --git a/system/nix/nix-index.nix b/system/nix/nix-index.nix
new file mode 100644
index 0000000..7cb8b17
--- /dev/null
+++ b/system/nix/nix-index.nix
@@ -0,0 +1,7 @@
+{
+  programs.command-not-found.enable = false;
+  programs.nix-index = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+}