From ebde93a2867703fb255d932085350822fe90c595 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 27 Oct 2024 17:28:20 +0100 Subject: [PATCH] style: fix formatting --- hosts/nachtigall/configuration.nix | 1 - hosts/underground/configuration.nix | 15 +++++-- hosts/underground/hardware-configuration.nix | 45 ++++++++++++------- hosts/underground/networking.nix | 10 ++++- modules/matrix/default.nix | 4 +- .../nginx-matrix/element-client-config.nix | 7 ++- secrets/secrets.nix | 3 +- 7 files changed, 59 insertions(+), 26 deletions(-) diff --git a/hosts/nachtigall/configuration.nix b/hosts/nachtigall/configuration.nix index f49be98..69b191c 100644 --- a/hosts/nachtigall/configuration.nix +++ b/hosts/nachtigall/configuration.nix @@ -82,7 +82,6 @@ owner = "matrix-synapse"; }; - pub-solar-os.matrix-synapse = { enable = true; sliding-sync.enable = true; diff --git a/hosts/underground/configuration.nix b/hosts/underground/configuration.nix index b53f5dd..131cb16 100644 --- a/hosts/underground/configuration.nix +++ b/hosts/underground/configuration.nix @@ -79,10 +79,16 @@ { name = "oauth"; } { name = "compat"; } { name = "graphql"; } - { name = "assets"; path = "${config.services.matrix-authentication-service.package}/share/matrix-authentication-service/assets"; } + { + name = "assets"; + path = "${config.services.matrix-authentication-service.package}/share/matrix-authentication-service/assets"; + } ]; binds = [ - { host = "0.0.0.0"; port = 8090; } + { + host = "0.0.0.0"; + port = 8090; + } ]; proxy_protocol = false; } @@ -92,7 +98,10 @@ { name = "health"; } ]; binds = [ - { host = "0.0.0.0"; port = 8081; } + { + host = "0.0.0.0"; + port = 8081; + } ]; proxy_protocol = false; } diff --git a/hosts/underground/hardware-configuration.nix b/hosts/underground/hardware-configuration.nix index e4738a1..28ab939 100644 --- a/hosts/underground/hardware-configuration.nix +++ b/hosts/underground/hardware-configuration.nix @@ -1,14 +1,27 @@ # 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 + "/profiles/qemu-guest.nix") - ]; + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ + "ahci" + "xhci_pci" + "virtio_pci" + "virtio_scsi" + "sd_mod" + "sr_mod" + ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -16,19 +29,19 @@ device = "/dev/disk/by-label/cryptroot"; }; - fileSystems."/" = - { device = "/dev/disk/by-label/root"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-label/root"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-label/boot"; - fsType = "ext4"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-label/boot"; + fsType = "ext4"; + }; - swapDevices = - [ { device = "/dev/disk/by-label/swap"; } - ]; + swapDevices = [ + { device = "/dev/disk/by-label/swap"; } + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/hosts/underground/networking.nix b/hosts/underground/networking.nix index 3085c7b..0f08a7e 100644 --- a/hosts/underground/networking.nix +++ b/hosts/underground/networking.nix @@ -13,11 +13,17 @@ address = "80.244.242.1"; interface = "enp1s0"; }; - nameservers = ["95.129.51.51" "80.244.244.244"]; + nameservers = [ + "95.129.51.51" + "80.244.244.244" + ]; interfaces.enp1s0 = { useDHCP = false; ipv4.addresses = [ - { address = "80.244.242.3"; prefixLength = 29; } + { + address = "80.244.242.3"; + prefixLength = 29; + } ]; }; }; diff --git a/modules/matrix/default.nix b/modules/matrix/default.nix index c0bee63..1d95597 100644 --- a/modules/matrix/default.nix +++ b/modules/matrix/default.nix @@ -16,13 +16,13 @@ in app-service-config-files = lib.mkOption { description = "List of app service config files"; type = lib.types.listOf lib.types.str; - default = []; + default = [ ]; }; extra-config-files = lib.mkOption { description = "List of extra synapse config files"; type = lib.types.listOf lib.types.str; - default = []; + default = [ ]; }; signing_key_path = lib.mkOption { diff --git a/modules/nginx-matrix/element-client-config.nix b/modules/nginx-matrix/element-client-config.nix index 617d3bc..80fed55 100644 --- a/modules/nginx-matrix/element-client-config.nix +++ b/modules/nginx-matrix/element-client-config.nix @@ -1,4 +1,9 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: { default_server_config = { "m.homeserver" = { diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 402fc79..7165ba6 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -70,7 +70,8 @@ in "nachtigall-matrix-synapse-sliding-sync-secret.age".publicKeys = nachtigallKeys ++ adminKeys; "underground-matrix-synapse-secret-config.yaml.age".publicKeys = undergroundKeys ++ adminKeys; - "underground-matrix-authentication-service-secret-config.yml.age".publicKeys = undergroundKeys ++ adminKeys; + "underground-matrix-authentication-service-secret-config.yml.age".publicKeys = + undergroundKeys ++ adminKeys; "nextcloud-secrets.age".publicKeys = nachtigallKeys ++ adminKeys; "nextcloud-admin-pass.age".publicKeys = nachtigallKeys ++ adminKeys;