From fb6cd06936a469fad708e1095b5ee25ad1298375 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Tue, 7 Mar 2017 16:21:30 +0100
Subject: machines/aszlig: fix double definition of a set

---
 machines/aszlig/dnyarri.nix         | 9 ++++-----
 machines/aszlig/managed/brawndo.nix | 9 ++++-----
 machines/aszlig/managed/tyree.nix   | 9 ++++-----
 3 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'machines')

diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index 6789f729..fcd62513 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -1,11 +1,6 @@
 { pkgs, lib, ... }:
 
 {
-  # whitelist insecure webkitgtk
-  nixpkgs.config.permittedInsecurePackages = [
-    "webkitgtk-2.4.11"
-  ];
-
   vuizvui.user.aszlig.profiles.workstation.enable = true;
 
   nix.maxJobs = 8;
@@ -41,6 +36,10 @@
     packageOverrides = super: {
       hplip = super.hplip.override { withPlugin = true; };
     };
+    # whitelist insecure webkitgtk
+    permittedInsecurePackages = [
+      "webkitgtk-2.4.11"
+    ];
   };
 
   hardware.sane.enable = true;
diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix
index 40d2c8ec..69d6a414 100644
--- a/machines/aszlig/managed/brawndo.nix
+++ b/machines/aszlig/managed/brawndo.nix
@@ -5,11 +5,6 @@ let
   rootUUID = "dbbd5a35-3ac0-4d5a-837d-914457de14a4";
 
 in {
-  # whitelist insecure webkitgtk
-  nixpkgs.config.permittedInsecurePackages = [
-    "webkitgtk-2.4.11"
-  ];
-
   boot = {
     initrd.availableKernelModules = [
       "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod"
@@ -58,6 +53,10 @@ in {
     allowUnfree = true; # XXX: More granularity!
     chromium.enablePepperFlash = true;
     pulseaudio = true;
+    # whitelist insecure webkitgtk
+    permittedInsecurePackages = [
+      "webkitgtk-2.4.11"
+    ];
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index 873ed83c..0ceb1920 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -1,11 +1,6 @@
 { config, pkgs, unfreeAndNonDistributablePkgs, lib, ... }:
 
 {
-  # whitelist insecure webkitgtk
-  nixpkgs.config.permittedInsecurePackages = [
-    "webkitgtk-2.4.11"
-  ];
-
   boot.initrd.availableKernelModules = [ "usbhid" ];
   boot.kernelModules = [ "kvm-intel" ];
 
@@ -63,6 +58,10 @@
   nixpkgs.config = {
     pulseaudio = true;
     chromium.enablePepperFlash = true;
+    # whitelist insecure webkitgtk
+    permittedInsecurePackages = [
+      "webkitgtk-2.4.11"
+    ];
   };
 
   programs.bash.enableCompletion = true;
-- 
cgit 1.4.1