diff --git a/modules/core.nix b/modules/core.nix
index 8b17e20..d1827ca 100644
--- a/modules/core.nix
+++ b/modules/core.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   config = {
     system.stateVersion = "24.05";
     time.timeZone = "America/New_York";
diff --git a/modules/hardware/audio.nix b/modules/hardware/audio.nix
index ec728ad..d096b0d 100644
--- a/modules/hardware/audio.nix
+++ b/modules/hardware/audio.nix
@@ -1,11 +1,11 @@
 {
-config = {
-  hardware.pulseaudio.support32Bit = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
+  config = {
+    hardware.pulseaudio.support32Bit = true;
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+    };
   };
 }
diff --git a/modules/software/keyd.nix b/modules/software/keyd.nix
index e726de2..6e74dcf 100644
--- a/modules/software/keyd.nix
+++ b/modules/software/keyd.nix
@@ -1,4 +1,4 @@
-{...}:{
+{...}: {
   config.services.keyd = {
     enable = true;
     keyboards.default = {
diff --git a/modules/software/usershell.nix b/modules/software/usershell.nix
index ee7ee77..a7782ac 100644
--- a/modules/software/usershell.nix
+++ b/modules/software/usershell.nix
@@ -1,50 +1,49 @@
 {pkgs, ...}: {
   config = {
-  programs.zsh = {
-    enable = true;
-    autosuggestions = {
+    programs.zsh = {
       enable = true;
-      async = true;
+      autosuggestions = {
+        enable = true;
+        async = true;
+      };
+      syntaxHighlighting = {
+        enable = true;
+      };
     };
-    syntaxHighlighting = {
+
+    programs.starship = {
       enable = true;
-    };
-  };
+      settings = {
+        format = "[░▒▓](#a3aed2)[  ](bg:#a3aed2 fg:#090c0c)[](bg:#769ff0 fg:#a3aed2)$directory[](fg:#769ff0 bg:#394260)$git_branch$git_status[](fg:#394260 bg:#212736)$php[](fg:#212736 bg:#1d2230)$time[ ](fg:#1d2230)$character";
 
-  programs.starship = {
-    enable = true;
-    settings = {
-      format = "[░▒▓](#a3aed2)[  ](bg:#a3aed2 fg:#090c0c)[](bg:#769ff0 fg:#a3aed2)$directory[](fg:#769ff0 bg:#394260)$git_branch$git_status[](fg:#394260 bg:#212736)$php[](fg:#212736 bg:#1d2230)$time[ ](fg:#1d2230)$character";
-
-      directory = {
-        style = "fg:#e3e5e5 bg:#769ff0";
-        format = "[ $path ]($style)";
-        truncation_length = 3;
-        truncation_symbol = "…/";
-      };
-      git_branch = {
-        symbol = "";
-        style = "bg:#394260";
-        format = "[[ $symbol $branch ](fg:#769ff0 bg:#394260)]($style)";
-      };
-      git_status = {
-        style = "bg:#394260";
-        format = "[[($all_status$ahead_behind )](fg:#769ff0 bg:#394260)]($style)";
-      };
-      php = {
-        symbol = "";
-        style = "bg:#212736";
-        format = "[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)";
-      };
-      time = {
-        disabled = false;
-        time_format = "%R"; # Hour:Minute Format
-        style = "bg:#1d2230";
-        format = "[[  $time ](fg:#a0a9cb bg:#1d2230)]($style)";
+        directory = {
+          style = "fg:#e3e5e5 bg:#769ff0";
+          format = "[ $path ]($style)";
+          truncation_length = 3;
+          truncation_symbol = "…/";
+        };
+        git_branch = {
+          symbol = "";
+          style = "bg:#394260";
+          format = "[[ $symbol $branch ](fg:#769ff0 bg:#394260)]($style)";
+        };
+        git_status = {
+          style = "bg:#394260";
+          format = "[[($all_status$ahead_behind )](fg:#769ff0 bg:#394260)]($style)";
+        };
+        php = {
+          symbol = "";
+          style = "bg:#212736";
+          format = "[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)";
+        };
+        time = {
+          disabled = false;
+          time_format = "%R"; # Hour:Minute Format
+          style = "bg:#1d2230";
+          format = "[[  $time ](fg:#a0a9cb bg:#1d2230)]($style)";
+        };
       };
     };
   };
-
   users.defaultUserShell = pkgs.zsh;
-  };
 }