From f25d426ae8840f97bf9cc4512b28342076d6eb52 Mon Sep 17 00:00:00 2001
From: Tyler Mayoff <tyler@tylermayoff.com>
Date: Sat, 19 Jul 2025 11:18:46 -0400
Subject: [PATCH] theming

---
 dot_config/flake/home/darkman.nix | 16 ++++++++--------
 dot_config/flake/home/fish.nix    |  8 ++++++--
 dot_config/flake/home/ghostty.nix | 19 +++++++++++++++++--
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/dot_config/flake/home/darkman.nix b/dot_config/flake/home/darkman.nix
index cf1b780..cce06bd 100644
--- a/dot_config/flake/home/darkman.nix
+++ b/dot_config/flake/home/darkman.nix
@@ -6,17 +6,17 @@
     };
 
     lightModeScripts = {
-      gtk-theme = ''
-        ${pkgs.dconf}/bin/dconf write \
-            /org/gnome/desktop/interface/color-scheme "'prefer-light'"
-      '';
+      # gtk-theme = ''
+      #   ${pkgs.dconf}/bin/dconf write \
+      #       /org/gnome/desktop/interface/color-scheme "'prefer-light'"
+      # '';
     };
 
     darkModeScripts = {
-      gtk-theme = ''
-        ${pkgs.dconf}/bin/dconf write \
-            /org/gnome/desktop/interface/color-scheme "'prefer-dark'"
-      '';
+      # gtk-theme = ''
+      #   ${pkgs.dconf}/bin/dconf write \
+      #       /org/gnome/desktop/interface/color-scheme "'prefer-dark'"
+      # '';
     };
   };
 }
diff --git a/dot_config/flake/home/fish.nix b/dot_config/flake/home/fish.nix
index 790c43d..8eeb4d3 100644
--- a/dot_config/flake/home/fish.nix
+++ b/dot_config/flake/home/fish.nix
@@ -2,8 +2,8 @@
   catppuccin-fish = pkgs.fetchFromGitHub {
     owner = "catppuccin";
     repo = "fish";
-    rev = "0ce27b518e8ead555dec34dd8be3df5bd75cff8e";
-    hash = "sha256-Dc/zdxfzAUM5NX8PxzfljRbYvO9f9syuLO8yBr+R3qg=";
+    rev = "6a85af2ff722ad0f9fbc8424ea0a5c454661dfed";
+    hash = "sha256-Oc0emnIUI4LV7QJLs4B2/FQtCFewRFVp7EDv8GawFsA=";
   };
 in {
   programs.fish = {
@@ -21,6 +21,8 @@ in {
       bind \cz 'fg 2>/dev/null; commandline -f repaint'
 
       export GPG_TTY=$(tty)
+
+      fish_config theme save "Catppuccin Latte"
     '';
 
     shellInit = ''
@@ -44,5 +46,7 @@ in {
     ];
   };
 
+  xdg.configFile."fish/themes/Catppuccin Latte.theme".source = "${catppuccin-fish}/themes/Catppuccin Latte.theme";
+
   xdg.configFile."fish/themes/Catppuccin Macchiato.theme".source = "${catppuccin-fish}/themes/Catppuccin Macchiato.theme";
 }
diff --git a/dot_config/flake/home/ghostty.nix b/dot_config/flake/home/ghostty.nix
index 838ca22..eeaf164 100644
--- a/dot_config/flake/home/ghostty.nix
+++ b/dot_config/flake/home/ghostty.nix
@@ -1,9 +1,24 @@
-{...}: {
+{pkgs, ...}: let
+  catppuccin = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "ghostty";
+    rev = "61bed99612125e9873cadfd0857137cdd2568a21";
+    hash = "sha256-GM/wKBUdgly7lKs8IiGKB7cBaUuE+GSubLgOMZNmsZ4=";
+  };
+in {
   programs.ghostty = {
     enable = true;
 
     settings = {
-      theme = "dark:catppuccin-macchiato,light:catppuccin-latte";
+      theme = "dark:catppuccin-macchiato.conf,light:catppuccin-latte.conf";
+
+      keybind = [
+        "global:f12=toggle_quick_terminal"
+      ];
     };
   };
+
+  xdg.configFile."ghostty/themes/catppuccin-latte.conf".source = "${catppuccin}/themes/catppuccin-latte.conf";
+
+  xdg.configFile."ghostty/themes/catppuccin-macchiato.conf".source = "${catppuccin}/themes/catppuccin-macchiato.conf";
 }