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.
This commit is contained in:
parent
524845a460
commit
552b2ee53e
|
@ -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" ];
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,8 @@ 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
|
||||||
|
f = attrPath:
|
||||||
zipAttrsWith (n: values:
|
zipAttrsWith (n: values:
|
||||||
if tail values == [ ]
|
if tail values == [ ]
|
||||||
then head values
|
then head values
|
||||||
|
@ -15,7 +16,8 @@ let
|
||||||
then f (attrPath ++ [ n ]) values
|
then f (attrPath ++ [ n ]) values
|
||||||
else last 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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue