From 3dc4079d860a82dd821713d6adb0417d79a945c6 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Sun, 9 Jun 2024 23:28:59 -0400
Subject: [PATCH] remove NIX_PATH settings

---
 flake.nix               | 20 +++++---------------
 modules/baseline.nix    |  2 +-
 modules/cli/default.nix | 13 +------------
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/flake.nix b/flake.nix
index e1d2db4..ce3df9d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,20 +14,6 @@
 
       forAllSystems = lib.genAttrs [ "x86_64-linux" ];
 
-      pins = {
-        nix.registry.nixpkgs.to = {
-          inherit (nixpkgs) rev;
-          owner = "NixOS";
-          repo = "nixpkgs";
-          type = "github";
-        };
-        nix.registry.bck.to = {
-          owner = "buckley310";
-          repo = "nixos-config";
-          type = "github";
-        };
-      };
-
     in
     {
       formatter = forAllSystems (system:
@@ -47,9 +33,13 @@
 
       nixosModules =
         {
-          inherit pins;
           inherit (impermanence.nixosModules) impermanence;
           pkgs.nixpkgs.overlays = [ (_: mypkgs) ];
+          pins.nix.registry.bck.to = {
+            owner = "buckley310";
+            repo = "nixos-config";
+            type = "github";
+          };
         } //
         self.lib.dirToAttrs ./modules import;
 
diff --git a/modules/baseline.nix b/modules/baseline.nix
index 7434a04..630962b 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -38,7 +38,7 @@
   networking.usePredictableInterfaceNames = lib.mkDefault false;
 
   nix = {
-    nixPath = [ ];
+    nixPath = [ "nixpkgs=flake:nixpkgs" ];
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 84ea0d9..735b42f 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -163,16 +163,5 @@
     alias day='date "+%Y-%m-%d"'
     alias grep='grep --color=auto'
     alias tmp='cd "$(mktemp -d)"'
-  '' +
-  # compatibility for programs that need $NIX_PATH set:
-  lib.concatMapStrings
-    (x: ''
-      alias ${x}='NIX_PATH="nixpkgs=$(nix eval nixpkgs#path)" ${x}'
-    '')
-    [
-      "nix-build"
-      "nix-index"
-      "nix-prefetch-github"
-      "nix-shell"
-    ];
+  '';
 }