From 8ca92d1d2015edc8619a1b159380510f219e8f5d Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 17 May 2016 02:00:54 +0200 Subject: 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 --- machines/aszlig/managed/tyree.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'machines/aszlig/managed/tyree.nix') 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; }; -- cgit 1.4.1