test2

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.

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.

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}";
     };
   };

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";

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;