From 552b2ee53e5103284b0e2de77d1c446e94b33452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Sun, 14 Aug 2022 14:15:02 +0200
Subject: [PATCH] Remove nonfree software

This commit removes the default, global `allowUnfree = true;` setting
and removes nonfree packages where I could find them. Tested by building
the `PubSolarOS` host once.
---
 flake.nix                     |  4 +++-
 modules/graphical/default.nix | 25 +++++++++++++------------
 modules/printing/default.nix  |  4 ----
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/flake.nix b/flake.nix
index f18df6d..d6be04d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,7 +66,9 @@
       {
         inherit self inputs;
 
-        channelsConfig = { allowUnfree = true; };
+        channelsConfig = {
+          # allowUnfree = true;
+        };
 
         supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
 
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index 0bb9781..a506c2e 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -5,17 +5,19 @@ let
   cfg = config.pub-solar.graphical;
   yamlFormat = pkgs.formats.yaml { };
   recursiveMerge = attrList:
-    let f = attrPath:
-      zipAttrsWith (n: values:
-        if tail values == [ ]
-        then head values
-        else if all isList values
-        then unique (concatLists values)
-        else if all isAttrs values
-        then f (attrPath ++ [ n ]) values
-        else last values
-      );
-    in f [ ] attrList;
+    let
+      f = attrPath:
+        zipAttrsWith (n: values:
+          if tail values == [ ]
+          then head values
+          else if all isList values
+          then unique (concatLists values)
+          else if all isAttrs values
+          then f (attrPath ++ [ n ]) values
+          else last values
+        );
+    in
+    f [ ] attrList;
 in
 {
   options.pub-solar.graphical = {
@@ -77,7 +79,6 @@ in
 
     fonts.enableDefaultFonts = true;
     fonts.fonts = with pkgs; [
-      corefonts
       fira-code
       fira-code-symbols
       google-fonts
diff --git a/modules/printing/default.nix b/modules/printing/default.nix
index ea9ce16..4688c84 100644
--- a/modules/printing/default.nix
+++ b/modules/printing/default.nix
@@ -21,10 +21,6 @@ in
     services.printing.defaultShared = false;
     services.printing.drivers = [
       pkgs.gutenprint
-      pkgs.brgenml1lpr
-      pkgs.brgenml1cupswrapper
-      pkgs.brlaser
-      pkgs.cups-brother-hl3140cw
     ];
     hardware.sane = {
       enable = true;