Compare commits
3 Commits
151d60f329
...
ddaa465004
Author | SHA1 | Date | |
---|---|---|---|
ddaa465004
|
|||
7ae65a4f88
|
|||
c17ee693dc
|
24
flake.lock
generated
24
flake.lock
generated
@@ -108,11 +108,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721266288,
|
"lastModified": 1721417620,
|
||||||
"narHash": "sha256-MsyTzXu9CJVcBr44ct8ILKF/Ro7VlF+tVZTylzAoXSs=",
|
"narHash": "sha256-6q9b1h8fI3hXg2DG6/vrKWCeG8c5Wj2Kvv22RCgedzg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47",
|
"rev": "bec6e3cde912b8acb915fecdc509eda7c973fb42",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -407,11 +407,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721331912,
|
"lastModified": 1721413321,
|
||||||
"narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=",
|
"narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be",
|
"rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -478,11 +478,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721138476,
|
"lastModified": 1721379653,
|
||||||
"narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=",
|
"narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ad0b5eed1b6031efaed382844806550c3dcb4206",
|
"rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -509,11 +509,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1721226092,
|
"lastModified": 1721409541,
|
||||||
"narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=",
|
"narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c716603a63aca44f39bef1986c13402167450e0a",
|
"rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@@ -65,6 +65,10 @@
|
|||||||
matrix-synapse = {
|
matrix-synapse = {
|
||||||
enable = true;
|
enable = true;
|
||||||
usePostgresql = databases.postgresql.enable;
|
usePostgresql = databases.postgresql.enable;
|
||||||
|
bridges = [
|
||||||
|
"signal"
|
||||||
|
"whatsapp"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
nginx.enable = true;
|
nginx.enable = true;
|
||||||
photoprism.enable = true;
|
photoprism.enable = true;
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, inputs, ... }:
|
{ config, lib, inputs, ... }:
|
||||||
|
|
||||||
let cfg = config.modules.desktop.browsers.firefox;
|
let cfg = config.modules.desktop.browsers.firefox;
|
||||||
in {
|
in {
|
||||||
|
@@ -62,11 +62,16 @@ in {
|
|||||||
};
|
};
|
||||||
permissions = {
|
permissions = {
|
||||||
"${cfg.serverName}" = "user";
|
"${cfg.serverName}" = "user";
|
||||||
|
"@jordan:vimium.com" = "admin";
|
||||||
};
|
};
|
||||||
provisioning = {
|
provisioning = {
|
||||||
shared_secret = "disable";
|
shared_secret = "disable";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
homeserver = {
|
||||||
|
address = "https://matrix.${cfg.serverName}";
|
||||||
|
domain = cfg.serverName;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
matrixClientConfig = {
|
matrixClientConfig = {
|
||||||
"m.homeserver" = {
|
"m.homeserver" = {
|
||||||
@@ -175,8 +180,13 @@ in {
|
|||||||
max_upload_size = "100M";
|
max_upload_size = "100M";
|
||||||
report_stats = false;
|
report_stats = false;
|
||||||
server_name = cfg.serverName;
|
server_name = cfg.serverName;
|
||||||
|
app_service_config_files = (lib.optional (lib.elem "mautrix-whatsapp" cfg.bridges)
|
||||||
|
"/var/lib/mautrix-whatsapp/whatsapp-registration.yaml");
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
systemd.services.matrix-synapse.serviceConfig.SupplementaryGroups =
|
||||||
|
(lib.optional (lib.elem "mautrix-whatsapp" cfg.bridges)
|
||||||
|
config.systemd.services.mautrix-whatsapp.serviceConfig.Group);
|
||||||
|
|
||||||
services.postgresql = lib.mkIf cfg.usePostgresql {
|
services.postgresql = lib.mkIf cfg.usePostgresql {
|
||||||
ensureUsers = [
|
ensureUsers = [
|
||||||
@@ -203,7 +213,7 @@ in {
|
|||||||
backfill = true;
|
backfill = true;
|
||||||
max_initial_conversations = -1;
|
max_initial_conversations = -1;
|
||||||
message_count = 50;
|
message_count = 50;
|
||||||
request_full_sync = false;
|
request_full_sync = true;
|
||||||
};
|
};
|
||||||
mute_bridging = true;
|
mute_bridging = true;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user