diff --git a/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix b/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix
new file mode 100644
index 0000000..6a40a5c
--- /dev/null
+++ b/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix
@@ -0,0 +1,65 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.nmasur.presets.programs.ghostty;
+in
+
+{
+
+  options.nmasur.presets.programs.ghostty.enable = lib.mkEnableOption "Ghostty terminal";
+
+  config = lib.mkIf cfg.enable {
+    programs.ghostty = {
+      enable = true;
+
+      package = if pkgs.stdenv.isDarwin then pkgs.nur.repos.DimitarNestorov.ghostty else pkgs.ghostty;
+
+      enableFishIntegration = true;
+      enableBashIntegration = true;
+      enableZshIntegration = true;
+      installBatSyntax = true;
+      settings = {
+        theme = config.theme.name;
+        font-size = 16;
+      };
+      themes."gruvbox" = {
+        background = config.theme.colors.base00;
+        cursor-color = config.theme.colors.base04;
+        foreground = config.theme.colors.base05;
+        palette = [
+          "0=${config.theme.colors.base00}"
+          "1=${config.theme.colors.base08}"
+          "2=${config.theme.colors.base0B}"
+          "3=${config.theme.colors.base0A}"
+          "4=${config.theme.colors.base0D}"
+          "5=${config.theme.colors.base0E}"
+          "6=${config.theme.colors.base0C}"
+          "7=${config.theme.colors.base05}"
+          "8=${config.theme.colors.base03}"
+          "9=${config.theme.colors.base08}"
+          "10=${config.theme.colors.base0B}"
+          "11=${config.theme.colors.base0A}"
+          "12=${config.theme.colors.base0C}"
+          "13=${config.theme.colors.base0E}"
+          "14=${config.theme.colors.base0C}"
+          "15=${config.theme.colors.base07}"
+          "16=${config.theme.colors.base09}"
+          "17=${config.theme.colors.base0F}"
+          "18=${config.theme.colors.base01}"
+          "19=${config.theme.colors.base02}"
+          "20=${config.theme.colors.base04}"
+          "21=${config.theme.colors.base06}"
+        ];
+        selection-background = config.theme.colors.base02;
+        selection-foreground = config.theme.colors.base00;
+      };
+
+    };
+
+  };
+}
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/zed-editor.nix b/platforms/home-manager/modules/nmasur/presets/programs/zed-editor.nix
new file mode 100644
index 0000000..9d7ec66
--- /dev/null
+++ b/platforms/home-manager/modules/nmasur/presets/programs/zed-editor.nix
@@ -0,0 +1,50 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.nmasur.presets.programs.zed-editor;
+in
+
+{
+
+  options.nmasur.presets.programs.zed-editor.enable = lib.mkEnableOption "Zed text editor";
+
+  config = lib.mkIf cfg.enable {
+    programs.zed-editor = {
+      enable = true;
+
+      extensions = [ "nix" ];
+
+      extraPackages = [ pkgs.nixd ];
+
+      installRemoteServer = false;
+
+      userKeymaps = [
+        {
+          context = "Workspace";
+          bindings = {
+            ctrl-shift-t = "workspace::NewTerminal";
+          };
+        }
+      ];
+
+      userSettings = {
+        features = {
+          copilot = false;
+        };
+        telemetry = {
+          metrics = false;
+        };
+        vim_mode = true;
+        ui_font_size = 16;
+        buffer_font_size = 16;
+      };
+
+    };
+
+  };
+}
diff --git a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/Launcher.spoon/init.lua b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/Launcher.spoon/init.lua
index c2f44c2..804008f 100644
--- a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/Launcher.spoon/init.lua
+++ b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/Launcher.spoon/init.lua
@@ -56,11 +56,15 @@ function obj:init()
     -- Launcher shortcuts
     self.launcher:bind("ctrl", "space", function() end)
     self.launcher:bind("", "return", function()
-        self:switch("@wezterm@")
+        -- self:switch("@wezterm@")
+        self:switch("@ghostty@")
     end)
     self.launcher:bind("", "C", function()
         self:switch("Calendar.app")
     end)
+    self.launcher:bind("", "D", function()
+        self:switch("@discord@")
+    end)
     self.launcher:bind("shift", "D", function()
         hs.execute("launchctl remove com.paloaltonetworks.gp.pangps")
         hs.execute("launchctl remove com.paloaltonetworks.gp.pangpa")
diff --git a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix
index 980c52f..062afe9 100644
--- a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix
+++ b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix
@@ -20,11 +20,12 @@ in
     xdg.configFile."hammerspoon/Spoons/DismissAlerts.spoon".source = ./Spoons/DismissAlerts.spoon;
     xdg.configFile."hammerspoon/Spoons/Launcher.spoon/init.lua".source = pkgs.substituteAll {
       src = ./Spoons/Launcher.spoon/init.lua;
-      firefox = "${pkgs.firefox-unwrapped}/Applications/Firefox.app";
       discord = "${pkgs.discord}/Applications/Discord.app";
-      wezterm = "${pkgs.wezterm}/Applications/WezTerm.app";
+      firefox = "${pkgs.firefox-unwrapped}/Applications/Firefox.app";
+      ghostty = "${config.programs.ghostty.package}/Applications/Ghostty.app";
       obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";
       slack = "${pkgs.slack}/Applications/Slack.app";
+      wezterm = "${pkgs.wezterm}/Applications/WezTerm.app";
     };
     xdg.configFile."hammerspoon/Spoons/MoveWindow.spoon".source = ./Spoons/MoveWindow.spoon;
 
diff --git a/platforms/home-manager/modules/nmasur/profiles/experimental.nix b/platforms/home-manager/modules/nmasur/profiles/experimental.nix
index 54e9265..f39b35f 100644
--- a/platforms/home-manager/modules/nmasur/profiles/experimental.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/experimental.nix
@@ -15,6 +15,11 @@ in
 
   config = lib.mkIf cfg.enable {
 
+    nmasur.presets.programs = {
+      zed-editor.enable = lib.mkDefault true;
+      ghostty.enable = lib.mkDefault true;
+    };
+
     home.packages = [
 
       # Charm tools
@@ -28,7 +33,6 @@ in
 
     programs.gh-dash.enable = lib.mkDefault true;
     programs.helix.enable = lib.mkDefault true;
-    programs.zed-editor.enable = lib.mkDefault true;
     programs.himalaya.enable = lib.mkDefault true;
 
   };