machines/aszlig/managed: Remove allowUnfree

The only package which pretty much is a major nuisance is Skype here and
we really need to find a way to add it to the system without actually
building it. But for now, let's mark it explicitly as unfree and
non-distributable.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

2 files changed, 5 insertions, 7 deletions

diff --git a/machines/aszlig/managed/notsure.nix b/machines/aszlig/managed/notsure.nix
index 70f1ee62..cafb4d03 100644
--- a/machines/aszlig/managed/notsure.nix
+++ b/machines/aszlig/managed/notsure.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, unfreeAndNonDistributablePkgs, lib, ... }:
 
 let
   rootUUID = "ata-WDC_WD7500BPVT-22HXZT3_WD-WX71A9124879";
@@ -33,7 +33,6 @@ in {
   nix.maxJobs = 2;
 
   nixpkgs.config = {
-    allowUnfree = true;
     chromium.enablePepperFlash = true;
     pulseaudio = true;
   };
@@ -53,7 +52,7 @@ in {
     pavucontrol
     pulseaudioFull
     samba
-    skype
+    unfreeAndNonDistributablePkgs.skype
     thunderbird
     vuizvui.tomahawk
     wine
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index fe3e2f69..d896b249 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, unfreeAndNonDistributablePkgs, lib, ... }:
 
 {
   boot.initrd.availableKernelModules = [ "usbhid" ];
@@ -9,8 +9,8 @@
 
   environment.systemPackages = with pkgs; [
     cdparanoia chromium figlet gajim gimp htop inkscape kde5.gwenview
-    libreoffice mosh mpv pciutils skype thunderbird vlc vuizvui.tomahawk wget
-    wine youtubeDL
+    libreoffice mosh mpv pciutils unfreeAndNonDistributablePkgs.skype
+    thunderbird vlc vuizvui.tomahawk wget wine youtubeDL
   ];
 
   fileSystems."/boot".device = "/dev/disk/by-uuid/A0D5-269D";
@@ -51,7 +51,6 @@
   '';
 
   nixpkgs.config = {
-    allowUnfree = true;
     pulseaudio = true;
     chromium.enablePepperFlash = true;
   };