diff --git a/home-manager/commands/commands.nix b/home-manager/commands/commands.nix
index 29f8301..5a3d9a9 100644
--- a/home-manager/commands/commands.nix
+++ b/home-manager/commands/commands.nix
@@ -29,6 +29,7 @@
     curl
     dig
     dust
+    fd
     ffmpeg-full
     fzf
     gemini-cli
diff --git a/home-manager/commands/zsh.nix b/home-manager/commands/zsh.nix
index 0538f5d..82b1a17 100644
--- a/home-manager/commands/zsh.nix
+++ b/home-manager/commands/zsh.nix
@@ -11,7 +11,8 @@
       shellAliases = {
         cd = "z";
         cat = "bat";
-        catp = "bat -p";
+        catp = "bat -pP";
+        find = "fd";
         grep = "rg";
         lg = "lazygit";
         ll = "eza -la";
@@ -20,7 +21,11 @@
         open = "xdg-open";
         locate = "sudo plocate";
         tulpn = "sudo netstat -tulpn";
-        rebuild = "sudo nixos-rebuild switch --flake /etc/nixos#$(uname -n)";
+        rebuild = if hostname == "eva-02" 
+        then 
+          "sudo darwin-rebuild switch --flake .#eva-02"
+        else 
+          "sudo nixos-rebuild switch --flake /etc/nixos#$(uname -n)";
       };
 
       # profileExtra = ''
diff --git a/home-manager/programs/ghostty/ghostty.nix b/home-manager/programs/ghostty/ghostty.nix
index 6ab0a48..f80ce71 100644
--- a/home-manager/programs/ghostty/ghostty.nix
+++ b/home-manager/programs/ghostty/ghostty.nix
@@ -1,6 +1,12 @@
+{
+  hostname,
+  lib,
+  ...
+}:
 {
   programs.ghostty = {
     enable = true;
+    package = lib.mkIf (hostname == "eva-02") null;
     enableZshIntegration = true;
     settings = {
       # Use explicit theme instead of relying on system theme detection
diff --git a/home-manager/programs/programs.nix b/home-manager/programs/programs.nix
index 91d576a..b0ba7d3 100644
--- a/home-manager/programs/programs.nix
+++ b/home-manager/programs/programs.nix
@@ -8,6 +8,9 @@
     ./hypr/hyprland.nix
     ./hypr/hyprlock.nix
     #./hypr/waybar.nix
+  ]
+  ++ lib.optionals (hostname == "eva-02") [
+    ./ghostty/ghostty.nix
   ];
 
   home.packages = 
@@ -66,7 +69,7 @@
     calibre
   ]
 
-  ++ lib.optionals (hostname == "eva-02") [
+  ++ lib.optionals (hostname == "eva-02")  [
     vscode
   ]
 
diff --git a/hosts/eva-02/configuration.nix b/hosts/eva-02/configuration.nix
index 13565c0..4b8dc71 100644
--- a/hosts/eva-02/configuration.nix
+++ b/hosts/eva-02/configuration.nix
@@ -76,6 +76,7 @@
       "1password"
       "1password-cli"
       "docker"
+      "ghostty"
     ];
   };
 
@@ -127,7 +128,9 @@
     tailscale
     unzip
     vim
+  ];
 
+  fonts.packages = with pkgs; [
     nerd-fonts.hack
     nerd-fonts.fira-code
   ];