summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-04-25 15:18:11 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-04-25 15:18:11 +0200
commit6072e90cd1f65fc118d09d9c1dce0b96ce2c5486 (patch)
tree784ef6741df3627198bdd8cdd7990dc6af2ea2f2
parentc43176e445d2f0c2fdba524068807e5139abb566 (diff)
downloadnixos-6072e90cd1f65fc118d09d9c1dce0b96ce2c5486.tar
nixos-6072e90cd1f65fc118d09d9c1dce0b96ce2c5486.tar.gz
nixos-6072e90cd1f65fc118d09d9c1dce0b96ce2c5486.tar.bz2
nixos-6072e90cd1f65fc118d09d9c1dce0b96ce2c5486.tar.xz
nixos-6072e90cd1f65fc118d09d9c1dce0b96ce2c5486.zip
-rw-r--r--nixpkgs.nix6
-rw-r--r--ymir.nix3
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 @@
3{ 3{
4 config = { 4 config = {
5 nixpkgs.pkgs = import ./nixpkgs { inherit (config.nixpkgs) config overlays localSystem crossSystem; }; 5 nixpkgs.pkgs = import ./nixpkgs { inherit (config.nixpkgs) config overlays localSystem crossSystem; };
6
7 nix.nixPath = lib.mkForce [
8 "nixpkgs=${./nixpkgs}"
9 "nixos-config=/etc/nixos/configuration.nix"
10 "/nix/var/nix/profiles/per-user/root/channels"
11 ];
6 }; 12 };
7} 13}
diff --git a/ymir.nix b/ymir.nix
index 297cb896..1c0610f1 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -34,6 +34,7 @@ let
34in rec { 34in rec {
35 imports = 35 imports =
36 [ 36 [
37 ./nixpkgs.nix
37 ./ymir/hw.nix 38 ./ymir/hw.nix
38 ./ymir/mlmmj-expose.nix 39 ./ymir/mlmmj-expose.nix
39 ./custom/zsh.nix 40 ./custom/zsh.nix
@@ -60,8 +61,6 @@ in rec {
60 "net.ipv4.tcp_keepalive_probes" = 6; 61 "net.ipv4.tcp_keepalive_probes" = 6;
61 }; 62 };
62 63
63 nixpkgs.pkgs = import ./nixpkgs { inherit (config.nixpkgs) config overlays localSystem crossSystem; };
64
65 nixpkgs.config.allowUnfree = true; 64 nixpkgs.config.allowUnfree = true;
66 65
67 nixpkgs.overlays = [ 66 nixpkgs.overlays = [