momo/main: merge main branch #219

Merged
b12f merged 13 commits from momo-merge-main into momo/main 2023-04-24 10:50:48 +00:00
4 changed files with 1 additions and 17 deletions
Showing only changes of commit 972e3f1569 - Show all commits

View file

@ -21,7 +21,7 @@
system-features = ["nixos-test" "benchmark" "big-parallel" "kvm"];
};
# Generally useful nix option defaults
extraOptions = ''
extraOptions = lib.mkForce ''
min-free = 536870912
keep-outputs = true
keep-derivations = true

View file

@ -1,13 +0,0 @@
{
pkgs,
lib,
...
}: let
folder = ./.;
toImport = name: value: folder + ("/" + name);
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
in {
inherit imports;
nix.settings.substituters = ["https://cache.nixos.org/"];
}

View file

@ -7,8 +7,6 @@
}: let
inherit (lib) fileContents;
in {
imports = [../cachix];
config = {
pub-solar.audio.mopidy.enable = true;
pub-solar.audio.bluetooth.enable = true;

View file

@ -7,7 +7,6 @@
}: let
inherit (lib) fileContents;
in {
imports = [../cachix];
config = {
pub-solar.graphical.wayland.software-renderer.enable = true;
pub-solar.sway.terminal = "foot";