colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

update nixos-21.11 -> nixos-22.05

Browse Source
This commit is contained in:
Colin 2022-05-28 12:35:43 -07:00
parent 6318e66314
commit 7ae8526771
3 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -39,16 +39,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1653229824, "lastModified": 1653504306,
"narHash": "sha256-klSCYMpR4TqWYoTD/xZ2qM9UIPRFC6pK+S/kJuVLbFw=", "narHash": "sha256-bqjEskV+/tqOQqSEaCu4e6uWZ0F7ekBiMR16xpn4V0k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "06db2e2197401b74fcf82d4e84be15b0b5851c7b", "rev": "6efc186e6079ff3f328a2497ff3d36741ac60f6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-21.11", "ref": "nixos-22.05",
"type": "indirect" "type": "indirect"
} }
}, },

2
flake.nix
View File

@ -4,7 +4,7 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-21.11"; nixpkgs.url = "nixpkgs/nixos-22.05";
pkgs-unstable.url = "nixpkgs/nixos-unstable"; pkgs-unstable.url = "nixpkgs/nixos-unstable";
pkgs-gitea.url = "nixpkgs/c777cdf5c564015d5f63b09cc93bef4178b19b01"; pkgs-gitea.url = "nixpkgs/c777cdf5c564015d5f63b09cc93bef4178b19b01";
# pkgs-telegram.url = "nixpkgs/33775ec9a2173a08e46edf9f46c9febadbf743e8";# 2022/04/18; telegram 3.7.3. fails: nix log /nix/store/y5kv47hnv55qknb6cnmpcyraicay79fx-telegram-desktop-3.7.3.drv: g++: fatal error: cannot execute '/nix/store/njk5sbd21305bhr7gwibxbbvgbx5lxvn-gcc-9.3.0/libexec/gcc/aarch64-unknown-linux-gnu/9.3.0/cc1plus': execv: No such file or directory # pkgs-telegram.url = "nixpkgs/33775ec9a2173a08e46edf9f46c9febadbf743e8";# 2022/04/18; telegram 3.7.3. fails: nix log /nix/store/y5kv47hnv55qknb6cnmpcyraicay79fx-telegram-desktop-3.7.3.drv: g++: fatal error: cannot execute '/nix/store/njk5sbd21305bhr7gwibxbbvgbx5lxvn-gcc-9.3.0/libexec/gcc/aarch64-unknown-linux-gnu/9.3.0/cc1plus': execv: No such file or directory

67
machines/uninsane/services/matrix.nix
View File

@ -4,19 +4,19 @@
{ {
services.matrix-synapse.enable = true; services.matrix-synapse.enable = true;
services.matrix-synapse.server_name = "uninsane.org"; services.matrix-synapse.settings.server_name = "uninsane.org";
# services.matrix-synapse.enable_registration_captcha = true; # services.matrix-synapse.enable_registration_captcha = true;
# services.matrix-synapse.enable_registration_without_verification = true; # services.matrix-synapse.enable_registration_without_verification = true;
services.matrix-synapse.enable_registration = true; services.matrix-synapse.settings.enable_registration = true;
# services.matrix-synapse.registration_shared_secret = "<shared key goes here>"; # services.matrix-synapse.registration_shared_secret = "<shared key goes here>";
# default for listeners is port = 8448, tls = true, x_forwarded = false. # default for listeners is port = 8448, tls = true, x_forwarded = false.
# we change this because the server is situated behind nginx. # we change this because the server is situated behind nginx.
services.matrix-synapse.listeners = [ services.matrix-synapse.settings.listeners = [
{ {
port = 8008; port = 8008;
bind_address = "127.0.0.1"; bind_addresses = [ "127.0.0.1" ];
type = "http"; type = "http";
tls = false; tls = false;
x_forwarded = true; x_forwarded = true;
@ -34,26 +34,45 @@
# admin_contact: "admin.matrix@uninsane.org" # admin_contact: "admin.matrix@uninsane.org"
# ''; # '';
services.matrix-synapse.extraConfig = '' services.matrix-synapse.settings.admin_contact = "admin.matrix@uninsane.org";
admin_contact: "admin.matrix@uninsane.org" services.matrix-synapse.settings.registrations_require_3pid = [ "email" ];
registrations_require_3pid: services.matrix-synapse.settings.email = {
- email smtp_host = "mx.uninsane.org";
email: smtp_port = 587;
smtp_host: "mx.uninsane.org" smtp_user = "matrix-synapse";
smtp_port: 587 smtp_pass = secrets.matrix-synapse.smtp_pass;
smtp_user: "matrix-synapse" require_transport_security = true;
smtp_pass: "${secrets.matrix-synapse.smtp_pass}" enable_tls = true;
require_transport_security: true notif_from = "%(app)s <notify.matrix@uninsane.org>";
enable_tls: true app_name = "Uninsane Matrix";
notif_from: "%(app)s <notify.matrix@uninsane.org>" enable_notifs = true;
app_name: "Uninsane Matrix" validation_token_lifetime = "96h";
enable_notifs: true invite_client_location = "https://web.matrix.uninsane.org";
validation_token_lifetime: 96h subjects = {
invite_client_location: "https://web.matrix.uninsane.org" email_validation = "[%(server_name)s] Validate your email";
subjects: };
email_validation: "[%(server_name)s] Validate your email" };
'';
services.matrix-synapse.app_service_config_files = [ # services.matrix-synapse.extraConfigFiles = [builtins.toFile "matrix-synapse-extra-config" ''
# admin_contact: "admin.matrix@uninsane.org"
# registrations_require_3pid:
# - email
# email:
# smtp_host: "mx.uninsane.org"
# smtp_port: 587
# smtp_user: "matrix-synapse"
# smtp_pass: "${secrets.matrix-synapse.smtp_pass}"
# require_transport_security: true
# enable_tls: true
# notif_from: "%(app)s <notify.matrix@uninsane.org>"
# app_name: "Uninsane Matrix"
# enable_notifs: true
# validation_token_lifetime: 96h
# invite_client_location: "https://web.matrix.uninsane.org"
# subjects:
# email_validation: "[%(server_name)s] Validate your email"
# ''];
services.matrix-synapse.settings.app_service_config_files = [
"/var/lib/matrix-appservice-irc/registration.yml" # auto-created by irc appservice "/var/lib/matrix-appservice-irc/registration.yml" # auto-created by irc appservice
]; ];