teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

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

Browse source 
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/113
Reviewed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
Benjamin Bädorf 2022-08-14 12:47:32 +00:00
parent 4f74f6ff80 552b2ee53e
commit be016c44fb
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

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

25
modules/graphical/default.nix
View file

@ -5,17 +5,19 @@ let
cfg = config.pub-solar.graphical; cfg = config.pub-solar.graphical;
yamlFormat = pkgs.formats.yaml { }; yamlFormat = pkgs.formats.yaml { };
recursiveMerge = attrList: 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 in
{ {
options.pub-solar.graphical = { options.pub-solar.graphical = {
@ -77,7 +79,6 @@ in
fonts.enableDefaultFonts = true; fonts.enableDefaultFonts = true;
fonts.fonts = with pkgs; [ fonts.fonts = with pkgs; [
corefonts
fira-code fira-code
fira-code-symbols fira-code-symbols
google-fonts google-fonts

4
modules/printing/default.nix
View file

@ -21,10 +21,6 @@ in
services.printing.defaultShared = false; services.printing.defaultShared = false;
services.printing.drivers = [ services.printing.drivers = [
pkgs.gutenprint pkgs.gutenprint
pkgs.brgenml1lpr
pkgs.brgenml1cupswrapper
pkgs.brlaser
pkgs.cups-brother-hl3140cw
]; ];
hardware.sane = { hardware.sane = {
enable = true; enable = true;