From 7504a4d8f7fcc15c2b59783f0531cf803072b78e Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Fri, 18 Feb 2022 11:50:16 -0500
Subject: [PATCH] remove /etc/nixpkgs

---
 flake.nix                    | 1 -
 modules/baseline.nix         | 1 +
 modules/cli/default.nix      | 1 +
 modules/profiles/desktop.nix | 5 +----
 modules/profiles/server.nix  | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index a359bfb..e81efab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,7 +46,6 @@
       nixosModule = {
         imports = builtins.attrValues self.nixosModules;
         nixpkgs.overlays = [
-          (_: _: { nixpkgs_src = toString nixpkgs; })
           (_: mypkgs)
         ];
       };
diff --git a/modules/baseline.nix b/modules/baseline.nix
index 20ade64..fc845d4 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -30,6 +30,7 @@
   '';
 
   nix = {
+    nixPath = [ ];
     package = pkgs.nixFlakes;
     daemonCPUSchedPolicy = "idle";
     extraOptions = ''
diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 4c53ef2..c898b62 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -94,6 +94,7 @@
     alias hd='hexdump -C'
     alias catc='${pkgs.vimpager-latest}/bin/vimpager --force-passthrough'
     alias nix-env="echo nix-env is disabled #"
+    alias nix-index='nix-index -f="$(nix eval nixpkgs#path)"'
     alias nix-what-depends-on='nix-store --query --referrers'
     alias day='date "+%Y-%m-%d"'
   '';
diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix
index 529e4b6..9794c94 100644
--- a/modules/profiles/desktop.nix
+++ b/modules/profiles/desktop.nix
@@ -11,9 +11,6 @@ with lib;
 
     fonts.fonts = [ pkgs.bck-nerdfont ];
 
-    environment.etc.nixpkgs.source = pkgs.nixpkgs_src;
-    nix.nixPath = [ "nixpkgs=/etc/nixpkgs" ];
-
     environment.variables.MOZ_ENABLE_WAYLAND = "1";
     environment.variables.MOZ_USE_XINPUT2 = "1";
 
@@ -32,7 +29,7 @@ with lib;
       tdesktop
       youtube-dl
 
-      (writeShellScriptBin "nr" "exec nix repl ${pkgs.nixpkgs_src}")
+      (writeShellScriptBin "nr" "exec nix repl \"$(nix eval nixpkgs#path)\"")
 
       (mpv-with-scripts.override { scripts = [ mpvScripts.mpris ]; })
 
diff --git a/modules/profiles/server.nix b/modules/profiles/server.nix
index 21725dc..a3435b1 100644
--- a/modules/profiles/server.nix
+++ b/modules/profiles/server.nix
@@ -5,7 +5,6 @@ with lib;
     services.logind.lidSwitch = "ignore";
     services.openssh.enable = true;
     documentation.nixos.enable = false;
-    nix.nixPath = [ ];
     nix.gc = {
       automatic = true;
       options = "--delete-older-than 30d";