Merge remote-tracking branches 'origin/update_flake_lock_action', 'origin/use-attic-chir-rs', 'origin/add-brscan4' and 'origin/disable-async-media'

This commit is contained in:
Charlotte 🦝 Delenk 2023-03-10 22:02:04 +01:00
commit 11a2670099
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
6 changed files with 10 additions and 6 deletions

View file

@ -243,7 +243,7 @@
];
hardware.enableRedistributableFirmware = true;
nix.settings.substituters = lib.mkForce [
"https://cache.chir.rs/"
"https://attic.chir.rs/chir-rs/"
"https://cache.nixos.org/"
];
nix.daemonCPUSchedPolicy = "idle";

View file

@ -1,4 +1,8 @@
{pkgs, ...}: {
{
pkgs,
nixpkgs,
...
}: {
services.printing = {
enable = true;
drivers = with pkgs; [
@ -20,4 +24,8 @@
};
networking.firewall.interfaces.wg0.allowedUDPPorts = [631];
networking.firewall.interfaces.wg0.allowedTCPPorts = [631];
imports = ["${nixpkgs}/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix"];
hardware.sane.enable = true;
hardware.sane.brscan4.enable = true;
}

View file

@ -10,7 +10,6 @@
homeserver = {
address = "https://matrix.int.chir.rs";
domain = "chir.rs";
async_media = true;
};
appservice = {
database = {

View file

@ -15,7 +15,6 @@
address = "https://matrix.int.chir.rs";
domain = "chir.rs";
http_retry_count = 1000;
async_media = true;
};
appservice = {
max_body_size = 10;

View file

@ -15,7 +15,6 @@
address = "https://matrix.int.chir.rs";
domain = "chir.rs";
http_retry_count = 1000;
async_media = true;
};
appservice = {
address = "http://localhost:29317";

View file

@ -10,7 +10,6 @@
homeserver = {
address = "https://matrix.int.chir.rs";
domain = "chir.rs";
async_media = true;
};
appservice = {
database = {