diff --git a/hosts/common.nix b/hosts/common.nix
index b82193ef..48a9dbab 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -79,21 +79,19 @@
     }
   ];
 
-  nix = {
-    settings = {
-      substituters = [
-        "https://alyraffauf.cachix.org"
-        "https://cache.nixos.org/"
-        "https://nix-community.cachix.org"
-      ];
+  nix.settings = {
+    substituters = [
+      "https://alyraffauf.cachix.org"
+      "https://cache.nixos.org/"
+      "https://nix-community.cachix.org"
+    ];
 
-      trusted-public-keys = [
-        "alyraffauf.cachix.org-1:GQVrRGfjTtkPGS8M6y7Ik0z4zLt77O0N25ynv2gWzDM="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      ];
+    trusted-public-keys = [
+      "alyraffauf.cachix.org-1:GQVrRGfjTtkPGS8M6y7Ik0z4zLt77O0N25ynv2gWzDM="
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
 
-      trusted-users = ["aly"];
-    };
+    trusted-users = ["aly"];
   };
 
   nixpkgs.config.allowUnfree = true; # Allow unfree packages
@@ -106,49 +104,33 @@
 
       profiles = let
         mkOpenWiFi = ssid: {
-          connection = {
-            id = "${ssid}";
-            type = "wifi";
-          };
-
+          connection.id = "${ssid}";
+          connection.type = "wifi";
           ipv4.method = "auto";
-
-          ipv6 = {
-            addr-gen-mode = "default";
-            method = "auto";
-          };
-
-          wifi = {
-            mode = "infrastructure";
-            ssid = "${ssid}";
-          };
+          ipv6.addr-gen-mode = "default";
+          ipv6.method = "auto";
+          wifi.mode = "infrastructure";
+          wifi.ssid = "${ssid}";
         };
 
         mkWPA2WiFi = ssid: psk: (
           (mkOpenWiFi ssid)
           // {
-            wifi-security = {
-              auth-alg = "open";
-              key-mgmt = "wpa-psk";
-              psk = "${psk}";
-            };
+            wifi-security.auth-alg = "open";
+            wifi-security.key-mgmt = "wpa-psk";
+            wifi-security.psk = "${psk}";
           }
         );
 
         mkEAPWiFi = ssid: identity: pass: auth: (
           (mkOpenWiFi ssid)
           // {
-            "802-1x" = {
-              eap = "peap;";
-              identity = "${identity}";
-              password = "${pass}";
-              phase2-auth = "${auth}";
-            };
-
-            wifi-security = {
-              auth-alg = "open";
-              key-mgmt = "wpa-eap";
-            };
+            "802-1x".eap = "peap;";
+            "802-1x".identity = "${identity}";
+            "802-1x".password = "${pass}";
+            "802-1x".phase2-auth = "${auth}";
+            wifi-security.auth-alg = "open";
+            wifi-security.key-mgmt = "wpa-eap";
           }
         );
       in {
diff --git a/hosts/lavaridge/home.nix b/hosts/lavaridge/home.nix
index b74d6d0f..707fdef3 100644
--- a/hosts/lavaridge/home.nix
+++ b/hosts/lavaridge/home.nix
@@ -4,16 +4,12 @@
   pkgs,
   ...
 }: {
-  home-manager = {
-    sharedModules = [
-      {
-        ar.home = {
-          services.easyeffects = {
-            enable = true;
-            preset = "framework13";
-          };
-        };
-      }
-    ];
-  };
+  home-manager.sharedModules = [
+    {
+      ar.home.services.easyeffects = {
+        enable = true;
+        preset = "framework13";
+      };
+    }
+  ];
 }
diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix
index 40dc29d6..9bc39db1 100644
--- a/hosts/mauville/default.nix
+++ b/hosts/mauville/default.nix
@@ -142,13 +142,11 @@ in {
     inherit domain;
     enable = true;
 
-    containers = {
-      oci = {
-        audiobookshelf.enable = true;
-        freshRSS.enable = true;
-        plexMediaServer.enable = true;
-        transmission.enable = true;
-      };
+    containers.oci = {
+      audiobookshelf.enable = true;
+      freshRSS.enable = true;
+      plexMediaServer.enable = true;
+      transmission.enable = true;
     };
 
     services = {
@@ -161,10 +159,12 @@ in {
       forgejo.enable = true;
       navidrome = {
         enable = true;
+
         lastfm = {
           idFile = config.age.secrets.lastfmId.path;
           secretFile = config.age.secrets.lastfmSecret.path;
         };
+
         spotify = {
           idFile = config.age.secrets.spotifyId.path;
           secretFile = config.age.secrets.spotifySecret.path;
diff --git a/hosts/petalburg/home.nix b/hosts/petalburg/home.nix
index 264d3260..92114a4a 100644
--- a/hosts/petalburg/home.nix
+++ b/hosts/petalburg/home.nix
@@ -5,19 +5,17 @@
   self,
   ...
 }: {
-  home-manager = {
-    sharedModules = [
-      {
-        wayland.windowManager.hyprland.extraConfig = ''
-          # Extra bindings for petalburg.
-          bind = , xf86launch4, exec, ${lib.getExe self.inputs.pp-adjuster.packages.${pkgs.system}.default}
-          bind = , xf86launch2, exec, ${lib.getExe pkgs.playerctl} play-pause
+  home-manager.sharedModules = [
+    {
+      wayland.windowManager.hyprland.extraConfig = ''
+        # Extra bindings for petalburg.
+        bind = , xf86launch4, exec, ${lib.getExe self.inputs.pp-adjuster.packages.${pkgs.system}.default}
+        bind = , xf86launch2, exec, ${lib.getExe pkgs.playerctl} play-pause
 
-          exec-once = ${lib.getExe self.inputs.iio-hyprland.packages.${pkgs.system}.default} "desc:Samsung Display Corp. 0x4152"
-        '';
+        exec-once = ${lib.getExe self.inputs.iio-hyprland.packages.${pkgs.system}.default} "desc:Samsung Display Corp. 0x4152"
+      '';
 
-        ar.home.desktop.hyprland.tabletMode.enable = true;
-      }
-    ];
-  };
+      ar.home.desktop.hyprland.tabletMode.enable = true;
+    }
+  ];
 }
diff --git a/hosts/rustboro/home.nix b/hosts/rustboro/home.nix
index f585ac26..8e40de29 100644
--- a/hosts/rustboro/home.nix
+++ b/hosts/rustboro/home.nix
@@ -4,24 +4,20 @@
   pkgs,
   ...
 }: {
-  home-manager = {
-    sharedModules = [
-      {
-        programs.vscode.userSettings = {
-          "editor.fontSize" = lib.mkForce "16";
-        };
+  home-manager.sharedModules = [
+    {
+      programs.vscode.userSettings = {
+        "editor.fontSize" = lib.mkForce "16";
+      };
 
-        home.pointerCursor.size = lib.mkForce 24;
+      home.pointerCursor.size = lib.mkForce 24;
 
-        gtk.font.size = lib.mkForce 14;
+      gtk.font.size = lib.mkForce 14;
 
-        ar.home = {
-          services.easyeffects = {
-            enable = true;
-            preset = "LoudnessEqualizer";
-          };
-        };
-      }
-    ];
-  };
+      ar.home.services.easyeffects = {
+        enable = true;
+        preset = "LoudnessEqualizer";
+      };
+    }
+  ];
 }