From 9f26a3d4c54e46f2ff4150bcf7d406250ee80ee9 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Tue, 25 Jun 2024 21:56:13 +1200
Subject: [PATCH] refactor(home:foot): rework structure of module

---
 home/modules/desktop/terminal/foot.nix | 28 +++++++++++++++-----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/home/modules/desktop/terminal/foot.nix b/home/modules/desktop/terminal/foot.nix
index 8e4af63..6b7eb79 100644
--- a/home/modules/desktop/terminal/foot.nix
+++ b/home/modules/desktop/terminal/foot.nix
@@ -2,27 +2,21 @@
 
 let
   inherit (config.colorscheme) palette;
-  inherit (lib) mkIf;
+  inherit (lib) mkMerge mkIf;
   fonts = config.ooknet.fonts;
   cfg = config.ooknet.terminal.foot;
-  terminal = config.ooknet.desktop.terminal;
+  desktop = config.ooknet.desktop;
 in
 
 {
-  config = mkIf (cfg.enable || terminal == "foot") {
-    home.sessionVariables = mkIf (terminal == "foot") {
-      TERMINAL = "foot";
-      TERM = "foot";
-    };
-
-    ooknet.binds.terminal = mkIf (terminal == "foot") "foot";
-    ooknet.binds.terminalLaunch = mkIf (terminal == "foot") "foot";
-
+  config = mkMerge [ 
+  (mkIf (cfg.enable || desktop.terminal == "foot") {
     programs.foot = {
       enable = true;
       server.enable = true;
       settings = {
         main = {
+          term = "xterm-256color";
           font = "${fonts.monospace.family}:pixelsize=18:antialias=true";
           font-bold = "${fonts.monospace.family}:style=Bold:pixelsize=18:antialias=true";
           font-italic = "${fonts.monospace.family}:style=Italic:pixelsize=18:antialias=true";
@@ -74,5 +68,15 @@ in
         };
       };
     };
-  };
+  })
+
+  (mkIf (desktop.terminal == "foot") {
+    home.sessionVariables = {
+      TERMINAL = "foot";
+      TERM = "foot";
+    };
+    ooknet.binds.terminal = "foot";
+    ooknet.binds.terminalLaunch = "foot";
+    })
+  ];
 }