diff --git a/flake.lock b/flake.lock
index 5547996..4f6372a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -199,28 +199,7 @@
         "nix-darwin": "nix-darwin",
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
-        "rust-overlay": "rust-overlay"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1771297684,
-        "narHash": "sha256-wieWskQxZLPlNXX06JEB0bMoS/ZYQ89xBzF0RL9lyLs=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "755d3669699a7c62aef35af187d75dc2728cfd85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index aaa6626..f126a57 100755
--- a/flake.nix
+++ b/flake.nix
@@ -23,10 +23,6 @@
     homebrew-core.flake = false;
     homebrew-cask.url = "github:homebrew/homebrew-cask";
     homebrew-cask.flake = false;
-
-    # Rust Overlay
-    rust-overlay.url = "github:oxalica/rust-overlay";
-    rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs =
@@ -38,7 +34,6 @@
       import-tree,
       home-manager,
       nix-homebrew,
-      rust-overlay,
       homebrew-core,
       homebrew-cask,
       nixpkgs-unstable,
@@ -82,7 +77,6 @@
               specialArgs = {
                 self = self;
                 import-tree = import-tree;
-                rust-overlay = rust-overlay;
                 home-manager = home-manager;
                 homebrew-core = homebrew-core;
                 homebrew-cask = homebrew-cask;
diff --git a/hosts/darwin/home/alistreaza.nix b/hosts/darwin/home/alistreaza.nix
index 9963e1c..1b3b515 100644
--- a/hosts/darwin/home/alistreaza.nix
+++ b/hosts/darwin/home/alistreaza.nix
@@ -1,4 +1,4 @@
-{ import-tree, ... }:
+{ lib, import-tree, ... }:
 {
   home-manager.users.alistreaza = {
     imports = [
@@ -9,6 +9,17 @@
     home = {
       username = "alistreaza";
       homeDirectory = /Users/alistreaza;
+      sessionVariables = {
+        XDG_CACHE_HOME = "$HOME/.cache";
+        XDG_CONFIG_HOME = "$HOME/.config";
+        XDG_DATA_HOME = "$HOME/.local/share";
+        XDG_STATE_HOME = "$HOME/.local/state";
+      };
+      file = {
+        "$HOME/.config/ghostty/config" = {
+          source = lib.file.mkOutOfStoreSymlink ./config/ghostty;
+        };
+      };
     };
 
     # Shell apps
@@ -19,7 +30,9 @@
 
     # Nix & languages env deps
     home.env.nix.enable = true;
+    home.env.jdk.enable = true;
     home.env.rust.enable = true;
+    home.env.python.enable = true;
 
     # No Home Application Folders
     targets.darwin.linkApps.enable = false;
diff --git a/hosts/darwin/home/config/ghostty b/hosts/darwin/home/config/ghostty
new file mode 100644
index 0000000..3e3f598
--- /dev/null
+++ b/hosts/darwin/home/config/ghostty
@@ -0,0 +1,11 @@
+# macOS specific
+macos-titlebar-style = "tabs"
+
+# Window padding & size
+window-padding-x = 8
+window-padding-y = 0,2
+
+# Themes
+background-blur=true
+background-opacity = 0.75
+theme = Spacegray Eighties
diff --git a/hosts/darwin/system/os.nix b/hosts/darwin/system/os.nix
index 765ac8b..db79815 100644
--- a/hosts/darwin/system/os.nix
+++ b/hosts/darwin/system/os.nix
@@ -4,7 +4,7 @@
   nixpkgs.hostPlatform = "aarch64-darwin";
 
   # Homebrew apps
-  os.homebrew.iterm.enable = true;
+  os.homebrew.ghostty.enable = true;
   os.homebrew.zed.enable = true;
   os.homebrew.jetbrain.enable = true;
   os.homebrew.iina.enable = true;
diff --git a/modules/home/darwin/env/jdk.nix b/modules/home/darwin/env/jdk.nix
index 3b18cf7..f9fd792 100644
--- a/modules/home/darwin/env/jdk.nix
+++ b/modules/home/darwin/env/jdk.nix
@@ -19,5 +19,10 @@ in
       maven
     ];
 
+    home.sessionVariables = {
+      JAVA_HOME = "${pkgs.jdk25_headless}";
+      M2_HOME = "${config.home.sessionVariables.XDG_DATA_HOME}/m2";
+    };
+
   };
 }
diff --git a/modules/home/darwin/env/rust.nix b/modules/home/darwin/env/rust.nix
index ef61b7b..1932c80 100644
--- a/modules/home/darwin/env/rust.nix
+++ b/modules/home/darwin/env/rust.nix
@@ -14,12 +14,12 @@ in
   };
   config = mkIf cfg.enable {
 
-    home.packages = with pkgs; [
-      rust-bin.stable.latest.default.override
-      {
-        extensions = [ "rust-src" ];
-      }
-    ];
+    home.packages = with pkgs; [ rustup ];
+
+    home.sessionVariables = {
+      CARGO_HOME = "${config.home.sessionVariables.XDG_DATA_HOME}/cargo";
+      RUSTUP_HOME = "${config.home.sessionVariables.XDG_DATA_HOME}/rustup";
+    };
 
   };
 }
diff --git a/modules/system/darwin/ghostty.nix b/modules/system/darwin/ghostty.nix
new file mode 100644
index 0000000..00da0cc
--- /dev/null
+++ b/modules/system/darwin/ghostty.nix
@@ -0,0 +1,17 @@
+{ lib, config, ... }:
+with lib;
+let
+  cfg = config.os.homebrew.ghostty;
+in
+{
+  options.os.homebrew.ghostty = {
+    enable = mkEnableOption "System iterm homebrew service";
+  };
+  config = mkIf cfg.enable {
+
+    homebrew.casks = [
+      "ghostty"
+    ];
+
+  };
+}
diff --git a/overlays/darwin/rust.nix b/overlays/darwin/rust.nix
deleted file mode 100644
index 918f8fc..0000000
--- a/overlays/darwin/rust.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ rust-overlay, ... }:
-{
-  nixpkgs.overlays = [
-    rust-overlay.overlays.default
-  ];
-}