Move VPN config location, add JDC VPN config

home/openfortivpn/jetdata-vpn.conf

@@ -0,0 +1,5 @@
+host = vpn.jetdata.eu
+port = 943
+username = elitherl
+set-dns = 0
+set-routes = 0

home/openfortivpn/ukaea-vpn.conf

@@ -1,3 +1,5 @@
 host = vpn.ukaea.uk
 port = 943
 username = elitherl
+set-dns = 1
+set-routes = 1

home/openfortivpn/ukaea.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = [
+    (pkgs.writeShellScriptBin "ukaea-vpn-connect" "sudo ${pkgs.openfortivpn}/bin/openfortivpn -c ${./ukaea-vpn.conf}")
+    (pkgs.writeShellScriptBin "jetdata-vpn-connect" "sudo ${pkgs.openfortivpn}/bin/openfortivpn -c ${./jetdata-vpn.conf}")
+  ];
+}

home/scripts/ukaea-vpn.nix

@@ -1,2 +0,0 @@
-pkgs:
-(pkgs.writeShellScriptBin "ukaea-vpn-connect" "sudo ${pkgs.openfortivpn}/bin/openfortivpn -c ${./ukaea-vpn.conf}")

home/work.nix

@@ -5,11 +5,11 @@
   ...
 }:
 {
-  imports = [ ./default.nix ];
-  home.packages = [
-    pkgs.twinkle
-    (import ./scripts/ukaea-vpn.nix pkgs)
+  imports = [
+    ./default.nix
+    ./openfortivpn/ukaea.nix
   ];
+  home.packages = [ pkgs.twinkle ];
   programs.git.userEmail = config.accounts.email.accounts.outlook.address;
   accounts.email.accounts = {
     proton.primary = lib.mkForce false;