summary refs log tree commit diff stats
path: root/modules/configuration
diff options
context:
space:
mode:
authorAlan Pearce2017-11-07 11:00:45 +0100
committerAlan Pearce2017-11-07 11:00:45 +0100
commitb923275f93004b5dcd696899790d7af7781e0295 (patch)
tree9cb5300fdc67b0c41cee5c8726804af816d438a0 /modules/configuration
parent334a760e340ac9e57f15afe5c61f21509e7c0fa4 (diff)
downloadnixos-configuration-b923275f93004b5dcd696899790d7af7781e0295.tar.lz
nixos-configuration-b923275f93004b5dcd696899790d7af7781e0295.tar.zst
nixos-configuration-b923275f93004b5dcd696899790d7af7781e0295.zip
Use same nixpkgs configuration for unstable channel
Diffstat (limited to 'modules/configuration')
-rw-r--r--modules/configuration/nix.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/modules/configuration/nix.nix b/modules/configuration/nix.nix
index 504942e..bed00b7 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}
     '';