Revert "udp"

This reverts commit 3ebe0c9fca.

config.nix

@@ -1,12 +1,7 @@
 {
   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,19 +5,12 @@
   ...
 }: {
   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.