From 4291f26f4e8a55ccb901fcb4db42b089e48d361a Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Tue, 6 Aug 2024 10:17:52 -0500 Subject: [PATCH] nolonger override shell with nixpkgs and blank overlays --- .gitignore | 1 + shell.nix | 14 +------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 7e8bfe6..f84b812 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ result* .direnv .kube .github +.profile diff --git a/shell.nix b/shell.nix index 3e9ff28..94236ec 100644 --- a/shell.nix +++ b/shell.nix @@ -1,17 +1,5 @@ # Shell for bootstrapping flake-enabled nix and home-manager -{ pkgs ? let - # If pkgs is not defined, instantiate nixpkgs from locked commit - lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked; - nixpkgs = fetchTarball { - url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz"; - sha256 = lock.narHash; - }; - system = builtins.currentSystem; - overlays = [ ]; # Explicit blank overlay to avoid interference - in - import nixpkgs { inherit system overlays; } -, ... -}: +{ pkgs ? import {} }: pkgs.mkShell { # Enable experimental features without having to specify the argument NIX_CONFIG = "experimental-features = nix-command flakes";