From 53f7cf6e83ca9a777e62ed18bc8859ddff5609b3 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 29 Jun 2023 14:17:38 +0800 Subject: [PATCH] chore: reformat codebase --- hosts/plover/modules/services/bind.nix | 4 +- hosts/plover/modules/services/postgresql.nix | 39 +++++++++--------- hosts/plover/modules/services/wireguard.nix | 42 ++++++++++---------- modules/home-manager/profiles/dev.nix | 16 ++++---- shells/gnome.nix | 2 +- 5 files changed, 55 insertions(+), 48 deletions(-) diff --git a/hosts/plover/modules/services/bind.nix b/hosts/plover/modules/services/bind.nix index 694ddeb1..04bec375 100644 --- a/hosts/plover/modules/services/bind.nix +++ b/hosts/plover/modules/services/bind.nix @@ -210,9 +210,9 @@ in }; }; - networking.firewall ={ + networking.firewall = { allowedUDPPorts = [ - 53 # DNS + 53 # DNS 853 # DNS-over-TLS/DNS-over-QUIC ]; allowedTCPPorts = [ 53 853 ]; diff --git a/hosts/plover/modules/services/postgresql.nix b/hosts/plover/modules/services/postgresql.nix index 06ac4d5d..29406881 100644 --- a/hosts/plover/modules/services/postgresql.nix +++ b/hosts/plover/modules/services/postgresql.nix @@ -33,16 +33,18 @@ in ${lib.concatStringsSep "\n" perUserSchemas} ''; - settings = let - credsDir = path: "/run/credentials/postgresql.service/${path}"; - in { - # Still doing the secure schema usage pattern. - search_path = "\"$user\""; + settings = + let + credsDir = path: "/run/credentials/postgresql.service/${path}"; + in + { + # Still doing the secure schema usage pattern. + search_path = "\"$user\""; - ssl_cert_file = credsDir "cert.pem"; - ssl_key_file = credsDir "key.pem"; - ssl_ca_file = credsDir "fullchain.pem"; - }; + ssl_cert_file = credsDir "cert.pem"; + ssl_key_file = credsDir "key.pem"; + ssl_ca_file = credsDir "fullchain.pem"; + }; }; # With a database comes a dumping. @@ -58,15 +60,16 @@ in # Setting this up for TLS. systemd.services.postgresql = { requires = [ "acme-finished-${postgresqlDomain}.target" ]; - serviceConfig.LoadCredential = let - certDirectory = config.security.acme.certs."${postgresqlDomain}".directory; - certCredentialPath = path: "${path}:${certDirectory}/${path}"; - in - [ - (certCredentialPath "cert.pem") - (certCredentialPath "key.pem") - (certCredentialPath "fullchain.pem") - ]; + serviceConfig.LoadCredential = + let + certDirectory = config.security.acme.certs."${postgresqlDomain}".directory; + certCredentialPath = path: "${path}:${certDirectory}/${path}"; + in + [ + (certCredentialPath "cert.pem") + (certCredentialPath "key.pem") + (certCredentialPath "fullchain.pem") + ]; }; security.acme.certs."${postgresqlDomain}".postRun = '' diff --git a/hosts/plover/modules/services/wireguard.nix b/hosts/plover/modules/services/wireguard.nix index 9e004124..59db3941 100644 --- a/hosts/plover/modules/services/wireguard.nix +++ b/hosts/plover/modules/services/wireguard.nix @@ -16,30 +16,32 @@ in { environment.systemPackages = [ pkgs.wireguard-tools ]; - sops.secrets = let - getKey = key: { - inherit key; - sopsFile = ../../secrets/secrets.yaml; - }; + sops.secrets = + let + getKey = key: { + inherit key; + sopsFile = ../../secrets/secrets.yaml; + }; - getSecrets = secrets: - (lib.mapAttrs' (name: config: - lib.nameValuePair - "plover/${name}" - ((getKey name) // config)) + getSecrets = secrets: + (lib.mapAttrs' + (name: config: + lib.nameValuePair + "plover/${name}" + ((getKey name) // config)) secrets); - systemdNetworkdPermission = { - group = config.users.users.systemd-network.group; - reloadUnits = [ "systemd-networkd.service" ]; - mode = "0640"; + systemdNetworkdPermission = { + group = config.users.users.systemd-network.group; + reloadUnits = [ "systemd-networkd.service" ]; + mode = "0640"; + }; + in + getSecrets { + "wireguard/private-key" = systemdNetworkdPermission; + "wireguard/preshared-keys/ni" = systemdNetworkdPermission; + "wireguard/preshared-keys/phone" = systemdNetworkdPermission; }; - in - getSecrets { - "wireguard/private-key" = systemdNetworkdPermission; - "wireguard/preshared-keys/ni" = systemdNetworkdPermission; - "wireguard/preshared-keys/phone" = systemdNetworkdPermission; - }; networking.firewall = { # Allow the UDP traffic for the Wireguard service. diff --git a/modules/home-manager/profiles/dev.nix b/modules/home-manager/profiles/dev.nix index 1eb29090..e9a45893 100644 --- a/modules/home-manager/profiles/dev.nix +++ b/modules/home-manager/profiles/dev.nix @@ -46,13 +46,15 @@ in { }; # A fuzzy finder that enables fuzzy finding not furry finding, a common misconception. - programs.fzf = let - fd = "${lib.getBin pkgs.fd}/bin/fd"; - in { - enable = true; - changeDirWidgetCommand = "${fd} --type d"; - defaultCommand = "${fd} --type f"; - }; + programs.fzf = + let + fd = "${lib.getBin pkgs.fd}/bin/fd"; + in + { + enable = true; + changeDirWidgetCommand = "${fd} --type d"; + defaultCommand = "${fd} --type f"; + }; # dog > sky dog > cat. programs.bat = { diff --git a/shells/gnome.nix b/shells/gnome.nix index 6050dcb3..3e3702b1 100644 --- a/shells/gnome.nix +++ b/shells/gnome.nix @@ -28,7 +28,7 @@ , nodePackages -# Rust + # Rust , cargo , rustc }: