From f1f24fa4d5a96406374b1ec27022f6caf1b1c88f Mon Sep 17 00:00:00 2001
From: Tyler Mayoff <tyler.mayoff@hingehealth.com>
Date: Sat, 19 Jul 2025 11:48:58 -0400
Subject: [PATCH] ghostty config on macos, and fix fish theming on every shell

---
 dot_config/flake/home/fish.nix             | 3 ++-
 dot_config/flake/home/ghostty.nix          | 4 +++-
 dot_config/flake/machines/hinge/darwin.nix | 2 +-
 dot_config/flake/machines/hinge/home.nix   | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dot_config/flake/home/fish.nix b/dot_config/flake/home/fish.nix
index 8eeb4d3..25cf26e 100644
--- a/dot_config/flake/home/fish.nix
+++ b/dot_config/flake/home/fish.nix
@@ -22,7 +22,6 @@ in {
 
       export GPG_TTY=$(tty)
 
-      fish_config theme save "Catppuccin Latte"
     '';
 
     shellInit = ''
@@ -36,6 +35,8 @@ in {
       if test -e $HOME/.config/fish/variables-$(hostname)fish
         source $HOME/.config/fish/variables-$(hostname).fish
       end
+
+      fish_config theme save "Catppuccin Latte"
     '';
 
     plugins = [
diff --git a/dot_config/flake/home/ghostty.nix b/dot_config/flake/home/ghostty.nix
index eeaf164..6247027 100644
--- a/dot_config/flake/home/ghostty.nix
+++ b/dot_config/flake/home/ghostty.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: let
+{pkgs, lib, ...}: let
   catppuccin = pkgs.fetchFromGitHub {
     owner = "catppuccin";
     repo = "ghostty";
@@ -9,6 +9,8 @@ in {
   programs.ghostty = {
     enable = true;
 
+    package = if pkgs.stdenv.isDarwin then pkgs.unstable.ghostty-bin else pkgs.unstable.ghostty;
+
     settings = {
       theme = "dark:catppuccin-macchiato.conf,light:catppuccin-latte.conf";
 
diff --git a/dot_config/flake/machines/hinge/darwin.nix b/dot_config/flake/machines/hinge/darwin.nix
index efe27ca..fa142b1 100644
--- a/dot_config/flake/machines/hinge/darwin.nix
+++ b/dot_config/flake/machines/hinge/darwin.nix
@@ -102,7 +102,7 @@ in {
 
     casks = [
       "notunes"
-      "ghostty"
+
       "firefox"
       "gpg-suite"
       "libreoffice"
diff --git a/dot_config/flake/machines/hinge/home.nix b/dot_config/flake/machines/hinge/home.nix
index 9d8dac5..bef21f8 100644
--- a/dot_config/flake/machines/hinge/home.nix
+++ b/dot_config/flake/machines/hinge/home.nix
@@ -4,6 +4,8 @@
     ../../home/kitty.nix
 
     ../../home/helide
+
+    ../../home/ghostty.nix
   ];
 
   # xdg.enable = lib.mkForce false;