diff --git a/modules/fediverse/default.nix b/modules/fediverse/default.nix
index 8235ead..dce215f 100644
--- a/modules/fediverse/default.nix
+++ b/modules/fediverse/default.nix
@@ -7,7 +7,6 @@ in
   services.gotosocial = {
     enable = true;
     package = pkgs.unstable.gotosocial;
-
     settings = {
       application-name = "gotosocial";
       host = "${domain}";
diff --git a/modules/forgejo/default.nix b/modules/forgejo/default.nix
index d0cf0cf..f6dc27e 100644
--- a/modules/forgejo/default.nix
+++ b/modules/forgejo/default.nix
@@ -41,6 +41,13 @@ in
       ${adminCmd} create --admin --email ${email} --username ${user} --password "$(tr -d '\n' < ${pwd})" || true
     '';
 
+  services.openssh.settings.AllowUsers = [ "forgejo" ];
+
+  services.caddy.virtualHosts."${domain}".extraConfig = ''
+    encode zstd gzip
+    reverse_proxy http://localhost:${builtins.toString port}
+  '';
+
   age.secrets.forgejoRunnerToken.file = ../../secrets/forgejoRunnerToken.age;
   services.gitea-actions-runner = {
     package = pkgs.unstable.forgejo-runner;
@@ -55,11 +62,4 @@ in
       ];
     };
   };
-
-  services.openssh.settings.AllowUsers = [ "forgejo" ];
-
-  services.caddy.virtualHosts."${domain}".extraConfig = ''
-    encode zstd gzip
-    reverse_proxy http://localhost:${builtins.toString port}
-  '';
 }
diff --git a/modules/immich/default.nix b/modules/immich/default.nix
index 29d0019..29767dc 100644
--- a/modules/immich/default.nix
+++ b/modules/immich/default.nix
@@ -6,20 +6,19 @@
     "${inputs.nixpkgs-unstable}/nixos/modules/services/databases/redis.nix"
   ];
 
-  services = {
-    immich = {
-      enable = true;
-      package = pkgs.unstable.immich;
-      host = "localhost";
-      port = 2283;
-      mediaLocation = "/lagoon/media/immich";
-      environment = {
-        IMMICH_LOG_LEVEL = "log";
-      };
+  services.immich = {
+    enable = true;
+    package = pkgs.unstable.immich;
+    host = "localhost";
+    port = 2283;
+    mediaLocation = "/lagoon/media/immich";
+    environment = {
+      IMMICH_LOG_LEVEL = "log";
     };
-    postgresql.package = pkgs.unstable.postgresql;
   };
 
+  services.postgresql.package = pkgs.unstable.postgresql;
+
   services.caddy.virtualHosts."photographs.tdback.net".extraConfig = ''
     encode zstd gzip
     reverse_proxy http://localhost:2283
diff --git a/modules/nvidia/default.nix b/modules/nvidia/default.nix
index d8ce9f3..50e0f6f 100644
--- a/modules/nvidia/default.nix
+++ b/modules/nvidia/default.nix
@@ -1,23 +1,15 @@
 { config, ... }:
 {
   hardware.nvidia = {
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+    open = false;
+    nvidiaSettings = true;
+    forceFullCompositionPipeline = true;
     modesetting.enable = true;
-
     powerManagement = {
       enable = false;
       finegrained = false;
     };
-
-    # Don't use the open-source driver!
-    open = false;
-
-    nvidiaSettings = true;
-
-    # Fix screen tearing.
-    forceFullCompositionPipeline = true;
-
-    # Optional, but specify version of driver.
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
 
   services.xserver.videoDrivers = [ "nvidia" ];
diff --git a/modules/podman/default.nix b/modules/podman/default.nix
index 620e0e3..1ec3406 100644
--- a/modules/podman/default.nix
+++ b/modules/podman/default.nix
@@ -2,13 +2,11 @@
 {
   virtualisation = {
     containers.enable = true;
-
+    oci-containers.backend = "podman";
     podman = {
       enable = true;
       dockerCompat = true;
       defaultNetwork.settings.dns_enabled = true;
     };
-
-    oci-containers.backend = "podman";
   };
 }
diff --git a/modules/searx/default.nix b/modules/searx/default.nix
index b22fb08..2b4a9d8 100644
--- a/modules/searx/default.nix
+++ b/modules/searx/default.nix
@@ -7,20 +7,17 @@ in
     enable = true;
     package = pkgs.searxng;
     environmentFile = "/var/lib/searx/env";
-
     settings = {
       general = {
         debug = false;
         instance_name = "searx";
       };
-
       search = {
         safe_search = 1;
         autocomplete = "duckduckgo";
         autocomplete_min = 4;
         default_lang = "en-US";
       };
-
       server = {
         port = port;
         bind_address = "0.0.0.0";
@@ -28,7 +25,6 @@ in
         public_instance = false;
         image_proxy = true;
       };
-
       ui.static_use_hash = true;
     };
   };
diff --git a/modules/sftpgo/default.nix b/modules/sftpgo/default.nix
index 110e556..a8cad25 100644
--- a/modules/sftpgo/default.nix
+++ b/modules/sftpgo/default.nix
@@ -4,7 +4,6 @@
     enable = true;
     package = pkgs.sftpgo;
     dataDir = "/var/lib/sftpgo";
-
     settings = {
       httpd.bindings = [{
         port = 8080;
diff --git a/modules/ssh/default.nix b/modules/ssh/default.nix
index 9c57a43..3587467 100644
--- a/modules/ssh/default.nix
+++ b/modules/ssh/default.nix
@@ -5,7 +5,6 @@
     startWhenNeeded = true;
     ports = [ 2222 ];
     openFirewall = true;
-
     settings = {
       AllowUsers = [ "tdback" ];
       PermitRootLogin = "no";
diff --git a/modules/xonotic/default.nix b/modules/xonotic/default.nix
index 3193857..7ae5442 100644
--- a/modules/xonotic/default.nix
+++ b/modules/xonotic/default.nix
@@ -4,7 +4,6 @@
     enable = true;
     package = pkgs.xonotic-dedicated;
     openFirewall = true;
-
     settings = {
       hostname = "tdback's Xonotic Server";
       net_address = "0.0.0.0";
diff --git a/modules/zfs/default.nix b/modules/zfs/default.nix
index ae84acb..8344450 100644
--- a/modules/zfs/default.nix
+++ b/modules/zfs/default.nix
@@ -14,10 +14,8 @@
         ZED_EMAIL_ADDR = [ "root" ];
         ZED_EMAIL_PROG = "/run/current-system/sw/bin/pushover";
         ZED_EMAIL_OPTS = "-t '@SUBJECT@'";
-
         ZED_NOTIFY_INTERVAL_SECS = 3600;
         ZED_NOTIFY_VERBOSE = true;
-
         ZED_USE_ENCLOSURE_LEDS = true;
         ZED_SCRUB_AFTER_RESILVER = true;
       };