something something cumulative updates

This commit is contained in:
Rouven Seifert 2025-03-26 20:29:32 +01:00
parent 1d50fdc0e2
commit 3d382ef13c
14 changed files with 73 additions and 62 deletions

View file

@ -43,6 +43,9 @@ let
nuc = {
A = [ "141.30.227.6" ];
};
avm = {
A = [ "141.30.30.20" ];
};
falkenstein = {
A = [ "23.88.121.184" ];
AAAA = [ "2a01:4f8:c012:49de::1" ];

View file

@ -7,6 +7,9 @@ in
993
4190
];
environment.systemPackages = [
pkgs.dovecot_pigeonhole
];
services = {
dovecot2 = {
enable = true;
@ -50,9 +53,6 @@ in
specialUse = "Archive";
};
};
modules = [
pkgs.dovecot_pigeonhole
];
sieve = {
# just pot something in here to prevent empty strings
extensions = [ "notify" ];

View file

@ -6,9 +6,9 @@ in
age.secrets.authentik-core = {
file = ../../../../secrets/nuc/authentik/core.age;
};
age.secrets.authentik-ldap = {
file = ../../../../secrets/nuc/authentik/ldap.age;
};
# age.secrets.authentik-ldap = {
# file = ../../../../secrets/nuc/authentik/ldap.age;
# };
services.authentik = {
enable = true;
environmentFile = config.age.secrets.authentik-core.path;
@ -21,10 +21,10 @@ in
"${domain}.key:/var/lib/caddy/certificates/acme-v02.api.letsencrypt.org-directory/${domain}/${domain}.key"
];
services.authentik-ldap = {
enable = true;
environmentFile = config.age.secrets.authentik-ldap.path;
};
# services.authentik-ldap = {
# enable = true;
# environmentFile = config.age.secrets.authentik-ldap.path;
# };
services.caddy.virtualHosts."${domain}".extraConfig = ''
reverse_proxy localhost:9000
'';

View file

@ -63,12 +63,12 @@ in
# If we don't explicitly set {a,h}s_token, mautrix-telegram will try to read them from the registrationFile
# and write them to the settingsFile in /nix/store, which obviously fails.
systemd.services.mautrix-telegram.serviceConfig.ExecStart =
lib.mkForce (pkgs.writeShellScript "start" ''
export MAUTRIX_TELEGRAM_APPSERVICE_AS_TOKEN=$(grep as_token ${registrationFileMautrix} | cut -d' ' -f2-)
export MAUTRIX_TELEGRAM_APPSERVICE_HS_TOKEN=$(grep hs_token ${registrationFileMautrix} | cut -d' ' -f2-)
# systemd.services.mautrix-telegram.serviceConfig.ExecStart =
# lib.mkForce (pkgs.writeShellScript "start" ''
# export MAUTRIX_TELEGRAM_APPSERVICE_AS_TOKEN=$(grep as_token ${registrationFileMautrix} | cut -d' ' -f2-)
# export MAUTRIX_TELEGRAM_APPSERVICE_HS_TOKEN=$(grep hs_token ${registrationFileMautrix} | cut -d' ' -f2-)
${pkgs.mautrix-telegram}/bin/mautrix-telegram --config='${settingsFile}'
'');
# ${pkgs.mautrix-telegram}/bin/mautrix-telegram --config='${settingsFile}'
# '');
}

View file

@ -8,12 +8,17 @@
./modules/graphics
./modules/greetd
./modules/networks
./modules/printing
# ./modules/printing
./modules/security
./modules/sound
./modules/virtualisation
];
# services.influxdb2 = {
# enable = true;
# };
nix.settings.system-features = [ "gccarch-tigerlake" ];
systemd.additionalUpstreamSystemUnits = [
"soft-reboot.target"
@ -147,10 +152,6 @@
fwupd.enable = true; # firmware updates
avahi.enable = true;
btrfs.autoScrub.enable = true;
mullvad-vpn = {
enable = true;
enableExcludeWrapper = false;
};
};
hardware.bluetooth = {
enable = true;
@ -184,4 +185,5 @@
};
environment.systemPackages = [ pkgs.man-pages ];
system.stateVersion = "22.11";
# programs.java.enable = true;
}

View file

@ -97,6 +97,10 @@
authProtocols = [ "WPA-PSK" ];
extraConfig = "disabled=1";
};
"RoboLab Playground" = {
psk = "ext:ROBOLAB_PSK";
authProtocols = [ "WPA-PSK" ];
};
};
};
systemd.services = {