Remove nonfree software #113

Merged
b12f merged 1 commits from feat/fucking-free into main 3 months ago
  1. 4
      flake.nix
  2. 25
      modules/graphical/default.nix
  3. 4
      modules/printing/default.nix

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

@ -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

@ -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;

Loading…
Cancel
Save