From 1ebef6815ce76a4e709b130ad1e276367ffb74bf Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Thu, 2 Mar 2023 07:30:03 +0100
Subject: [PATCH] fix: network/traefik config on darwin

---
 flake.nix                      | 3 ---
 machines/bento/default.nix     | 4 +---
 machines/common.nix            | 5 +----
 machines/futomaki/default.nix  | 4 +---
 machines/futomaki/hardware.nix | 1 -
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0edcb00..c7a5dc9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,7 +60,6 @@
             ({config, ...}: {
               config = {
                 nixpkgs.overlays = [overlays];
-                nixpkgs.config.allowUnfree = true;
                 home-manager = {
                   useGlobalPkgs = true;
                   sharedModules = [sops.homeManagerModules.sops];
@@ -84,7 +83,6 @@
             ({config, ...}: {
               config = {
                 nixpkgs.overlays = [overlays];
-                nixpkgs.config.allowUnfree = true;
                 home-manager = {
                   useGlobalPkgs = true;
                   sharedModules = [sops.homeManagerModules.sops];
@@ -111,7 +109,6 @@
             ({config, ...}: {
               config = {
                 nixpkgs.overlays = [overlays];
-                nixpkgs.config.allowUnfree = true;
                 home-manager = {
                   useGlobalPkgs = true;
                   backupFileExtension = "backup";
diff --git a/machines/bento/default.nix b/machines/bento/default.nix
index e8526f3..72a6b2b 100644
--- a/machines/bento/default.nix
+++ b/machines/bento/default.nix
@@ -5,9 +5,7 @@
 }: let
   mainUser = "w";
 in {
-  nixpkgs.config.allowUnfree = true;
-
-  imports = [./hardware.nix];
+  imports = [./hardware.nix ../traefik.nix ../network.nix];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
diff --git a/machines/common.nix b/machines/common.nix
index f1fb75c..5c98697 100644
--- a/machines/common.nix
+++ b/machines/common.nix
@@ -3,10 +3,7 @@
   pkgs,
   ...
 }: {
-  imports = [
-    ./network.nix
-  ];
-
+  nixpkgs.config.allowUnfree = true;
   nix = {
     gc.automatic = true;
     settings = {
diff --git a/machines/futomaki/default.nix b/machines/futomaki/default.nix
index 8e1395c..a544f5e 100644
--- a/machines/futomaki/default.nix
+++ b/machines/futomaki/default.nix
@@ -5,9 +5,7 @@
 }: let
   mainUser = "winston";
 in {
-  nixpkgs.config.allowUnfree = true;
-
-  imports = [./hardware.nix];
+  imports = [./hardware.nix ../traefik.nix ../network.nix];
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
diff --git a/machines/futomaki/hardware.nix b/machines/futomaki/hardware.nix
index 966fadb..485209a 100644
--- a/machines/futomaki/hardware.nix
+++ b/machines/futomaki/hardware.nix
@@ -65,7 +65,6 @@
   hardware.video.hidpi.enable = lib.mkDefault true;
 
   # fuck you, nvidia
-  nixpkgs.config.allowUnfree = true;
   services.xserver.videoDrivers = ["nvidia"];
   hardware.opengl.enable = true;
   hardware.nvidia.modesetting.enable = true;