VPN: wireguard-gui service and app rework

* Reorganizing files
* removing wireguard-gui-launcher package
* bumping new version of wireguard-gui app

Signed-off-by: Enes Öztürk <enes.ozturk@unikie.com>

Author: enesoztrk

flake.lock

@@ -154,8 +154,13 @@
     };
 
     wireguard-gui = {
-      url = "github:tiiuae/wireguard-gui";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:enesoztrk/wireguard-gui/56b92f8d4d8cf006e53d9fa5373709b00663a45e";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+        crane.follows = "givc/crane";
+      };
+
     };
 
     ci-test-automation = {

flake.nix

@@ -21,7 +21,7 @@ let
   inherit (configHost.ghaf.virtualization.microvm-host) sharedVmDirectory;
 
   makeVm =
-    { vm, vmIndex }: # TODO the vmIndex is not used. but it is passed when calling makeVm
+    { vm }:
     let
       vmName = "${vm.name}-vm";
       # A list of applications for the GIVC service
@@ -346,11 +346,7 @@ in
               useTunneling = lib.mkEnableOption "Use Pulseaudio tunneling";
             };
             vtpm.enable = lib.mkEnableOption "vTPM support in the virtual machine";
-            # FIXME: Temporary solution to keep order of virtual machines, otherwise hosts file points to wrong vms.
-            vmIndex = mkOption {
-              type = types.int;
-              internal = true;
-            };
+
           };
         }
       );
@@ -415,7 +411,7 @@ in
       microvm.vms =
         let
           vms' = lib.attrsets.mapAttrsToList (name: vm: { inherit name; } // vm) vms;
-          vms'' = lib.imap0 (vmIndex: vm: { "${vm.name}-vm" = makeVm { inherit vmIndex vm; }; }) vms';
+          vms'' = map (vm: { "${vm.name}-vm" = makeVm { inherit vm; }; }) vms';
         in
         lib.foldr lib.recursiveUpdate { } vms'';
 

modules/common/services/wireguard-gui-vm-conf.nix

@@ -36,6 +36,7 @@ let
             path = "${pkgs.givc-cli}/bin/givc-cli ${config.ghaf.givc.cliArgs} start app --vm ${vm} ${app.givcName}";
             inherit (app) icon;
           }) virtualApps;
+
           # Launchers for all desktop, non-virtualized applications that run in the GUIVM
           guivmLaunchers = map (app: {
             inherit (app) name;
@@ -200,16 +201,6 @@ let
               };
           };
 
-          environment.etc."ctrl-panel/wireguard-gui-vms.txt" =
-            let
-               vmstxt = lib.concatStringsSep "\n" config.ghaf.services.wireguard-gui.vms;
-            in
-            {
-              text =  ''
-                ${vmstxt}
-              '';
-            };
-
           environment = {
             systemPackages =
               (rmDesktopEntries [

modules/common/services/wireguard-gui.nix

@@ -132,7 +132,15 @@
           icon = "losslesscut";
           command = "losslesscut --enable-features=UseOzonePlatform --ozone-platform=wayland";
         }
-      ];
+      ]
+      ++ (lib.optionals config.ghaf.reference.services.wireguard-gui [
+        {
+          name = "Wireguard BusinessVM";
+          description = "WireGuard VPN configuration tool";
+          icon = "airvpn";
+          command = "wireguard-gui-launcher";
+        }
+      ]);
     extraModules = [
 
       {
@@ -148,6 +156,7 @@
         imports = [
           ../services/pac/pac.nix
           ../services/firewall/firewall.nix
+          ../services/wireguard-gui/wireguard-gui.nix
         ];
 
         # Enable Proxy Auto-Configuration service for the browser
@@ -160,6 +169,10 @@
 
           # Enable firewall and allow access to TII VPN
           firewall.enable = true;
+
+          # Enable WireGuard GUI
+          wireguard-gui.enable = config.ghaf.reference.services.wireguard-gui;
+
         };
       }
     ];