From 6072e90cd1f65fc118d09d9c1dce0b96ce2c5486 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 25 Apr 2018 15:18:11 +0200
Subject: =?UTF-8?q?=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nixpkgs.nix | 6 ++++++
 ymir.nix    | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixpkgs.nix b/nixpkgs.nix
index 23bf960b..cc390073 100644
--- a/nixpkgs.nix
+++ b/nixpkgs.nix
@@ -3,5 +3,11 @@
 {
   config = {
     nixpkgs.pkgs = import ./nixpkgs { inherit (config.nixpkgs) config overlays localSystem crossSystem; };
+
+    nix.nixPath = lib.mkForce [
+      "nixpkgs=${./nixpkgs}"
+      "nixos-config=/etc/nixos/configuration.nix"
+      "/nix/var/nix/profiles/per-user/root/channels"
+    ];
   };
 }
diff --git a/ymir.nix b/ymir.nix
index 297cb896..1c0610f1 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -34,6 +34,7 @@ let
 in rec {
   imports =
     [
+      ./nixpkgs.nix
       ./ymir/hw.nix
       ./ymir/mlmmj-expose.nix
       ./custom/zsh.nix
@@ -60,8 +61,6 @@ in rec {
     "net.ipv4.tcp_keepalive_probes" = 6;
   };
 
-  nixpkgs.pkgs = import ./nixpkgs { inherit (config.nixpkgs) config overlays localSystem crossSystem; };
-
   nixpkgs.config.allowUnfree = true;
 
   nixpkgs.overlays = [
-- 
cgit v1.2.3