Kaynağa Gözat

ntnu vpn stuff was split into two files, fix

Johan Rong 1 ay önce
ebeveyn
işleme
4fc5e93134

+ 0 - 11
nixos/modules/hardware/networking/default.nix

@@ -6,9 +6,6 @@
     networkmanager = {
       enable = true;
       dns = "none";
-      plugins = with pkgs; [
-        networkmanager-openconnect
-      ];
     };
     firewall = {
       checkReversePath = false;
@@ -20,14 +17,6 @@
   };
 
   environment.systemPackages = with pkgs; [
-    openconnect
     networkmanagerapplet
   ];
-
-  environment.etc."gnutls/config".text = ''
-    [overrides]
-    disabled-version = tls1.0
-    disabled-version = tls1.1
-    disabled-version = tls1.3
-  '';
 }

+ 21 - 2
nixos/profiles/school/ntnu-vpn.nix

@@ -1,8 +1,28 @@
 { pkgs, ... }:
 
 {
+  networking = {
+    networkmanager = {
+      plugins = with pkgs; [
+        networkmanager-openconnect
+      ];
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    openconnect
+    networkmanagerapplet
+  ];
+
+  environment.etc."gnutls/config".text = ''
+    [overrides]
+    disabled-version = tls1.0
+    disabled-version = tls1.1
+    disabled-version = tls1.3
+  '';
+
   system.activationScripts.networkmanager-ntnu = ''
-  FILE="/etc/NetworkManager/system-connections/NTNU-VPN.nmconnection"
+  FILE="/etc/NetworkManager/system-connections/NTgNU-VPN.nmconnection"
   
   if [ ! -f "$FILE" ]; then
     mkdir -p /etc/NetworkManager/system-connections
@@ -43,7 +63,6 @@ method=auto
 EOF
     chmod 0600 "$FILE"
     
-    # Last inn nye tilkoplingar i NetworkManager med ein gong
     ${pkgs.networkmanager}/bin/nmcli connection reload
   fi
   '';