Cleanup lib use, move to std where possible, use upstream nvim module

This commit is contained in:
Kat Inskip 2023-07-30 10:02:03 -07:00
parent aa5c67c13a
commit 11dd6aabd5
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
19 changed files with 53 additions and 515 deletions

View file

@ -1,15 +1,5 @@
{config, ...}: let
fqdn = "${config.networking.hostName}.${config.networking.domain}";
clientConfig = {
"m.homeserver".base_url = "https://${fqdn}";
"m.identity_server".base_url = "https://vector.im";
};
serverConfig."m.server" = "${fqdn}:443";
mkWellKnown = data: ''
add_header Content-Type application/json;
add_header Access-Control-Allow-Origin *;
return 200 '${builtins.toJSON data}';
'';
in {
services.nginx = {
virtualHosts = {

View file

@ -4,10 +4,11 @@
prev,
...
}: let
inherit (lib.modules) mkForce;
start = prev.config.systemd.services.matrix-synapse.serviceConfig.ExecStart;
synapse_cfgfile = builtins.head (builtins.match "^.*--config-path ([^\ ]*).*$" "${start}");
in {
systemd.services.matrix-synapse.serviceConfig.ExecStart = lib.mkForce (
systemd.services.matrix-synapse.serviceConfig.ExecStart = mkForce (
builtins.replaceStrings ["${synapse_cfgfile}"] ["${config.scalpel.trafos."homeserver.yaml".destination} "] "${start}"
);
scalpel.trafos."homeserver.yaml" = {

View file

@ -15,14 +15,14 @@ in {
rc_messages_per_second = mkDefault 0.1;
rc_message_burst_count = mkDefault 25;
public_baseurl = "https://${fqdn}";
url_preview_enabled = mkDefault true;
enable_registration = mkDefault false;
enable_metrics = mkDefault true;
report_stats = mkDefault false;
dynamic_thumbnails = mkDefault true;
url_preview_enabled = true;
enable_registration = false;
enable_metrics = true;
report_stats = false;
dynamic_thumbnails = true;
registration_shared_secret = "!!MATRIX_SHARED_REGISTRATION_SECRET!!";
allow_guest_access = mkDefault true;
suppress_key_server_warning = mkDefault true;
allow_guest_access = true;
suppress_key_server_warning = true;
listeners = [
{
port = 8009;

View file

@ -5,10 +5,11 @@
...
}: let
inherit (lib.strings) addContextFrom;
inherit (lib.modules) mkForce;
start = prev.config.systemd.services.telegraf.serviceConfig.ExecStart;
telegraf_cfgfile = builtins.head (builtins.match "^.*-config ([^\ ]*).*$" "${start}");
in {
systemd.services.telegraf.serviceConfig.ExecStart = lib.mkForce (
systemd.services.telegraf.serviceConfig.ExecStart = mkForce (
builtins.replaceStrings ["${telegraf_cfgfile}"] ["${config.scalpel.trafos."config.toml".destination} "] "${start}"
);
scalpel.trafos."config.toml" = {

View file

@ -1,10 +1,4 @@
{
config,
pkgs,
lib,
...
}:
with lib; {
_: {
users.users.vaultwarden.name = "bitwarden_rs";
users.groups.vaultwarden.name = "bitwarden_rs";