diff --git a/modules/common/ghostty.nix b/modules/common/ghostty.nix
index 2c27c39..5490c0e 100644
--- a/modules/common/ghostty.nix
+++ b/modules/common/ghostty.nix
@@ -1,12 +1,12 @@
 { config, lib, pkgs, ... }: let
   inherit (lib) enabled mapAttrsToList merge mkIf optionals;
 in merge <| mkIf config.isDesktop {
-  home-manager.sharedModules = [{
-    programs.nushell.environmentVariables = {
-      TERMINAL     = mkIf config.isLinux "ghostty";
-      TERM_PROGRAM = mkIf config.isDarwin "ghostty";
-    };
+  environment.variables = {
+    TERMINAL     = mkIf config.isLinux "ghostty";
+    TERM_PROGRAM = mkIf config.isDarwin "ghostty";
+  };
 
+  home-manager.sharedModules = [{
     programs.ghostty = enabled {
       # Don't actually install Ghostty if we are on Darwin.
       # For some reason it is marked as broken.
diff --git a/modules/darwin/aerospace.nix b/modules/darwin/aerospace.nix
index b14554f..969f381 100644
--- a/modules/darwin/aerospace.nix
+++ b/modules/darwin/aerospace.nix
@@ -1,6 +1,5 @@
 { lib, ... }: let
   inherit (lib) enabled;
 in {
-  services.aerospace = enabled {
-  };
+  services.aerospace = enabled;
 }