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

@@ -66,7 +66,9 @@
       {
         inherit self inputs;
 
-        channelsConfig = { allowUnfree = true; };
+        channelsConfig = {
+          # allowUnfree = true;
+        };
 
         supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
 

modules/graphical/default.nix

@@ -5,17 +5,19 @@ let
   cfg = config.pub-solar.graphical;
   yamlFormat = pkgs.formats.yaml { };
   recursiveMerge = attrList:
-    let f = attrPath:
+    let
-      zipAttrsWith (n: values:
+      f = attrPath:
-        if tail values == [ ]
+        zipAttrsWith (n: values:
-        then head values
+          if tail values == [ ]
-        else if all isList values
+          then head values
-        then unique (concatLists values)
+          else if all isList values
-        else if all isAttrs values
+          then unique (concatLists values)
-        then f (attrPath ++ [ n ]) values
+          else if all isAttrs values
-        else last values
+          then f (attrPath ++ [ n ]) values
-      );
+          else last values
-    in f [ ] attrList;
+        );
+    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

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;