test2

2025-06-28 17:28:50 -05:00
parent ea86b6f7e5
commit d00c9836d6
5 changed files with 20 additions and 7 deletions
@@ -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.