From d00c9836d6a31641aad34146356cebd0fd30a2e1 Mon Sep 17 00:00:00 2001
From: lsoriano-mcm <soriano.leeroidaniel@mcm.edu>
Date: Sat, 28 Jun 2025 17:28:50 -0500
Subject: [PATCH] test2

---
 config.nix                 | 5 +++++
 hosts/macos/darwin.nix     | 8 ++++++++
 packages/git/default.nix   | 4 ++--
 packages/kitty/default.nix | 6 +++---
 packages/zsh/default.nix   | 4 ++--
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/config.nix b/config.nix
index 44e3c36..cb7bb26 100644
--- a/config.nix
+++ b/config.nix
@@ -1,7 +1,12 @@
 {
   general = {
+<<<<<<< HEAD
     Hostname = "hakase";
     Username = "lsoriano";
+=======
+    Hostname = "TEXAS";
+    Username = "kenji";
+>>>>>>> parent of 3ebe0c9 (udp)
     Timezone = "America/Chicago";
 
     allowUnfree = true; # allows installation of commercial apps.
diff --git a/hosts/macos/darwin.nix b/hosts/macos/darwin.nix
index a3af6dd..04808ee 100644
--- a/hosts/macos/darwin.nix
+++ b/hosts/macos/darwin.nix
@@ -5,11 +5,19 @@
   ...
 }: {
   imports = [
+<<<<<<< HEAD
     ../../modules/dev.nix
+=======
+    ../../system/dev/macos.nix
+>>>>>>> parent of 3ebe0c9 (udp)
   ];
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages = with pkgs; [
+<<<<<<< HEAD
+=======
+    python313
+>>>>>>> parent of 3ebe0c9 (udp)
   ];
 
   # Auto upgrade nix package and the daemon service.
diff --git a/packages/git/default.nix b/packages/git/default.nix
index 7184f9e..e046917 100644
--- a/packages/git/default.nix
+++ b/packages/git/default.nix
@@ -2,8 +2,8 @@
   programs.git = {
     enable = true;
     extraConfig = {
-      user.name = "${general.gitProfile.User}";
-      user.email = "${general.gitProfile.Email}";
+      user.name = "${general.gitProfile.user}";
+      user.email = "${general.gitProfile.email}";
       init.defaultBranch = "${general.gitProfile.defaultBranch}";
     };
   };
diff --git a/packages/kitty/default.nix b/packages/kitty/default.nix
index 27863c1..46dc1ea 100644
--- a/packages/kitty/default.nix
+++ b/packages/kitty/default.nix
@@ -1,4 +1,4 @@
-{general, ...}: {
+{terminal, ...}: {
   programs.kitty = {
     enable = true;
 
@@ -7,8 +7,8 @@
       confirm_os_window_close = 0;
       window_padding_width = 10;
 
-      font_size = general.terminal.Size;
-      font_family = general.terminal.Font;
+      font_size = terminal.Size;
+      font_family = terminal.Font;
       bold_font = "auto";
       italic_font = "auto";
       bold_italic_font = "auto";
diff --git a/packages/zsh/default.nix b/packages/zsh/default.nix
index a450d5b..930298f 100644
--- a/packages/zsh/default.nix
+++ b/packages/zsh/default.nix
@@ -1,6 +1,6 @@
 {
   pkgs,
-  general,
+  terminal,
   ...
 }: {
   home.packages = with pkgs; [
@@ -13,7 +13,7 @@
   programs.zsh = {
     enableCompletion = false;
     syntaxHighlighting.enable = false;
-    shellAliases = general.terminal.Aliases;
+    shellAliases = terminal.shellAliases;
     history.size = 10000;
     antidote = {
       enable = true;