From b4f4b67a8ba5da72943f62c6942fb714a14b5f2f Mon Sep 17 00:00:00 2001
From: lsoriano-mcm <soriano.leeroidaniel@mcm.edu>
Date: Thu, 3 Jul 2025 16:49:45 -0500
Subject: [PATCH] test

---
 modules/home/darwin.nix   | 0
 modules/home/terminal.nix | 9 +++++++++
 packages/fish/home.nix    | 2 +-
 packages/git/home.nix     | 6 +++---
 packages/kitty/home.nix   | 6 ++++--
 packages/zsh/home.nix     | 2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)
 delete mode 100644 modules/home/darwin.nix
 create mode 100644 modules/home/terminal.nix

diff --git a/modules/home/darwin.nix b/modules/home/darwin.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/home/terminal.nix b/modules/home/terminal.nix
new file mode 100644
index 0000000..92ed183
--- /dev/null
+++ b/modules/home/terminal.nix
@@ -0,0 +1,9 @@
+{
+  imports = [
+    ../../packages/zsh/home.nix
+    ../../packages/fish/home.nix
+    ../../packages/kitty/home.nix
+    ../../packages/neovim/home.nix
+    ../../packages/starship/home.nix
+  ];
+}
diff --git a/packages/fish/home.nix b/packages/fish/home.nix
index 2710f57..1889bbf 100644
--- a/packages/fish/home.nix
+++ b/packages/fish/home.nix
@@ -12,7 +12,7 @@
       zoxide init fish | source
 
     '';
-    shellAliases = myConfig.general.terminal.Aliases;
+    shellAliases = myConfig.general.Terminal.aliases;
 
     plugins = with pkgs.fishPlugins; [
     ];
diff --git a/packages/git/home.nix b/packages/git/home.nix
index bdbaf77..8bf77eb 100644
--- a/packages/git/home.nix
+++ b/packages/git/home.nix
@@ -2,9 +2,9 @@
   programs.git = {
     enable = true;
     extraConfig = {
-      user.name = "${myConfig.general.gitProfile.User}";
-      user.email = "${myConfig.general.gitProfile.Email}";
-      init.defaultBranch = "${myConfig.general.gitProfile.defaultBranch}";
+      user.name = "${myConfig.linux.Git.user}";
+      user.email = "${myConfig.linux.Git.email}";
+      init.defaultBranch = "${myConfig.linux.Git.defaultBranch}";
     };
   };
 }
diff --git a/packages/kitty/home.nix b/packages/kitty/home.nix
index f49067a..3af1966 100644
--- a/packages/kitty/home.nix
+++ b/packages/kitty/home.nix
@@ -7,12 +7,14 @@
       confirm_os_window_close = 0;
       window_padding_width = 10;
 
-      font_size = myConfig.general.terminal.Size;
-      font_family = myConfig.general.terminal.Font;
+      font_size = myConfig.general.Terminal.size;
+      font_family = myConfig.general.Terminal.font;
       bold_font = "auto";
       italic_font = "auto";
       bold_italic_font = "auto";
 
+      shell = myConfig.general.Terminal.shell;
+
       # optimization
       input_delay = 0;
       repaint_delay = 2;
diff --git a/packages/zsh/home.nix b/packages/zsh/home.nix
index 5b4607d..4036e37 100644
--- a/packages/zsh/home.nix
+++ b/packages/zsh/home.nix
@@ -13,7 +13,7 @@
   programs.zsh = {
     enableCompletion = false;
     syntaxHighlighting.enable = false;
-    shellAliases = myConfig.general.terminal.Aliases;
+    shellAliases = myConfig.general.Terminal.aliases;
     history.size = 10000;
     antidote = {
       enable = true;