diff --git a/configuration.nix b/configuration.nix
index 1c29ea1..90e403b 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 with pkgs;
 
@@ -129,6 +129,10 @@ in {
     options mac80211 beacon_loss_count=1000 probe_wait_ms=75
   '';
 
+  # Use same version of nixpkgs for nix-shell
+  nix.nixPath = let path = toString ./.;
+  in [ "nixpkgs=${inputs.nixpkgs}" "nixos-config=${path}/configuration.nix" ];
+
   # Import other configuration modules
   imports = [
     ./modules/hardware-configuration.nix