diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix
index 9a19511..36872ed 100644
--- a/modules/nix-settings.nix
+++ b/modules/nix-settings.nix
@@ -1,15 +1,26 @@
-_: {
-  nix.settings = {
-    extra-experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
+{ pkgs, ... }:
+{
+  nix = {
+    settings = {
+      extra-experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
 
-    auto-optimise-store = true;
+      auto-optimise-store = true;
 
-    trusted-users = [ "@wheel" ];
+      trusted-users = [ "@wheel" ];
 
-    # RPi builds can be slow due to compiling via binfmt.
-    download-buffer-size = 1 * 1024 * 1024 * 1024;
+      # RPi builds can be slow due to compiling via binfmt.
+      download-buffer-size = 1 * 1024 * 1024 * 1024;
+    };
+
+    # Use nixpkgs of the current flake in "nix run", "nix shell" etc.
+    registry.nixpkgs.to = {
+      type = "path";
+      inherit (pkgs) path;
+    };
+    # Use nixpkgs of the current flake in nix-shell.
+    nixPath = [ "nixpkgs=${pkgs.path}" ];
   };
 }