From 643cb31750377cdb6337f15b97bb301e18ff0ece Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sun, 31 May 2020 18:58:29 +0100
Subject: [PATCH] porcorosso: try installing lutris

---
 ops/nixos/lib/common.nix         |  2 +-
 ops/nixos/porcorosso/default.nix |  8 ++------
 third_party/default.nix          | 12 ++++++++++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ops/nixos/lib/common.nix b/ops/nixos/lib/common.nix
index f8bae699ac..5477b88e1e 100644
--- a/ops/nixos/lib/common.nix
+++ b/ops/nixos/lib/common.nix
@@ -11,7 +11,7 @@ in
     binaryCaches = lib.mkForce [ "https://cache.nixos.org/" ];
     trustedBinaryCaches = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ];
   };
-  nixpkgs.config = { allowUnfree = true; };
+  nixpkgs.config = depot.third_party.nixpkgsConfig;
 
   i18n.defaultLocale = "en_GB.UTF-8";
   console.keyMap = "us";
diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix
index 4b48dc8d17..3f1ee84ea2 100644
--- a/ops/nixos/porcorosso/default.nix
+++ b/ops/nixos/porcorosso/default.nix
@@ -109,12 +109,6 @@ in {
     fontconfig.penultimate.enable = true;
   };
 
-  #hardware.nvidia.prime.offload.enable = true;
-  #hardware.nvidia.prime = {
-  #  intelBusId = "PCI:0:2:0";
-  #  nvidiaBusId = "PCI:1:0:0";
-  #};
-
   hardware.u2f.enable = true;
   services.udev.packages = [ pkgs.libu2f-host ];
   services.pcscd.enable = true;
@@ -175,9 +169,11 @@ in {
       graphicsmagick-imagemagick-compat
       iotop
       iw
+      lutris
       pavucontrol
       rxvt_unicode
       teamspeak_client
+      vulkan-tools
       whois
       xclip
       yubioath-desktop
diff --git a/third_party/default.nix b/third_party/default.nix
index 574778478e..a665815ca2 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -1,7 +1,15 @@
 { ... }:
-
+let nixpkgsConfig = {
+  allowUnfree = true;
+  permittedInsecurePackages = [
+    "p7zip-16.02"
+  ];
+}; in
 {
-  nixpkgs = import ./nixpkgs { config.allowUnfree = true; };
+  inherit nixpkgsConfig;
+  nixpkgs = import ./nixpkgs {
+    config = nixpkgsConfig;
+  };
   nixos = import ./nixpkgs/nixos;
   nixeval = import ./nixpkgs/nixos/lib/eval-config.nix;
 }