From 008777d83f10849c9d4014f80a3b66570f6bb2fd Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Mon, 29 Mar 2021 19:39:26 -0400
Subject: firelink update

---
 flake.nix           | 12 +++---------
 modules/builder.nix |  2 +-
 modules/gaming.nix  |  3 ++-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index f38389e..bf13ba8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,10 +7,10 @@
 
   # TODO: Remove nix overlay when pull request is resolved:
   # https://github.com/NixOS/nix/pull/4566
-  inputs.nix.url = "github:orbekk/nix/master";
-  inputs.nix.inputs.nixpkgs.follows = "nixpkgs";
+  # inputs.nix.url = "github:orbekk/nix/master";
+  # inputs.nix.inputs.nixpkgs.follows = "nixpkgs";
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, nix, nixos-hardware, home-manager }:
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager }:
     let
       pkgs-module = {config, ...}:
         let
@@ -83,12 +83,6 @@
                       lastModified = pkgs.lib.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101");
                     in
                     "${lastModified}.${self.shortRev or "dirty"}";
-
-                  nixpkgs.overlays = [
-                    # For git+file support with bare repo.
-                    nix.overlay
-                    (final: prev: { nixFlakes = final.nix; })
-                  ];
                 })
               ];
           };
diff --git a/modules/builder.nix b/modules/builder.nix
index fb0740a..b265a5a 100644
--- a/modules/builder.nix
+++ b/modules/builder.nix
@@ -13,7 +13,7 @@ in
     nix.buildMachines = [ {
       sshUser = "builder";
       hostName = "dragon.orbekk.com";
-      systems = ["x86_64-linux"];
+      systems = ["x86_64-linux" "i686-linux" ];
       maxJobs = 2;
       speedFactor = 2;
       supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
diff --git a/modules/gaming.nix b/modules/gaming.nix
index 2b61861..684fe93 100644
--- a/modules/gaming.nix
+++ b/modules/gaming.nix
@@ -7,7 +7,7 @@ let
 
   overlay = final: prev: {
     steam = pkgs'.steam.override {
-      nativeOnly = true;
+      # nativeOnly = true;
       withJava = true;
       extraPkgs = p: with pkgs';
         let xorgdeps = with xorg; [
@@ -68,6 +68,7 @@ in {
   config = lib.mkIf cfg.enable {
     nixpkgs.overlays = [ overlay ];
 
+    # nixpkgs.config.allowBroken = true;
     nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
       "steam"
     ];
-- 
cgit v1.2.3