diff --git a/home/bat.nix b/home/bat.nix
new file mode 100644
index 0000000..4cb0b03
--- /dev/null
+++ b/home/bat.nix
@@ -0,0 +1,5 @@
+{
+  programs.bat = {
+    enable = true;
+  };
+}
diff --git a/home/default.nix b/home/default.nix
index c01bc07..b436385 100755
--- a/home/default.nix
+++ b/home/default.nix
@@ -17,6 +17,9 @@
     ./jq.nix
     ./lazygit.nix
     ./mise.nix
+    ./ghostty.nix
+    ./bat.nix
+    # TODO ./aerospace.nix
   ];
 
   home = {
diff --git a/home/ghostty.nix b/home/ghostty.nix
new file mode 100644
index 0000000..6e851ed
--- /dev/null
+++ b/home/ghostty.nix
@@ -0,0 +1,14 @@
+{
+  programs.ghostty = {
+    enable = true;
+    enableZshIntegration = true;
+    enableBashIntegration = true;
+
+    settings = {
+      theme = "catppuccin-mocha";
+      font-family = "D2Coding";
+      font-size = 15;
+      macos-icon = "xray";
+    };
+  };
+}
diff --git a/home/zsh.nix b/home/zsh.nix
index 99f0b7b..7a9278c 100755
--- a/home/zsh.nix
+++ b/home/zsh.nix
@@ -9,6 +9,10 @@
     history = {
       size = 10000;
       save = 10000;
+      share = true;
+      ignoreAllDups = true;
+      ignoreDups = true;
+      ignoreSpace = true;
     };
 
     shellAliases = {