Merge pull request 'Remove nonfree software' (#113) from feat/fucking-free into main

Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/113
Reviewed-by: teutat3s <teutates@mailbox.org>

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,7 +5,8 @@ let
   cfg = config.pub-solar.graphical;
   yamlFormat = pkgs.formats.yaml { };
   recursiveMerge = attrList:
-    let f = attrPath:
+    let
+      f = attrPath:
         zipAttrsWith (n: values:
           if tail values == [ ]
           then head values
@@ -15,7 +16,8 @@ let
           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;