what did the one commit say to the other.. git good

system/network.nix

@@ -5,34 +5,52 @@
   systemName,
   ...
 }:
-
 {
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  #networking.hostName = "mrfluffyLaptop"; # Define your hostname.
-  networking.hostName = lib.mkMerge [
-    (lib.mkIf (systemName == "laptop") "mrfluffyLaptop")
-    (lib.mkIf (systemName == "pc") "mrfluffyPC")
-  ];
+  networking = {
+    # Define hostname based on system type
+    hostName = lib.mkMerge [
+      (lib.mkIf (systemName == "laptop") "mrfluffyLaptop")
+      (lib.mkIf (systemName == "pc") "mrfluffyPC")
+    ];
 
-  networking.firewall.enable = false;
-  networking.firewall.checkReversePath = false; 
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager = { 
-    enable = true; # Easiest to use and most distros use this by default.
+    # Firewall configuration
+    firewall = {
+      # Open ports in the firewall.
+      # allowedTCPPorts = [ ... ];
+      # allowedUDPPorts = [ ... ];
+      # Or disable the firewall altogether.
+      enable = false;
+      checkReversePath = false;
+    };
+
+    # Networking options
+    # Pick only one of the below networking options.
+    # wireless.enable = true; # Enables wireless support via wpa_supplicant.
+    networkmanager = {
+      enable = true; # Easiest to use and most distros use this by default.
+      dns = "none";
+    };
+
+    # DHCP settings
+    useDHCP = false;
+    dhcpcd.enable = false;
+
+    # IPv6 configuration
+    # enableIPv6 = false;
+
+    # Configure network proxy if necessary
+    # proxy.default = "http://user:password@proxy:port/";
+    # proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+    # Hosts and DNS configuration
+    extraHosts = ''
+      127.0.0.0 localhost
+    '';
+    nameservers = [ "192.168.1.1" ];
+    search = [ "localdomain" ];
+
+    # # environment.etc = {
+    # # "resolv.conf".text = "nameserver 192.168.1.180\noptions edns0 trust-ad\nsearch home\n";
+    # # };
   };
-  #networking.enableIPv6 = false;
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-  networking.extraHosts = ''
-    127.0.0.0 localhost
-  '';
-  networking.nameservers = [ "192.168.1.180" ];
-  #  # environment.etc = {
-  #  #   "resolv.conf".text = "nameserver 192.168.1.180\noptions edns0 trust-ad\nsearch home\n";
-  #  # };
 }