From b8ae40febd239bdd67e362c604316c4f7077c815 Mon Sep 17 00:00:00 2001 From: coolneng Date: Wed, 11 Dec 2024 22:14:07 +0100 Subject: [PATCH] Format nix files using new formatter --- flake.nix | 15 ++++- modules/communication.nix | 103 ++++++++++++++--------------- modules/device.nix | 7 +- modules/devops.nix | 8 ++- modules/hardware-configuration.nix | 16 +++-- modules/monitoring.nix | 33 +++++---- 6 files changed, 106 insertions(+), 76 deletions(-) diff --git a/flake.nix b/flake.nix index dda7d93..6561c73 100644 --- a/flake.nix +++ b/flake.nix @@ -15,8 +15,16 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, agenix, nixos-hardware - , nix-matrix-appservices, ... }@inputs: + outputs = + { + self, + nixpkgs, + nixpkgs-unstable, + agenix, + nixos-hardware, + nix-matrix-appservices, + ... + }@inputs: let system = "aarch64-linux"; @@ -26,7 +34,8 @@ lib = nixpkgs.lib; - in { + in + { nixosConfigurations.zion = lib.nixosSystem { inherit system; modules = [ diff --git a/modules/communication.nix b/modules/communication.nix index 9da5277..b31852a 100644 --- a/modules/communication.nix +++ b/modules/communication.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with pkgs; @@ -11,7 +16,8 @@ let conn_max_lifetime = -1; }; -in { +in +{ # Matrix server configuration services.dendrite = { enable = true; @@ -34,16 +40,31 @@ in { "/var/lib/matrix-as-telegram/telegram-registration.yaml" ]; }; - media_api = { inherit database; }; - room_server = { inherit database; }; - push_server = { inherit database; }; + media_api = { + inherit database; + }; + room_server = { + inherit database; + }; + push_server = { + inherit database; + }; mscs = { 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 = { account_database = database; device_database = database; @@ -85,7 +106,7 @@ in { facebook = { port = 8228; format = "mautrix-python"; - package = mautrix-facebook; + package = mautrix-meta; serviceConfig.EnvironmentFile = config.age.secrets.facebook.path; settings = { appservice.database = "$DB_STRING"; @@ -93,41 +114,9 @@ in { 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 systemd.services.matrix-as-facebook.path = [ ffmpeg ]; @@ -135,18 +124,26 @@ in { services.mosquitto = { enable = true; dataDir = "/vault/mosquitto"; - logType = [ "websockets" "error" "warning" "notice" "information" ]; + logType = [ + "websockets" + "error" + "warning" + "notice" + "information" + ]; logDest = [ "syslog" ]; - listeners = [{ - users.homeostasis = { - acl = [ "write #" ]; - hashedPasswordFile = config.age.secrets.mqtt-sender.path; - }; - users.prometheus = { - acl = [ "read #" ]; - hashedPasswordFile = config.age.secrets.mqtt-receiver.path; - }; - }]; + listeners = [ + { + users.homeostasis = { + acl = [ "write #" ]; + hashedPasswordFile = config.age.secrets.mqtt-sender.path; + }; + users.prometheus = { + acl = [ "read #" ]; + hashedPasswordFile = config.age.secrets.mqtt-receiver.path; + }; + } + ]; }; } diff --git a/modules/device.nix b/modules/device.nix index b9b99b0..537bab0 100644 --- a/modules/device.nix +++ b/modules/device.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with pkgs; diff --git a/modules/devops.nix b/modules/devops.nix index dad751b..b7d76dd 100644 --- a/modules/devops.nix +++ b/modules/devops.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, ... }: { +{ + config, + pkgs, + lib, + ... +}: +{ # Set up Gitea with LFS support services.gitea = { enable = true; diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix index 41bd683..d9c3370 100644 --- a/modules/hardware-configuration.nix +++ b/modules/hardware-configuration.nix @@ -1,12 +1,21 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { 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.kernelModules = [ ]; boot.extraModulePackages = [ ]; @@ -117,8 +126,7 @@ options = [ "bind" ]; }; - swapDevices = - [{ device = "/dev/disk/by-uuid/835f9dd4-cc27-4443-b5e1-381c2f4b2afc"; }]; + swapDevices = [ { device = "/dev/disk/by-uuid/835f9dd4-cc27-4443-b5e1-381c2f4b2afc"; } ]; # 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 diff --git a/modules/monitoring.nix b/modules/monitoring.nix index 70137e2..d9ac3dd 100644 --- a/modules/monitoring.nix +++ b/modules/monitoring.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with pkgs; @@ -56,20 +61,20 @@ with pkgs; postgres.enable = true; smartctl.enable = true; }; - scrapeConfigs = [{ - job_name = "zion"; - static_configs = [{ - targets = [ - "localhost:${toString config.services.prometheus.exporters.node.port}" - "localhost:${ - toString config.services.prometheus.exporters.postgres.port - }" - "localhost:${ - toString config.services.prometheus.exporters.smartctl.port - }" + scrapeConfigs = [ + { + job_name = "zion"; + static_configs = [ + { + targets = [ + "localhost:${toString config.services.prometheus.exporters.node.port}" + "localhost:${toString config.services.prometheus.exporters.postgres.port}" + "localhost:${toString config.services.prometheus.exporters.smartctl.port}" + ]; + } ]; - }]; - }]; + } + ]; }; # Grafana configuration