Compare commits

...

3 Commits

8 changed files with 115 additions and 87 deletions

View File

@ -202,10 +202,10 @@ with pkgs;
# Limit the memory and CPU use of Nix # Limit the memory and CPU use of Nix
systemd.services.nixos-upgrade.serviceConfig = { systemd.services.nixos-upgrade.serviceConfig = {
MemoryHigh = [ "500M" ]; MemoryHigh = [ "500M" ];
MemoryMax = [ "2048M" ]; MemoryMax = [ "2G" ];
CPUWeight = [ "20" ]; MemorySwapMax = [ "500M" ];
CPUQuota = [ "85%" ]; CPUWeight = [ "50" ];
IOWeight = [ "20" ]; CPUQuota = [ "50%" ];
}; };
# Configure git for auto-upgrade # Configure git for auto-upgrade

View File

@ -15,8 +15,16 @@
}; };
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, agenix, nixos-hardware outputs =
, nix-matrix-appservices, ... }@inputs: {
self,
nixpkgs,
nixpkgs-unstable,
agenix,
nixos-hardware,
nix-matrix-appservices,
...
}@inputs:
let let
system = "aarch64-linux"; system = "aarch64-linux";
@ -26,7 +34,8 @@
lib = nixpkgs.lib; lib = nixpkgs.lib;
in { in
{
nixosConfigurations.zion = lib.nixosSystem { nixosConfigurations.zion = lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = [

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with pkgs; with pkgs;
@ -11,7 +16,8 @@ let
conn_max_lifetime = -1; conn_max_lifetime = -1;
}; };
in { in
{
# Matrix server configuration # Matrix server configuration
services.dendrite = { services.dendrite = {
enable = true; enable = true;
@ -34,16 +40,31 @@ in {
"/var/lib/matrix-as-telegram/telegram-registration.yaml" "/var/lib/matrix-as-telegram/telegram-registration.yaml"
]; ];
}; };
media_api = { inherit database; }; media_api = {
room_server = { inherit database; }; inherit database;
push_server = { inherit database; }; };
room_server = {
inherit database;
};
push_server = {
inherit database;
};
mscs = { mscs = {
inherit database; inherit database;
mscs = [ "msc2836" "msc2946" ]; mscs = [
"msc2836"
"msc2946"
];
};
sync_api = {
inherit database;
};
key_server = {
inherit database;
};
federation_api = {
inherit database;
}; };
sync_api = { inherit database; };
key_server = { inherit database; };
federation_api = { inherit database; };
user_api = { user_api = {
account_database = database; account_database = database;
device_database = database; device_database = database;
@ -85,7 +106,7 @@ in {
facebook = { facebook = {
port = 8228; port = 8228;
format = "mautrix-python"; format = "mautrix-python";
package = mautrix-facebook; package = mautrix-meta;
serviceConfig.EnvironmentFile = config.age.secrets.facebook.path; serviceConfig.EnvironmentFile = config.age.secrets.facebook.path;
settings = { settings = {
appservice.database = "$DB_STRING"; appservice.database = "$DB_STRING";
@ -93,39 +114,7 @@ in {
bridge.permissions."@coolneng:coolneng.duckdns.org" = "admin"; bridge.permissions."@coolneng:coolneng.duckdns.org" = "admin";
}; };
}; };
signal = {
port = 8338;
format = "mautrix-python";
package = mautrix-signal;
serviceConfig = {
EnvironmentFile = config.age.secrets.signal.path;
StateDirectory = [ "matrix-as-signal" "signald" ];
JoinNamespaceOf = "signald.service";
SupplementaryGroups = [ "signald" ];
}; };
settings = {
appservice.database = "$DB_STRING";
homeserver.software = "standard";
bridge.permissions."@coolneng:coolneng.duckdns.org" = "admin";
signal = {
socket_path = config.services.signald.socketPath;
outgoing_attachment_dir = "/var/lib/signald/tmp";
};
};
};
};
};
# Additional settings for mautrix-signal
services.signald = {
enable = true;
user = "matrix-as-signal";
};
systemd.services.matrix-as-signal = {
requires = [ "signald.service" ];
after = [ "signald.service" ];
unitConfig.JoinsNamespaceOf = "signald.service";
path = [ ffmpeg ];
}; };
# Enable voice messages for facebook # Enable voice messages for facebook
@ -135,9 +124,16 @@ in {
services.mosquitto = { services.mosquitto = {
enable = true; enable = true;
dataDir = "/vault/mosquitto"; dataDir = "/vault/mosquitto";
logType = [ "websockets" "error" "warning" "notice" "information" ]; logType = [
"websockets"
"error"
"warning"
"notice"
"information"
];
logDest = [ "syslog" ]; logDest = [ "syslog" ];
listeners = [{ listeners = [
{
users.homeostasis = { users.homeostasis = {
acl = [ "write #" ]; acl = [ "write #" ];
hashedPasswordFile = config.age.secrets.mqtt-sender.path; hashedPasswordFile = config.age.secrets.mqtt-sender.path;
@ -146,7 +142,8 @@ in {
acl = [ "read #" ]; acl = [ "read #" ];
hashedPasswordFile = config.age.secrets.mqtt-receiver.path; hashedPasswordFile = config.age.secrets.mqtt-receiver.path;
}; };
}]; }
];
}; };
} }

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with pkgs; with pkgs;

View File

@ -1,4 +1,10 @@
{ config, pkgs, lib, ... }: { {
config,
pkgs,
lib,
...
}:
{
# Set up Gitea with LFS support # Set up Gitea with LFS support
services.gitea = { services.gitea = {
enable = true; enable = true;

View File

@ -1,12 +1,21 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "usb_storage" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"usb_storage"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@ -117,8 +126,7 @@
options = [ "bind" ]; options = [ "bind" ];
}; };
swapDevices = swapDevices = [ { device = "/dev/disk/by-uuid/835f9dd4-cc27-4443-b5e1-381c2f4b2afc"; } ];
[{ device = "/dev/disk/by-uuid/835f9dd4-cc27-4443-b5e1-381c2f4b2afc"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with pkgs; with pkgs;
@ -56,20 +61,20 @@ with pkgs;
postgres.enable = true; postgres.enable = true;
smartctl.enable = true; smartctl.enable = true;
}; };
scrapeConfigs = [{ scrapeConfigs = [
{
job_name = "zion"; job_name = "zion";
static_configs = [{ static_configs = [
{
targets = [ targets = [
"localhost:${toString config.services.prometheus.exporters.node.port}" "localhost:${toString config.services.prometheus.exporters.node.port}"
"localhost:${ "localhost:${toString config.services.prometheus.exporters.postgres.port}"
toString config.services.prometheus.exporters.postgres.port "localhost:${toString config.services.prometheus.exporters.smartctl.port}"
}" ];
"localhost:${ }
toString config.services.prometheus.exporters.smartctl.port ];
}" }
]; ];
}];
}];
}; };
# Grafana configuration # Grafana configuration

View File

@ -42,7 +42,6 @@ in
protocol = "duckdns"; protocol = "duckdns";
domains = [ "coolneng.duckdns.org" ]; domains = [ "coolneng.duckdns.org" ];
passwordFile = config.age.secrets.ddclient.path; passwordFile = config.age.secrets.ddclient.path;
extraConfig = "";
}; };
# Firewall configuration # Firewall configuration
@ -58,11 +57,6 @@ in
wireguard_port # Wireguard wireguard_port # Wireguard
53 # DNS 53 # DNS
]; ];
extraCommands = ''
iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o ${
config.systemd.network.networks."24-home".name
} -j MASQUERADE
'';
}; };
# Wireguard setup # Wireguard setup
@ -110,7 +104,11 @@ in
bogus-priv = true; bogus-priv = true;
no-resolv = true; no-resolv = true;
listen-address = [ "127.0.0.1" "192.168.13.2" "10.8.0.1" ]; listen-address = [
"127.0.0.1"
"192.168.13.2"
"10.8.0.1"
];
bind-interfaces = true; bind-interfaces = true;
server = [ "127.0.0.1#43" ]; server = [ "127.0.0.1#43" ];