diff --git a/darwin/hosts/ivr/default.nix b/darwin/hosts/ivr/default.nix
index 79cebfa..85c5c1a 100644
--- a/darwin/hosts/ivr/default.nix
+++ b/darwin/hosts/ivr/default.nix
@@ -21,6 +21,10 @@ in
       "poetry"
       "podman"
       "podman-compose"
+      {
+        name = "postgresql@17";
+        restart_service = true;
+      }
       "pytest"
       "qemu"
     ];
@@ -31,6 +35,7 @@ in
       "bruno"
       "chromium"
       "dbeaver-community"
+      "ghostty"
       "firefox"
       "microsoft-teams"
       "onlyoffice"
diff --git a/home/baseline/default.nix b/home/baseline/default.nix
index 9c3876c..066f45d 100644
--- a/home/baseline/default.nix
+++ b/home/baseline/default.nix
@@ -7,6 +7,7 @@
     ./direnv.nix
     ./git.nix
     ./nushell.nix
+    ./shell.nix
     ./ssh.nix
     ./tools.nix
     ./vim
diff --git a/home/baseline/shell.nix b/home/baseline/shell.nix
new file mode 100644
index 0000000..ee51861
--- /dev/null
+++ b/home/baseline/shell.nix
@@ -0,0 +1,33 @@
+{ pkgs, ... }:
+{
+  programs = {
+    ghostty = {
+      enable = true;
+      package = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.ghostty-bin else pkgs.ghostty;
+      settings = {
+        font-family = "Hacker";
+        theme = "Dracula";
+        scrollback-limit = "1000000";
+        window-save-state = "always";
+
+        keybind = [
+          "ctrl+n=new_window"
+
+          "ctrl+h=goto_split:left"
+          "ctrl+j=goto_split:down"
+          "ctrl+k=goto_split:up"
+          "ctrl+l=goto_split:right"
+
+          "ctrl+b>h=new_split:left"
+          "ctrl+b>j=new_split:down"
+          "ctrl+b>k=new_split:up"
+          "ctrl+b>l=new_split:right"
+
+          "ctrl+b>t=new_tab"
+          "ctrl+b>n=next_tab"
+          "ctrl+b>p=previous_tab"
+        ];
+      };
+    };
+  };
+}