From b923275f93004b5dcd696899790d7af7781e0295 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 7 Nov 2017 11:00:45 +0100
Subject: Use same nixpkgs configuration for unstable channel

---
 modules/configuration/nix.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'modules/configuration')

diff --git a/modules/configuration/nix.nix b/modules/configuration/nix.nix
index 504942ec..bed00b7a 100644
--- a/modules/configuration/nix.nix
+++ b/modules/configuration/nix.nix
@@ -13,11 +13,18 @@
     };
   };
 
+  nixpkgs.config = {
+    packageOverrides = pkgs: {
+      unstable = import <nixos-unstable> {
+        config = config.nixpkgs.config;
+      };
+    };
+  };
+
   system.autoUpgrade = {
     enable = true;
   };
   systemd.services.nixos-upgrade = {
-    environment.NIXPKGS_ALLOW_UNFREE = "1";
     script = ''
       ${config.system.build.nixos-rebuild}/bin/nixos-rebuild boot ${toString config.system.autoUpgrade.flags}
     '';
-- 
cgit 1.4.1