From 671df6cc66f8f8a7f4ad112d7bc6ab727316f7b8 Mon Sep 17 00:00:00 2001
From: Celes Renata <celes@frameshift.net>
Date: Sat, 9 Aug 2025 13:10:32 -0700
Subject: [PATCH] Fix hybrid mode configuration conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🐛 BUG FIX: Resolve foot.ini conflict in hybrid mode

🎯 ISSUE:
- Rich terminal config was generating foot/foot.ini
- Configuration copying was also trying to copy foot/foot.ini
- Result: 'Error installing file outside $HOME' conflict

🔧 SOLUTION:
- Updated terminal-config.nix condition
- Only generate foot.ini when configuration copying is disabled
- Allows hybrid mode to work properly:
  - Hyprland: declarative (overrides)
  - Quickshell: copied files (complex QML)
  - Terminal: copied files (no conflict)

✅ RESULT:
- Hybrid mode should now build successfully
- No more file installation conflicts
- Best of both worlds: customizable + reliable
---
 modules/components/terminal-config.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/components/terminal-config.nix b/modules/components/terminal-config.nix
index 037ec6e..d39d669 100644
--- a/modules/components/terminal-config.nix
+++ b/modules/components/terminal-config.nix
@@ -66,8 +66,10 @@ in
     };
   };
   
-  config = mkIf (config.programs.dots-hyprland.enable && config.programs.dots-hyprland.overrides.footConfig == null) {
-    # Only generate if no manual override is set
+  config = mkIf (config.programs.dots-hyprland.enable && 
+                 config.programs.dots-hyprland.overrides.footConfig == null &&
+                 !(config.programs.dots-hyprland.configuration.enable or false)) {
+    # Only generate if no manual override is set AND configuration copying is disabled
     xdg.configFile."foot/foot.ini".text = ''
       [main]
       term=xterm-256color