networking: switch to networkmanager

1 files changed, 36 insertions, 35 deletions

diff --git a/modules/nixos/sils/networking.nix b/modules/nixos/sils/networking.nix
index d1fe770..fed09f7 100644
--- a/modules/nixos/sils/networking.nix
+++ b/modules/nixos/sils/networking.nix
@@ -10,42 +10,43 @@ in {
   config = lib.mkIf cfg.enable {
     networking = {
       enableIPv6 = false;
-      useDHCP = true;
+      #useDHCP = true;
+      networkmanager.enable = true;
       #nameservers = ["2620:fe::fe" "2620:fe::9" "9.9.9.9" "149.112.112.112"];
-      wireless = {
-        enable = true;
-        environmentFile = config.age.secrets.wireless.path;
-        networks = {
-          # Important: Never forget the second '@'!
-          "@SSID_N0@".psk = "@PSK_N0@";
-          "@SSID_N1@".psk = "@PSK_N1@";
-          "@SSID_N2@" = {
-            hidden = true;
-            psk = "@PSK_N2@";
-          };
-          "@SSID_N3@".psk = "@PSK_N3@";
-          "@SSID_N4@" = {
-            auth = ''
-              proto=RSN
-              key_mgmt=WPA-EAP
-              pairwise=CCMP
-              auth_alg=OPEN
-              eap=PEAP
-              identity="@IDENTITY_N4@"
-              password="@PSK_N4@"
-              ca_cert="${self}/files/DNSX-CA.pem"
-            '';
-          };
-          "@SSID_N5@".psk = "@PSK_N5@";
-          "GPN-Open".auth = ''
-            key_mgmt=OWE
-          '';
-        };
-        userControlled = {
-          enable = true;
-          group = "wheel"; # TODO: Change this?
-        };
-      };
+      #wireless = {
+      #  enable = false; # TODO: Reenable
+      #  environmentFile = config.age.secrets.wireless.path;
+      #  networks = {
+      #    # Important: Never forget the second '@'!
+      #    "@SSID_N0@".psk = "@PSK_N0@";
+      #    "@SSID_N1@".psk = "@PSK_N1@";
+      #    "@SSID_N2@" = {
+      #      hidden = true;
+      #      psk = "@PSK_N2@";
+      #    };
+      #    "@SSID_N3@".psk = "@PSK_N3@";
+      #    "@SSID_N4@" = {
+      #      auth = ''
+      #        proto=RSN
+      #        key_mgmt=WPA-EAP
+      #        pairwise=CCMP
+      #        auth_alg=OPEN
+      #        eap=PEAP
+      #        identity="@IDENTITY_N4@"
+      #        password="@PSK_N4@"
+      #        ca_cert="${self}/files/DNSX-CA.pem"
+      #      '';
+      #    };
+      #    "@SSID_N5@".psk = "@PSK_N5@";
+      #    "GPN-Open".auth = ''
+      #      key_mgmt=OWE
+      #    '';
+      #  };
+      #  userControlled = {
+      #    enable = true;
+      #    group = "wheel"; # TODO: Change this?
+      #  };
+      #};
     };
   };
 }