5 files changed, 32 insertions, 18 deletions
diff --git a/modules/retired/blocky/default.nix b/modules/retired/blocky/default.nix
index ca58f4f..302ef8e 100644
--- a/modules/retired/blocky/default.nix
+++ b/modules/retired/blocky/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 {
   services.blocky = {
     enable = true;
@@ -11,10 +11,10 @@
           "149.112.112.112"
         ];
       };
-      bootstrapDns = [{
+      bootstrapDns = lib.singleton {
         upstream = "https://dns.quad9.net/dns-query";
         ips = [ "9.9.9.9" ];
-      }];
+      };
       ports = {
         dns = 53;
         tls = 853;
@@ -87,7 +87,11 @@
   };
 
   networking.firewall = {
-    allowedTCPPorts = [ 53 443 853 ];
+    allowedTCPPorts = [
+      53
+      443
+      853
+    ];
     allowedUDPPorts = [ 53 ];
   };
 }
diff --git a/modules/retired/forgejo/default.nix b/modules/retired/forgejo/default.nix
index 9db55b2..cf4e101 100644
--- a/modules/retired/forgejo/default.nix
+++ b/modules/retired/forgejo/default.nix
@@ -1,4 +1,10 @@
-{ inputs, config, lib, pkgs, ... }:
+{
+  inputs,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   domain = "git.tdback.net";
   port = 3000;
@@ -37,7 +43,8 @@ in
       password = config.age.secrets.forgejoAdminPass.path;
       user = "tdback";
       email = "tyler@tdback.net";
-    in ''
+    in
+    ''
       ${adminCmd} create --admin --email ${email} --username ${user} --password "$(tr -d '\n' < ${password})" || true
     '';
 
diff --git a/modules/retired/mumble/default.nix b/modules/retired/mumble/default.nix
index 29e3339..fa08d64 100644
--- a/modules/retired/mumble/default.nix
+++ b/modules/retired/mumble/default.nix
@@ -5,7 +5,7 @@
     package = pkgs.murmur;
     port = 64738;
     openFirewall = true;
-    environmentFile =  "/var/lib/murmur/murmurd.env";
+    environmentFile = "/var/lib/murmur/murmurd.env";
     password = "$MURMURD_PASSWORD";
   };
 }
diff --git a/modules/retired/navidrome/default.nix b/modules/retired/navidrome/default.nix
index 30a6b3f..aeb8f18 100644
--- a/modules/retired/navidrome/default.nix
+++ b/modules/retired/navidrome/default.nix
@@ -1,10 +1,9 @@
-{ lib, ... }:
+{ ... }:
 let
   directory = "/opt/navidrome";
 in
 {
-  systemd.tmpfiles.rules =
-    map (x: "d ${x} 0755 share share - -") (lib.lists.singleton directory);
+  systemd.tmpfiles.rules = builtins.map (x: "d ${x} 0755 share share - -") [ directory ];
 
   virtualisation.oci-containers.containers.navidrome = {
     image = "deluan/navidrome:latest";
diff --git a/modules/retired/pihole/default.nix b/modules/retired/pihole/default.nix
index 034c91b..3a95f8a 100644
--- a/modules/retired/pihole/default.nix
+++ b/modules/retired/pihole/default.nix
@@ -1,15 +1,15 @@
-{ inputs, config, lib, ... }:
+{
+  inputs,
+  config,
+  ...
+}:
 let
-  # TODO: Think about changing this to config.networking.interface...
-  # Will have to pull the first value in the list, which might be messy but it
-  # will definitely make it more producible across machines.
   ip = "10.0.0.203";
   interface = "eno1";
   directory = "/opt/pihole";
 in
 {
-  systemd.tmpfiles.rules =
-    map (x: "d ${x} 0755 share share - -") (lib.lists.singleton directory);
+  systemd.tmpfiles.rules = builtins.map (x: "d ${x} 0755 share share - -") [ directory ];
 
   virtualisation.oci-containers.containers.pihole = {
     image = "pihole/pihole:latest";
@@ -41,12 +41,16 @@ in
   systemd.services.podman-pihole.postStart =
     let
       password = config.age.secrets.piholeAdminPass.path;
-    in ''
+    in
+    ''
       podman exec -it pihole pihole -a -p "$(tr -d '\n' < ${password})"
     '';
 
   networking.firewall = {
-    allowedTCPPorts = [ 53 80 ];
+    allowedTCPPorts = [
+      53
+      80
+    ];
     allowedUDPPorts = [ 53 ];
   };
 }