oysteikt
/
nix-dotfiles
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to 22.05

main
Oystein Kristoffer Tveit 2022-06-12 00:23:10 +02:00
parent 8e3f28bc31
commit 2eae0e5ebf
4 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.nix
View File

@ -2,10 +2,10 @@
description = "Mmmmmh, Spaghetti™";
inputs = {
nixpkgs.url = "nixpkgs/nixos-21.11";
nixpkgs.url = "nixpkgs/nixos-22.05";
home-manager = {
url = "github:nix-community/home-manager/release-21.11";
url = "github:nix-community/home-manager/release-22.05";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -97,7 +97,7 @@
};
username = "h7x4";
homeDirectory = "/home/h7x4";
stateVersion = "21.11";
stateVersion = "22.05";
configuration = {
imports = [

2
home.nix
View File

@ -39,7 +39,7 @@ in {
];
home = {
stateVersion = "21.11";
stateVersion = "22.05";
username = "h7x4";
homeDirectory = "/home/h7x4";
file = {

3
hosts/common.nix
View File

@ -115,7 +115,8 @@ in {
liberation_ttf
migmix
noto-fonts
noto-fonts-cjk
noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-emoji
open-sans
source-han-sans

93
hosts/tsuki/services/matrix.nix
View File

@ -3,64 +3,59 @@
# TODO: configure synapse to point users to coturn
services.matrix-synapse = {
enable = true;
turn_uris = let
inherit (config.services.coturn) realm;
p = toString secrets.ports.matrix.default;
in ["turn:${realm}:${p}?transport=udp" "turn:${realm}:${p}?transport=tcp"];
turn_shared_secret = config.services.coturn.static-auth-secret;
turn_user_lifetime = "1h";
settings = {
turn_uris = let
inherit (config.services.coturn) realm;
p = toString secrets.ports.matrix.default;
in ["turn:${realm}:${p}?transport=udp" "turn:${realm}:${p}?transport=tcp"];
turn_shared_secret = config.services.coturn.static-auth-secret;
turn_user_lifetime = "1h";
server_name = "nani.wtf";
public_baseurl = "https://matrix.nani.wtf";
server_name = "nani.wtf";
public_baseurl = "https://matrix.nani.wtf";
registration_shared_secret = secrets.keys.matrix.registration-shared-secret;
registration_shared_secret = secrets.keys.matrix.registration-shared-secret;
enable_metrics = true;
enable_metrics = true;
listeners = [
{
port = secrets.ports.matrix.listener;
bind_address = "::1";
type = "http";
tls = false;
x_forwarded = true;
resources = [
{
names = [ "client" "federation" "metrics" ];
compress = false;
}
];
}
];
listeners = [
{
port = secrets.ports.matrix.listener;
bind_address = "::1";
type = "http";
tls = false;
x_forwarded = true;
resources = [
{
names = [ "client" "federation" "metrics" ];
compress = false;
}
];
}
];
enable_registration = false;
enable_registration = false;
# password_config.enabled = lib.mkForce false;
# password_config.enabled = lib.mkForce false;
dataDir = "/data/var/matrix";
dataDir = "/data/var/matrix";
database_type = "psycopg2";
database_args = {
password = "synapse";
database_type = "psycopg2";
database_args = {
password = "synapse";
};
# TODO: Figure out a way to do this declaratively.
# The files need to be owned by matrix-synapse
app_service_config_files = [
"/var/lib/matrix-synapse/discord-registration.yaml"
# (pkgs.writeText "facebook-registrations.yaml" (builtins.toJSON config.services.mautrix-facebook.registrationData))
"/var/lib/matrix-synapse/facebook-registration.yaml"
];
# redis.enabled = true;
max_upload_size = "100M";
};
# TODO: Figure out a way to do this declaratively.
# The files need to be owned by matrix-synapse
app_service_config_files = [
"/var/lib/matrix-synapse/discord-registration.yaml"
# (pkgs.writeText "facebook-registrations.yaml" (builtins.toJSON config.services.mautrix-facebook.registrationData))
"/var/lib/matrix-synapse/facebook-registration.yaml"
];
# redis.enabled = true;
max_upload_size = "100M";
# settings = {
# };
};
services.redis.enable = true;