Merge pull request #686 from matheusmelo18/main

feat: added powerbi

.github/workflows/update-nix.yaml

@@ -1,40 +0,0 @@
-name: "Update Flake Packages"
-
-permissions:
-  contents: write
-  pull-requests: write
-
-on:
-  pull_request:
-    branches: [main]
-    types: [labeled]
-  schedule:
-    - cron: "0 10 * * 0" # https://crontab.guru/#0_10_*_*_0
-
-jobs:
-  build:
-    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'rebuild nix')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@main
-        with:
-          trust-runner-user: true
-
-      - name: Set up cache
-        uses: cachix/cachix-action@v15
-        with:
-          name: winapps
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
-      - name: Update flake packages
-        uses: winapps-org/nix-update-action@v1.4.0
-        with:
-          extra-args: --version=branch
-          skip-pr: "${{ github.event_name == 'pull_request' }}"
-
-      - name: Build packages
-        run: nix build .#winapps .#winapps-launcher

.github/workflows/update-submodule.yaml

@@ -1,37 +0,0 @@
-name: Update submodules
-on:
-  repository_dispatch:
-    types: update
-
-jobs:
-  update:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Update module
-        run: |
-          pushd WinApps-Launcher
-            branch=$(git rev-parse --abbrev-ref origin/HEAD | sed "s|origin/||")
-            git config remote.origin.fetch "+refs/heads/$branch:refs/remotes/origin/$branch"
-            git fetch --depth=1 origin "refs/heads/$branch"
-          popd
-
-          git submodule update --init --remote WinApps-Launcher
-
-      - name: Commit and push
-        uses: EndBug/add-and-commit@v9
-        with:
-          add: WinApps-Launcher
-          default_author: github_actions
-          message: "Update submodules"
-          push: false
-
-      - name: Create PR
-        uses: peter-evans/create-pull-request@v7
-        with:
-          branch: chore/update_submodules
-          delete-branch: true
-          title: "Update submodules"

.gitignore

@@ -0,0 +1,5 @@
+/.idea
+/.vscode
+/result
+.DS_Store
+**/.DS_Store

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "WinApps-Launcher"]
-	path = WinApps-Launcher
-	url = https://github.com/winapps-org/WinApps-Launcher.git

LICENSE.md

@@ -8,7 +8,7 @@ Due to lack of a license, it is All Rights Reserved by the original author.
 We have tried contacting Fmstrat about this, but they abandoned the project and did not reply nor apply an open-source license to the project.
 However, almost all parts of the codebase have been rewritten and all new contributions require a Contributor License Agreement ([for individuals](https://gist.github.com/oskardotglobal/35f0a72eb45fcc7087e535561383dbc5), [for legal entities](https://gist.github.com/oskardotglobal/75a8cc056e56a439fa6a1551129ae47f)) to be signed. Therefore, the below license is applied to all new contributions made to the project.
 
-Refer to a specific file for it's respective license.
+Refer to a specific file for its respective license.
 
 # GNU AFFERO GENERAL PUBLIC LICENSE
 

README.md

@@ -17,21 +17,22 @@ WinApps works by:
 - The GNU/Linux `/home` directory is accessible within Windows via the `\\tsclient\home` mount.
 - Integration with `Nautilus`, allowing you to right-click files to open them with specific Windows applications based on the file MIME type.
 - The [official taskbar widget](https://github.com/winapps-org/WinApps-Launcher) enables seamless administration of the Windows subsystem and offers an easy way to launch Windows applications.
+- Microsoft Office links (e.g. ms-word://) from the host system are automatically opened in the Windows subsystem. (Note: You may need to use a [User Agent Switcher](https://github.com/ray-lothian/UserAgent-Switcher/) browser extension and set the User-Agent to Windows, as the Office webapps typically hide the "Open in Desktop App" option for Linux users.)
 
 ## Supported Applications
-**WinApps supports <u>*ALL*</u> Windows applications.**
+**WinApps supports <u>*ALL*</u> Windows applications.** Support does not, however, extend to kernel-level anti-cheat systems (e.g. Riot Vanguard).
 
 Universal application support is achieved by:
-1. Scanning Windows for any officially supported applications (list below).
+1. Scanning Windows for any community tested applications (list below).
 2. Scanning Windows for any other `.exe` files listed within the Windows Registry.
 
-Officially supported applications benefit from high-resolution icons and pre-populated MIME types. This enables file managers to determine which Windows applications should open files based on file extensions. Icons for other detected applications are pulled from `.exe` files.
+Community tested applications benefit from high-resolution icons and pre-populated MIME types. This enables file managers to determine which Windows applications should open files based on file extensions. Icons for other detected applications are pulled from `.exe` files.
 
 Contributing to the list of supported applications is encouraged through submission of pull requests! Please help us grow the WinApps community.
 
-*Please note that the provided list of officially supported applications is community-driven. As such, some applications may not be tested and verified by the WinApps team.*
+*Please note that the provided list of community tested applications is community-driven. As such, some applications may not be tested and verified by the WinApps team.*
 
-### Officially Supported Applications
+### Community Tested Applications
 <table cellpadding="10" cellspacing="0" border="0">
     <tr>
         <!-- Adobe Acrobat Pro -->
@@ -302,7 +303,7 @@ Install the required dependencies.
       ```
 
 > [!NOTE]
-> On Debian you need to enable the `backports` repository for the `freerdp3-x11` package to become available.
+> On Debian 12 (_"bookworm"_), you need to enable the `backports` repository for the `freerdp3-x11` package to become available.
 > For instructions, see https://backports.debian.org/Instructions.
 
   - Fedora/RHEL:
@@ -311,9 +312,9 @@ Install the required dependencies.
       ```
   - Arch Linux:
       ```bash
-      sudo pacman -Syu --needed -y curl dialog freerdp git iproute2 libnotify gnu-netcat
+      sudo pacman -Syu --needed -y curl dialog freerdp git iproute2 libnotify openbsd-netcat
       ```
-  - OpenSUSE:
+  - openSUSE:
       ```bash
       sudo zypper install -y curl dialog freerdp git iproute2 libnotify-tools netcat-openbsd
       ```
@@ -397,24 +398,15 @@ RDP_SCALE="100"
 #   This improves compatibility with most desktop environments (DEs).
 # ATTENTION: The Filesystem Hierarchy Standard (FHS) recommends /media instead. Verify your system's configuration.
 # - To manually mount devices, you may optionally use /mnt.
-# REFERRENCE: https://wiki.archlinux.org/title/Udisks#Mount_to_/media
+# REFERENCE: https://wiki.archlinux.org/title/Udisks#Mount_to_/media
 REMOVABLE_MEDIA="/run/media"
 
 # [ADDITIONAL FREERDP FLAGS & ARGUMENTS]
 # NOTES:
 # - You can try adding /network:lan to these flags in order to increase performance, however, some users have faced issues with this.
-# DEFAULT VALUE: '/cert:tofu /sound /microphone'
+# DEFAULT VALUE: '/cert:tofu /sound /microphone +home-drive'
 # VALID VALUES: See https://github.com/awakecoding/FreeRDP-Manuals/blob/master/User/FreeRDP-User-Manual.markdown
-RDP_FLAGS="/cert:tofu /sound /microphone"
-
-# [MULTIPLE MONITORS]
-# NOTES:
-# - If enabled, a FreeRDP bug *might* produce a black screen.
-# DEFAULT VALUE: 'false'
-# VALID VALUES:
-# - 'true'
-# - 'false'
-MULTIMON="false"
+RDP_FLAGS="/cert:tofu /sound /microphone +home-drive"
 
 # [DEBUG WINAPPS]
 # NOTES:
@@ -427,8 +419,7 @@ DEBUG="true"
 
 # [AUTOMATICALLY PAUSE WINDOWS]
 # NOTES:
-# - This is currently INCOMPATIBLE with 'docker' and 'manual'.
-# - See https://github.com/dockur/windows/issues/674
+# - This is currently INCOMPATIBLE with 'manual'.
 # DEFAULT VALUE: 'off'
 # VALID VALUES:
 # - 'on'
@@ -477,8 +468,19 @@ RDP_TIMEOUT="30"
 # DEFAULT VALUE: '60'
 APP_SCAN_TIMEOUT="60"
 
+# WINDOWS BOOT
+# - The maximum time (in seconds) to wait for the Windows VM to boot if it is not running, before attempting to launch an application.
+# DEFAULT VALUE: '120'
+BOOT_TIMEOUT="120"
 ```
 
+> [!IMPORTANT]
+> To safeguard your Windows password, ensure `~/.config/winapps/winapps.conf` is accessible only by your user account.
+> ```bash
+> chown $(whoami):$(whoami) ~/.config/winapps/winapps.conf
+> chmod 600 ~/.config/winapps/winapps.conf
+> ```
+
 > [!IMPORTANT]
 > `RDP_USER` and `RDP_PASS` must correspond to a complete Windows user account and password, such as those created during Windows setup or for a domain user. User/PIN combinations are not valid for RDP access.
 
@@ -491,7 +493,8 @@ APP_SCAN_TIMEOUT="60"
 - For domain users, you can uncomment and change `RDP_DOMAIN`.
 - On high-resolution (UHD) displays, you can set `RDP_SCALE` to the scale you would like to use (100, 140 or 180).
 - To add additional flags to the FreeRDP call (e.g. `/prevent-session-lock 120`), uncomment and use the `RDP_FLAGS` configuration option.
-- For multi-monitor setups, you can try enabling `MULTIMON`. A FreeRDP bug may result in a black screen however, in which case you should revert this change.
+- For multi-monitor setups, you can try adding `/multimon` to `RDP_FLAGS`. A FreeRDP bug may result in a black screen however, in which case you should revert this change.
+- To enable non-English input and seamless language switching, you can try adding `/kbd:unicode` to `RDP_FLAGS`. This ensures client inputs are sent as Unicode sequences.
 - If you enable `DEBUG`, a log will be created on each application start in `~/.local/share/winapps/winapps.log`.
 - If using a system on which the FreeRDP command is not `xfreerdp` or `xfreerdp3`, the correct command can be specified using `FREERDP_COMMAND`.
 
@@ -562,7 +565,7 @@ Adding your own applications with custom icons and MIME types to the installer i
 1. Modify the name and variables to reflect the appropriate/desired values for your application.
 2. Replace `icon.svg` with an SVG for your application (ensuring the icon is appropriately licensed).
 3. Remove and reinstall WinApps.
-4. Submit a pull request to add your application to WinApps as an officially supported application once you have tested and verified your configuration (optional, but encouraged).
+4. Submit a pull request to add your application to WinApps as a community tested application once you have tested and verified your configuration (optional, but encouraged).
 
 ## Running Applications Manually
 WinApps offers a manual mode for running applications that were not configured by the WinApps installer. This is completed with the `manual` flag. Executables that are in the Windows PATH do not require full path definition.
@@ -578,6 +581,11 @@ The installer can be run multiple times. To update your installation of WinApps:
 2. Pull the latest changes from the WinApps GitHub repository.
 3. Re-install WinApps using the WinApps installer by running `winapps-setup`.
 
+## WinApps Launcher (Optional)
+The [WinApps Launcher](https://github.com/winapps-org/winapps-launcher) provides a simple system tray menu that makes it easy to launch your installed Windows applications, open a full desktop RDP session, and control your Windows VM or container. You can start, stop, pause, reboot or hibernate Windows, as well as access your installed applications from a convenient list. This lightweight, optional tool helps streamline your overall WinApps experience.
+
+<img src="./demo/launcher.gif" width=1000 alt="WinApps Launcher Animation.">
+
 ## Installation using Nix
 
 First, follow Step 1 of the normal installation guide to create your VM.
@@ -592,10 +600,6 @@ First, make sure Flakes and the `nix` command are enabled.
 In your `~/.config/nix/nix.conf`:
 ```
 experimental-features = nix-command flakes
-# specify to use binary cache (optional)
-extra-substituters = https://winapps.cachix.org/
-extra-trusted-public-keys = winapps.cachix.org-1:HI82jWrXZsQRar/PChgIx1unmuEsiQMQq+zt05CD36g=
-extra-trusted-users = <your-username> # replace with your username
 ```
 
 ```bash
@@ -642,12 +646,6 @@ nix profile install github:winapps-org/winapps#winapps-launcher # optional
               ...
             }:
             {
-              # set up binary cache (optional)
-              nix.settings = {
-                substituters = [ "https://winapps.cachix.org/" ];
-                trusted-public-keys = [ "winapps.cachix.org-1:HI82jWrXZsQRar/PChgIx1unmuEsiQMQq+zt05CD36g=" ];
-              };
-
               environment.systemPackages = [
                 winapps.packages."${system}".winapps
                 winapps.packages."${system}".winapps-launcher # optional

apps/adobe-digital-editions-4.5/icon.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ai_x5F_cc_x5F_app_x5F_RGB.svg"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 240 234" width="320" height="312" enable-background="new 0 0 240 234" xml:space="preserve">
+    <path fill="#260C00" d="M41.9,7.5C13.8,7.5,7.3,24.2,7.3,52.4L7.4,189c0,28.2,8.8,37.6,36.9,37.6H195c28.1,0,37.6-9.4,37.6-37.5
+    V47.2c0-28.2-10.5-39.7-38.6-39.7C194,7.5,41.9,7.5,41.9,7.5z"/>
+    <g>
+        <g>
+            <path fill="#FF6000" d="M0,43.1v148.2C0,214.9,18.2,234,41.9,234h155.3c23.7,0,42.9-19.1,42.9-42.8V42.8C240,19.2,220.8,0,197.1,0
+            H41.9C18.2,0,0,19.2,0,42.8V43.1z M194,10.1c19.1,0,35.9,15.7,35.9,34.8v142.3c0,19.1-15.5,36.7-34.6,36.7H44.7
+            c-19.1,0-34.6-16.2-34.6-35.3l0-141.7c0-19,15.5-36.8,34.5-36.8L194,10.1L194,10.1z"/>
+        </g>
+    </g>
+    <g>
+        <g>
+            <path fill="#FEDCCA" d="M182.3,171.3H57.7c-7.4,0-9.7-2.4-9.7-9.8V71.1c0-7.4,2.4-9.8,9.7-9.8h124.5c7.4,0,9.7,2.4,9.7,9.8v90.5
+            C192,168.9,189.6,171.3,182.3,171.3z M57.7,65.3c-5.1,0-5.7,0.6-5.7,5.8v90.5c0,5.2,0.6,5.8,5.7,5.8h124.5c5.1,0,5.7-0.6,5.7-5.8
+            V71.1c0-5.2-0.6-5.8-5.7-5.8H57.7z"/>
+        </g>
+        <g>
+            <path fill="#FF6000" d="M57,162.3h61v-92H57V162.3z M67,93h44v2H67V93z M67,102.1h44v2H67V102.1z M67,111h44v2H67V111z M67,120h44
+            v2H67V120z M67,129.1h44v2H67V129.1z M67,138h44v2H67V138z"/>
+            <path fill="#FF6000" d="M158.7,70.3H122v92h61V94.2L158.7,70.3z M129.3,92.5h24.5v2h-24.5V92.5z M129.3,101.6l43.6,0.2l0,2
+            l-43.6-0.2L129.3,101.6z M173.3,139.5h-44.1v-2h44.1V139.5z M173.3,130.6h-44.1v-2h44.1V130.6z M173.3,121.5h-44.1v-2h44.1V121.5z
+             M173.3,112.5h-44.1v-2h44.1V112.5z M158.3,94.6V72.4L181,94.6H158.3z"/>
+        </g>
+    </g>
+</svg>

apps/adobe-digital-editions-4.5/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="Adobe Digital Editions"
+
+# Used for descriptions and window class
+FULL_NAME="Adobe Digital Editions"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files (x86)\Adobe\Adobe Digital Editions 4.5\DigitalEditions.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Adobe"
+
+# GNOME mimetypes
+MIME_TYPES="application/epub+zip;application/vnd.adobe.adept+xml;"
+
+# System Icon
+ICON="AdobeDigitalEditions"

apps/aftereffects-2024/icon.svg

@@ -0,0 +1 @@
+<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><path d="m2 12.1333c0-3.54697 0-5.32047.69029-6.67524.6072-1.19169 1.57608-2.16057 2.76777-2.76777 1.35477-.69029 3.12827-.69029 6.67524-.69029h7.7334c3.547 0 5.3205 0 6.6752.69029 1.1917.6072 2.1606 1.57608 2.7678 2.76777.6903 1.35477.6903 3.12827.6903 6.67524v7.7334c0 3.547 0 5.3205-.6903 6.6752-.6072 1.1917-1.5761 2.1606-2.7678 2.7678-1.3547.6903-3.1282.6903-6.6752.6903h-7.7334c-3.54697 0-5.32047 0-6.67524-.6903-1.19169-.6072-2.16057-1.5761-2.76777-2.7678-.69029-1.3547-.69029-3.1282-.69029-6.6752z" fill="#00005b"/><g fill="#99f"><path d="m13.7893 19.5638h-4.3389l-.88281 2.8181c-.02451.1045-.12074.1785-.22541.1734h-2.19764c-.12532 0-.16915-.0706-.13148-.2119l3.75663-11.0508c.0376-.1155.07514-.2285.11274-.3763.04913-.2571.07429-.5183.07513-.7802-.01076-.0774.05604-.14596.13144-.1349h2.9866c.0875 0 .1375.0321.1502.0963l4.2639 12.2651c.0375.1286-.0001.1928-.1127.1927h-2.4419c-.0856.0097-.1674-.049-.1878-.1349zm-3.6627-2.3761h2.9678c-.4876-1.6662-1.0379-3.3104-1.4839-4.9896-.5054 1.7418-.9721 3.3572-1.4839 4.9896z"/><path d="m20.6608 18.4757c.1727 1.4309 1.3743 2.1131 2.7048 2.084.7503-.0147 1.5521-.1312 2.2532-.4149.0624-.0511.0939-.0192.0939.0964v1.8301c.0059.0952-.0339.1803-.1127.2312-.8714.3958-1.8716.5152-2.8167.5-2.8178 0-4.7529-1.9854-4.7521-4.874-.0074-2.7374 1.7685-5.0468 4.5267-5.0468 2.3381-.0606 3.9568 1.8113 3.9633 4.1414 0 .4243-.0237.8502-.0751 1.2714-.01.0868-.0839.1542-.1691.1542-1.8673 0-3.7437.027-5.6162.027zm0-1.755c1.0407 0 2.0874.0368 3.1274-.0096.1563-.016.2724-.0457.2724-.2082-.0217-.8638-.7507-1.5743-1.5966-1.5412-1.022-.0634-1.6761.7994-1.8032 1.759z"/></g></svg>

apps/aftereffects-2024/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="After Effects 2024"
+
+# Used for descriptions and window class
+FULL_NAME="Adobe After Effects 2024"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files\Adobe\Adobe After Effects 2024\Support Files\AfterFX.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Adobe"
+
+# GNOME mimetypes
+MIME_TYPES="application/vnd.adobe.aftereffects.project;application/vnd.adobe.aftereffects.template;"
+
+# System Icon
+ICON="AdobeAfterEffects"

apps/audition-2024/icon.svg

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+    <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+    <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+    <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+    <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+    <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+    <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+    <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+    <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 256.4 250"
+     enable-background="new 0 0 256.4 250" xml:space="preserve">
+<metadata>
+    <sfw  xmlns="&ns_sfw;">
+        <slices></slices>
+        <sliceSourceBounds  bottomLeftOrigin="true" height="250" width="256.4" x="-8.2" y="-8"></sliceSourceBounds>
+    </sfw>
+</metadata>
+<g>
+    <path fill="#00005B" d="M45.4,0H211c25.1,0,45.4,20.3,45.4,45.4v159.2c0,25.1-20.3,45.4-45.4,45.4H45.4C20.3,250,0,229.7,0,204.6
+        V45.4C0,20.3,20.3,0,45.4,0z"/>
+    <g>
+        <path fill="#9999FF" d="M100.7,149.6H61l-8.1,25.2c-0.2,1-1.1,1.6-2,1.5H30.8c-1.2,0-1.5-0.6-1.2-1.9L64,75.6
+            c0.3-1.1,0.6-2.2,1.1-3.5c0.5-2.2,0.9-4.5,0.9-6.8c-0.1-0.5,0.3-1.1,0.9-1.2c0.1,0,0.2,0,0.3,0h27.4c0.7,0,1.3,0.3,1.4,0.9
+            l38.8,109.6c0.3,1.2,0,1.7-1.1,1.7h-22.3c-0.7,0.1-1.5-0.4-1.7-1.2L100.7,149.6z M67.2,128.3h27.1c-0.6-2.2-1.5-4.9-2.5-7.7
+            c-1-2.9-1.9-6-2.9-9.2c-1.1-3.3-2-6.5-3.1-9.8s-2-6.4-2.9-9.5c-0.9-3-1.6-5.8-2.4-8.3h-0.2c-1,4.6-2.1,9.2-3.6,13.8
+            c-1.6,5.1-3.2,10.5-4.9,15.8C70.5,118.8,68.8,123.8,67.2,128.3L67.2,128.3z"/>
+        <path fill="#9999FF" d="M216.7,92.1v65.5c0,2.9,0,5.4,0.1,7.7c0.1,2.2,0.2,4.2,0.3,5.9c0.2,1.7,0.3,2.7,0.4,3.8
+            c0.1,1-0.3,1.4-1.2,1.4H198c-0.9,0.1-1.7-0.4-2-1.2c-0.2-0.9-0.4-1.8-0.6-2.7c-0.2-0.7-0.2-1.5-0.2-2.2c-3.4,3.1-7.6,5.3-12.1,6.6
+            c-3.8,1.1-7.9,1.6-11.9,1.6c-4,0-7.9-0.5-11.6-1.8c-3.4-1.2-6.6-3.2-9.1-5.9c-2.8-3-4.8-6.5-6-10.4c-1.5-4.9-2.2-10-2.1-15.2v-53
+            c-0.1-0.6,0.3-1.3,1.1-1.4c0.1,0,0.2,0,0.3,0h20.4c0.6-0.1,1.3,0.3,1.4,1.1c0,0.1,0,0.2,0,0.3v50.2c0,4.7,1.1,8.4,3.1,11.1
+            c2,2.7,6.2,4.1,11,4.1c2.5,0,4.9-0.4,7.3-1.3c2.5-0.9,4.7-2,6.7-3.5V92.1c0-0.7,0.5-1.2,1.5-1.2h20.4c0.5-0.1,1.2,0.3,1.2,0.9
+            C216.7,91.9,216.7,92,216.7,92.1z"/>
+    </g>
+</g>
+</svg>

apps/audition-2024/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="Audition 2024"
+
+# Used for descriptions and window class
+FULL_NAME="Adobe Audition 2024"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files\Adobe\Adobe Audition 2024\Adobe Audition.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Adobe"
+
+# GNOME mimetypes
+MIME_TYPES=""
+
+# System Icon
+ICON="AdobeAudition"

apps/emclient/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="eM Client"
+
+# Used for descriptions and window class
+FULL_NAME="eM Client"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files (x86)\eM Client\mailclient.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Network;Office;"
+
+# GNOME mimetypes
+MIME_TYPES=""
+
+# System Icon
+ICON="eM Client"

apps/illustrator-2024/icon.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 240 234">
+  <path fill="#300" d="M42.5 0h155C221 0 240 19 240 42.5v149c0 23.5-19 42.5-42.5 42.5h-155C19 234 0 215 0 191.5v-149C0 19 19 0 42.5 0z"/>
+  <path fill="#ff9a00" d="M116 140H78.8l-7.6 23.5c-.2.9-1 1.5-1.9 1.4H50.5c-1.1 0-1.4-.6-1.1-1.8l32.2-92.7c.3-1 .6-2.1 1-3.3.4-2.1.6-4.3.6-6.5-.1-.5.3-1 .8-1.1h25.9c.8 0 1.2.3 1.3.8l36.5 103c.3 1.1 0 1.6-1 1.6h-20.9c-.7.1-1.4-.4-1.6-1.1L116 140zm-31.4-20.3H110c-.6-2.1-1.4-4.6-2.3-7.2-.9-2.7-1.8-5.6-2.7-8.6-1-3.1-1.9-6.1-2.9-9.2s-1.9-6-2.7-8.9c-.8-2.8-1.5-5.4-2.2-7.8H97c-.9 4.3-2 8.6-3.4 12.9-1.5 4.8-3 9.8-4.6 14.8-1.4 5.1-2.9 9.8-4.4 14zM170 77c-3.3.1-6.5-1.2-8.9-3.5-2.3-2.5-3.5-5.8-3.4-9.2-.1-3.4 1.2-6.6 3.6-8.9s5.6-3.5 8.9-3.5c3.9 0 6.9 1.2 9.1 3.5 2.2 2.4 3.4 5.6 3.3 8.9.1 3.4-1.1 6.7-3.5 9.2-2.3 2.4-5.7 3.7-9.1 3.5zm-11.2 86.8v-77c0-1 .4-1.4 1.3-1.4h19.8c.9 0 1.3.5 1.3 1.4v77c0 1.1-.4 1.6-1.3 1.6h-19.6c-1 0-1.5-.6-1.5-1.6z"/>
+</svg>

apps/illustrator-2024/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="Illustrator 2024"
+
+# Used for descriptions and window class
+FULL_NAME="Adobe Illustrator 2024"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files\Adobe\Adobe Illustrator 2024\Support Files\Contents\Windows\Illustrator.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Adobe"
+
+# GNOME mimetypes
+MIME_TYPES="application/illustrator;"
+
+# System Icon
+ICON="AdobeIllustrator"

apps/indesign-2024/icon.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg style="enable-background:new 0 0 240 234" version="1.1" viewBox="0 0 240 234" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<title>Adobe InDesign CC logo</title>
+<style type="text/css">
+    .st0{fill:#49021F;}
+    .st1{fill:#FF3366;}
+</style>
+    <path class="st0" d="M42.5,0h155C221,0,240,19,240,42.5v149c0,23.5-19,42.5-42.5,42.5h-155C19,234,0,215,0,191.5v-149   C0,19,19,0,42.5,0z"/>
+    <g id="vlpa">
+        <g id="vlpb">
+            <path class="st1" d="m87.2 61.2v103c0 1.1-0.5 1.6-1.4 1.6h-19.6c-0.9 0-1.3-0.5-1.3-1.6v-103c0-0.9 0.5-1.3 1.4-1.3h19.5c0.6-0.1 1.2 0.3 1.3 1 0.1 0.1 0.1 0.2 0.1 0.3z"/>
+            <path class="st1" d="m145 167c-7.4 0.1-14.8-1.4-21.5-4.5-6.3-2.9-11.5-7.7-15.1-13.6-3.7-6.1-5.5-13.7-5.5-22.8-0.1-7.4 1.8-14.7 5.5-21.1 3.8-6.5 9.3-11.9 15.9-15.5 7-3.9 15.4-5.8 25.3-5.8 0.5 0 1.2 0 2.1 0.1s1.9 0.1 3.1 0.2v-31.6c0-0.7 0.3-1.1 1-1.1h20.3c0.5-0.1 0.9 0.3 1 0.7v0.2 95.2c0 1.8 0.1 3.8 0.2 6 0.2 2.1 0.3 4.1 0.4 5.8 0 0.7-0.3 1.3-1 1.6-5.2 2.2-10.7 3.8-16.3 4.8-5 0.9-10.2 1.4-15.4 1.4zm9.8-20v-44c-0.9-0.2-1.8-0.4-2.7-0.5-1.1-0.1-2.2-0.2-3.3-0.2-3.9 0-7.8 0.8-11.3 2.6-3.4 1.7-6.3 4.2-8.5 7.4s-3.3 7.5-3.3 12.7c-0.1 3.5 0.5 7 1.7 10.3 1 2.7 2.5 5.1 4.5 7.1 1.9 1.8 4.2 3.2 6.8 4 2.7 0.9 5.5 1.3 8.3 1.3 1.5 0 2.9-0.1 4.2-0.2 1.3 0.1 2.5-0.1 3.6-0.5z"/>
+        </g>
+    </g>
+
+</svg>

apps/indesign-2024/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="InDesign 2024"
+
+# Used for descriptions and window class
+FULL_NAME="Adobe InDesign 2024"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files\Adobe\Adobe InDesign 2024\InDesign.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Adobe"
+
+# GNOME mimetypes
+MIME_TYPES="application/x-adobe-indesign-interchange;application/x-adobe-indesign;"
+
+# System Icon
+ICON="AdobeIndesign"

apps/mediaencoder-2024/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 240 234"><path fill="#00005B" d="M42.5,0h155C221,0,240,19,240,42.5v149c0,23.5-19,42.5-42.5,42.5h-155C19,234,0,215,0,191.5v-149C0,19,19,0,42.5,0z"/><path fill="#9999FF" d="M33.8,60.9c0.1-0.6,0.6-1,1.2-1c0,0,0,0,0,0h28.1c0.8-0.1,1.5,0.4,1.7,1.1c0.7,2.8,1.6,6.1,2.6,10.1c1,3.9,2.1,8.2,3.3,13c1.2,4.7,2.4,9.6,3.6,14.5c1.2,4.9,2.4,9.7,3.6,14.4c1.2,4.7,2.2,9,3,12.9c0.8,3.9,1.5,7.2,2,9.7h0.2c0.4-2.3,1.1-5.3,2.1-9c1-3.8,2.2-8,3.5-12.6c1.3-4.7,2.7-9.5,4.1-14.4c1.4-4.9,2.7-9.8,4.1-14.7c1.3-4.8,2.6-9.3,3.7-13.4c1.2-4.1,2.1-7.6,2.8-10.4c0.1-0.7,0.7-1.2,1.4-1.1h27.4c0.7-0.1,1.3,0.4,1.4,1c0,0,0,0.1,0,0.1l3.7,102.9c0.1,0.4,0,0.8-0.2,1c-0.3,0.3-0.6,0.4-1,0.4h-19.9c-0.3,0-0.5-0.1-0.8-0.2c-0.2-0.2-0.3-0.6-0.3-0.9c0-5.5,0-11.2-0.1-17.2c-0.1-6-0.1-12-0.2-18.1c-0.1-6.1-0.1-11.9,0-17.5c0.1-5.6,0.2-10.7,0.2-15.5c0-4.7,0-8.8,0.1-12.3c0.1-3.5,0.1-6.1,0.1-7.8h-0.2c-0.6,2.7-1.4,6.2-2.4,10.5c-1,4.3-2.2,9.2-3.6,14.7c-1.4,5.4-2.9,11-4.4,16.8c-1.6,5.8-3.1,11.5-4.6,17.2c-1.5,5.7-2.9,11-4.3,15.9c-1.4,4.9-2.5,9.3-3.4,13c-0.2,0.8-0.9,1.3-1.7,1.3H73.1c-0.9,0.1-1.7-0.4-1.8-1.3c-0.9-3.8-2-8.1-3.1-13c-1.2-4.9-2.4-10.1-3.6-15.5c-1.2-5.4-2.5-10.9-3.9-16.5c-1.4-5.6-2.7-11.1-3.9-16.3c-1.2-5.3-2.3-10.2-3.3-14.8c-1-4.6-1.9-8.7-2.7-12.2h-0.3v12.7c0,4.9-0.1,10.4-0.2,16.3c-0.2,6-0.3,12.2-0.5,18.7c-0.2,6.5-0.3,13.2-0.5,20.1c-0.2,6.9-0.5,13.8-0.8,20.5c0,0.9-0.4,1.3-1.2,1.3H29.6c-0.3,0-0.7-0.1-1-0.2c-0.3-0.2-0.3-0.6-0.2-1.2L33.8,60.9zM196.7,130.3H165c0.4,3,1.4,5.9,3.1,8.5c1.8,2.7,4.3,4.8,7.3,6c3.3,1.5,7.5,2.3,12.8,2.3c3.5,0,7-0.3,10.4-0.9c3.2-0.6,6.4-1.5,9.4-2.8c0.5-0.4,0.8-0.2,0.8,0.8v15.3c0,0.4-0.1,0.8-0.2,1.2c-0.2,0.3-0.4,0.5-0.7,0.7c-3.3,1.6-6.8,2.7-10.5,3.5c-4.7,0.9-9.4,1.3-14.2,1.2c-7.6,0-14-1.2-19.2-3.5c-4.9-2.1-9.2-5.4-12.6-9.5c-3.2-3.9-5.5-8.3-6.9-13.1c-1.4-4.7-2.1-9.6-2.1-14.6c0-5.4,0.8-10.7,2.5-15.9c1.6-5,4.1-9.6,7.5-13.7c3.3-4,7.4-7.2,12.1-9.5c5.2-2.4,11-3.6,16.7-3.5c5.3-0.1,10.6,0.9,15.5,3.1c4.1,1.9,7.8,4.7,10.5,8.3c2.6,3.4,4.7,7.2,6,11.4c1.3,4,1.9,8.1,1.9,12.2c0,2.4-0.1,4.5-0.2,6.4c-0.2,1.9-0.3,3.3-0.4,4.2c-0.1,0.7-0.7,1.3-1.4,1.3c-0.6,0-1.7,0.1-3.3,0.2c-1.6,0.2-3.5,0.3-5.8,0.3C201.7,130.2,199.2,130.3,196.7,130.3z M165,114.6H186c2.6,0,4.5,0,5.7-0.1c0.8,0,1.6-0.1,2.3-0.2v-1c0-1.3-0.2-2.5-0.6-3.7c-1.8-5.6-7.1-9.4-13-9.2c-5.5-0.3-10.7,2.6-13.3,7.6C166,110.1,165.3,112.3,165,114.6z"/></svg>

apps/mediaencoder-2024/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="Media Encoder 2024"
+
+# Used for descriptions and window class
+FULL_NAME="Adobe Media Encoder 2024"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files\Adobe\Adobe Media Encoder 2024\Adobe Media Encoder.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Adobe"
+
+# GNOME mimetypes
+MIME_TYPES=""
+
+# System Icon
+ICON="AdobeMediaEncoder"

apps/mirc/info

@@ -1,8 +1,3 @@
-# Copyright (c) 2024 Fmstrat | App tested by whitewolf101 02/22/2025
-# All rights reserved.
-#
-# SPDX-License-Identifier: Proprietary
-
 # GNOME shortcut name
 NAME="mIRC"
 

apps/ms-office-protocol-handler.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Microsoft Office Protocol Handler
+Comment=Handle Microsoft Office URI schemes via WinApps
+Exec=winapps manual %u
+Terminal=false
+Type=Application
+MimeType=x-scheme-handler/ms-word;x-scheme-handler/ms-excel;x-scheme-handler/ms-powerpoint;x-scheme-handler/ms-outlook;x-scheme-handler/ms-access;x-scheme-handler/ms-visio;x-scheme-handler/ms-project;x-scheme-handler/ms-teams;x-scheme-handler/ms-whiteboard;x-scheme-handler/ms-officeapp;
+NoDisplay=true
+Categories=Office;Utility;

apps/paint.net/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="Paint.NET"
+
+# Used for descriptions and window class
+FULL_NAME="Paint.NET"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files\Paint.NET\paintdotnet.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Graphic;"
+
+# GNOME mimetypes
+MIME_TYPES=""
+
+# System Icon
+ICON="Paint.Net"

apps/pdfgear/info

@@ -0,0 +1,14 @@
+# GNOME shortcut name
+NAME="pdfgear"
+
+# Used for descriptions and window class
+FULL_NAME="PDF Gear"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files\PDFgear\PDFLauncher.exe"
+
+# GNOME categories
+CATEGORIES="Office;Viewer;Graphics;pdf"
+
+# GNOME mimetypes
+MIME_TYPES="application/pdf;"

apps/photoshop-2024/icon.svg

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="0 0 240 234" style="enable-background:new 0 0 240 234;" xml:space="preserve">
+<style type="text/css">
+    .st0{fill:#001E36;}
+    .st1{fill:#31A8FF;}
+</style>
+<g id="Layer_2_1_">
+    <g id="Surfaces">
+        <g id="Photo_Surface">
+            <g id="Outline_no_shadow">
+                <path class="st0" d="M42.5,0h155C221,0,240,19,240,42.5v149c0,23.5-19,42.5-42.5,42.5h-155C19,234,0,215,0,191.5v-149
+                    C0,19,19,0,42.5,0z"/>
+            </g>
+        </g>
+    </g>
+    <g id="Outlined_Mnemonics_Logos">
+        <g id="Ps">
+            <path class="st1" d="M54,164.1V61.2c0-0.7,0.3-1.1,1-1.1c1.7,0,3.3,0,5.6-0.1c2.4-0.1,4.9-0.1,7.6-0.2c2.7-0.1,5.6-0.1,8.7-0.2
+                c3.1-0.1,6.1-0.1,9.1-0.1c8.2,0,15,1,20.6,3.1c5,1.7,9.6,4.5,13.4,8.2c3.2,3.2,5.7,7.1,7.3,11.4c1.5,4.2,2.3,8.5,2.3,13
+                c0,8.6-2,15.7-6,21.3c-4,5.6-9.6,9.8-16.1,12.2c-6.8,2.5-14.3,3.4-22.5,3.4c-2.4,0-4,0-5-0.1c-1-0.1-2.4-0.1-4.3-0.1v32.1
+                c0.1,0.7-0.4,1.3-1.1,1.4c-0.1,0-0.2,0-0.4,0H55.2C54.4,165.4,54,165,54,164.1z M75.8,79.4V113c1.4,0.1,2.7,0.2,3.9,0.2H85
+                c3.9,0,7.8-0.6,11.5-1.8c3.2-0.9,6-2.8,8.2-5.3c2.1-2.5,3.1-5.9,3.1-10.3c0.1-3.1-0.7-6.2-2.3-8.9c-1.7-2.6-4.1-4.6-7-5.7
+                c-3.7-1.5-7.7-2.1-11.8-2c-2.6,0-4.9,0-6.8,0.1C77.9,79.2,76.5,79.3,75.8,79.4L75.8,79.4z"/>
+            <path class="st1" d="M192,106.9c-3-1.6-6.2-2.7-9.6-3.4c-3.7-0.8-7.4-1.3-11.2-1.3c-2-0.1-4.1,0.2-6,0.7c-1.3,0.3-2.4,1-3.1,2
+                c-0.5,0.8-0.8,1.8-0.8,2.7c0,0.9,0.4,1.8,1,2.6c0.9,1.1,2.1,2,3.4,2.7c2.3,1.2,4.7,2.3,7.1,3.3c5.4,1.8,10.6,4.3,15.4,7.3
+                c3.3,2.1,6,4.9,7.9,8.3c1.6,3.2,2.4,6.7,2.3,10.3c0.1,4.7-1.3,9.4-3.9,13.3c-2.8,4-6.7,7.1-11.2,8.9c-4.9,2.1-10.9,3.2-18.1,3.2
+                c-4.6,0-9.1-0.4-13.6-1.3c-3.5-0.6-7-1.7-10.2-3.2c-0.7-0.4-1.2-1.1-1.1-1.9v-17.4c0-0.3,0.1-0.7,0.4-0.9
+                c0.3-0.2,0.6-0.1,0.9,0.1c3.9,2.3,8,3.9,12.4,4.9c3.8,1,7.8,1.5,11.8,1.5c3.8,0,6.5-0.5,8.3-1.4c1.6-0.7,2.7-2.4,2.7-4.2
+                c0-1.4-0.8-2.7-2.4-4c-1.6-1.3-4.9-2.8-9.8-4.7c-5.1-1.8-9.8-4.2-14.2-7.2c-3.1-2.2-5.7-5.1-7.6-8.5c-1.6-3.2-2.4-6.7-2.3-10.2
+                c0-4.3,1.2-8.4,3.4-12.1c2.5-4,6.2-7.2,10.5-9.2c4.7-2.4,10.6-3.5,17.7-3.5c4.1,0,8.3,0.3,12.4,0.9c3,0.4,5.9,1.2,8.6,2.3
+                c0.4,0.1,0.8,0.5,1,0.9c0.1,0.4,0.2,0.8,0.2,1.2v16.3c0,0.4-0.2,0.8-0.5,1C192.9,107.1,192.4,107.1,192,106.9z"/>
+        </g>
+    </g>
+</g>
+</svg>

apps/photoshop-2024/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="Photoshop 2024"
+
+# Used for descriptions and window class
+FULL_NAME="Adobe Photoshop 2024"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files\Adobe\Adobe Photoshop 2024\Photoshop.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Adobe"
+
+# GNOME mimetypes
+MIME_TYPES="image/vnd.adobe.photoshop;"
+
+# System Icon
+ICON="AdobePhotoshop"

apps/powerbi-store/icon.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+  <title>Power BI Logo</title>
+  <defs>
+    <linearGradient id="gradient1" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" style="stop-color:#F2C94C"/>
+      <stop offset="100%" style="stop-color:#F2994A"/>
+    </linearGradient>
+  </defs>
+  <rect x="10" y="30" width="15" height="60" fill="url(#gradient1)" rx="2"/>
+  <rect x="30" y="20" width="15" height="70" fill="url(#gradient1)" rx="2"/>
+  <rect x="50" y="10" width="15" height="80" fill="url(#gradient1)" rx="2"/>
+  <rect x="70" y="25" width="15" height="65" fill="url(#gradient1)" rx="2"/>
+</svg>

apps/powerbi-store/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="Power BI Desktop (Microsoft Store)"
+
+# Used for descriptions and window class
+FULL_NAME="Microsoft Power BI Desktop (Store Version)"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Users\%USERNAME%\AppData\Local\Microsoft\WindowsApps\PBIDesktop.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Office"
+
+# GNOME mimetypes
+MIME_TYPES="application/x-powerbi;application/vnd.ms-powerbi;application/powerbi;application/x-pbix;application/vnd.powerbi.pbix"
+
+# System Icon
+ICON="ms-powerbi"

apps/powerbi/icon.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+  <title>Power BI Logo</title>
+  <defs>
+    <linearGradient id="gradient1" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" style="stop-color:#F2C94C"/>
+      <stop offset="100%" style="stop-color:#F2994A"/>
+    </linearGradient>
+  </defs>
+  <rect x="10" y="30" width="15" height="60" fill="url(#gradient1)" rx="2"/>
+  <rect x="30" y="20" width="15" height="70" fill="url(#gradient1)" rx="2"/>
+  <rect x="50" y="10" width="15" height="80" fill="url(#gradient1)" rx="2"/>
+  <rect x="70" y="25" width="15" height="65" fill="url(#gradient1)" rx="2"/>
+</svg>

apps/powerbi/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="Power BI Desktop (Traditional)"
+
+# Used for descriptions and window class
+FULL_NAME="Microsoft Power BI Desktop"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files\Microsoft Power BI Desktop\bin\PBIDesktop.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Office"
+
+# GNOME mimetypes
+MIME_TYPES="application/x-powerbi;application/vnd.ms-powerbi;application/powerbi;application/x-pbix;application/vnd.powerbi.pbix"
+
+# System Icon
+ICON="ms-powerbi"

apps/premierepro-2024/icon.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg style="enable-background:new 0 0 240 234" version="1.1" viewBox="0 0 240 234" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<title>Adobe Premiere Pro CC logo</title>
+<style type="text/css">
+    .st0{fill:#00005B;}
+    .st1{fill:#9999FF;}
+</style>
+<g id="vlpa">
+    <g id="vlpb">
+        <g id="vlpc">
+            <g id="vlpd">
+                <path class="st0" d="M42.5,0h155C221,0,240,19,240,42.5v149c0,23.5-19,42.5-42.5,42.5h-155C19,234,0,215,0,191.5v-149      C0,19,19,0,42.5,0z"/>
+            </g>
+        </g>
+    </g>
+    <g id="vlpe">
+        <g id="vlpf">
+            <path class="st1" d="m57 164v-103c0-0.7 0.3-1.1 1-1.1 1.7 0 3.3 0 5.6-0.1 2.4-0.1 4.9-0.1 7.6-0.2s5.6-0.1 8.7-0.2 6.1-0.1 9.1-0.1c8.2 0 15 1 20.6 3.1 5 1.7 9.6 4.5 13.4 8.2 3.2 3.2 5.7 7.1 7.3 11.4 1.5 4.2 2.3 8.5 2.3 13 0 8.6-2 15.7-6 21.3s-9.6 9.8-16.1 12.2c-6.8 2.5-14.3 3.4-22.5 3.4-2.4 0-4 0-5-0.1s-2.4-0.1-4.3-0.1v32.1c0.1 0.7-0.4 1.3-1.1 1.4h-0.4-19c-0.8 0-1.2-0.4-1.2-1.3zm21.8-84.7v33.6c1.4 0.1 2.7 0.2 3.9 0.2h5.3c3.9 0 7.8-0.6 11.5-1.8 3.2-0.9 6-2.8 8.2-5.3 2.1-2.5 3.1-5.9 3.1-10.3 0.1-3.1-0.7-6.2-2.3-8.9-1.7-2.6-4.1-4.6-7-5.7-3.7-1.5-7.7-2.1-11.8-2-2.6 0-4.9 0-6.8 0.1-2-0.1-3.4 0-4.1 0.1z"/>
+            <path class="st1" d="m147 85.2h17.5c1 0 1.8 0.7 2.1 1.6 0.3 0.8 0.5 1.6 0.6 2.5 0.2 1 0.4 2.1 0.5 3.1 0.1 1.1 0.2 2.3 0.2 3.6 3-3.5 6.6-6.4 10.7-8.6 4.6-2.6 9.9-3.9 15.2-3.9 0.7-0.1 1.3 0.4 1.4 1.1v0.4 19.5c0 0.8-0.5 1.1-1.6 1.1-3.6-0.1-7.3 0.2-10.8 1-2.9 0.6-5.7 1.5-8.4 2.7-1.9 0.9-3.7 2.1-5.1 3.7v51c0 1-0.4 1.4-1.3 1.4h-19.7c-0.8 0.1-1.5-0.4-1.6-1.2v-0.4-55.4c0-2.4 0-4.9-0.1-7.5s-0.1-5.2-0.2-7.8c0-2.3-0.2-4.5-0.4-6.8-0.1-0.5 0.2-1 0.7-1.1 0-0.1 0.2-0.1 0.3 0z"/>
+        </g>
+    </g>
+</g>
+</svg>

apps/premierepro-2024/info

@@ -0,0 +1,17 @@
+# GNOME shortcut name
+NAME="Premiere Pro 2024"
+
+# Used for descriptions and window class
+FULL_NAME="Adobe Premiere Pro 2024"
+
+# The executable inside windows
+WIN_EXECUTABLE="C:\Program Files\Adobe\Adobe Premiere Pro 2024\Adobe Premiere Pro.exe"
+
+# GNOME categories
+CATEGORIES="WinApps;Adobe"
+
+# GNOME mimetypes
+MIME_TYPES="image/vnd.adobe.premierepro.project;"
+
+# System Icon
+ICON="AdobePremierePro"

bin/winapps

@@ -49,12 +49,12 @@ REMOVABLE_MEDIA=""
 RDP_SCALE=100
 AUTOPAUSE="off"
 AUTOPAUSE_TIME="300"
-MULTIMON="false"
 DEBUG="true"
-MULTI_FLAG=""
+BOOT_TIMEOUT=120
 
 # OTHER
 FREERDP_PID=-1
+NEEDED_BOOT=false
 
 ### TRAPS ###
 # Catch SIGINT (CTRL+C) to call 'waCleanUp'.
@@ -107,15 +107,15 @@ Please run:
         notify-send --expire-time=8000 --icon="dialog-error" --app-name="WinApps" --urgency="low" "WinApps" "Windows failed to resume."
         ;;
     "$EC_FAIL_DESTROY")
-        dprint "ERROR: WINDOWS FAILED TO IMMEDIATELY UNGRACEFULLY SHUT DOWN WINDOWS. EXITING."
-        notify-send --expire-time=8000 --icon="dialog-error" --app-name="WinApps" --urgency="low" "WinApps" "Failed to ungracefully shut down Windows."
+        dprint "ERROR: FAILED TO FORCE STOP WINDOWS. EXITING."
+        notify-send --expire-time=8000 --icon="dialog-error" --app-name="WinApps" --urgency="low" "WinApps" "Failed to forcibly stop Windows."
         ;;
     "$EC_SD_TIMEOUT")
         dprint "ERROR: WINDOWS TOOK TOO LONG TO SHUT DOWN. EXITING."
         notify-send --expire-time=8000 --icon="dialog-error" --app-name="WinApps" --urgency="low" "WinApps" "Windows took too long to shut down."
         ;;
     "$EC_DIE_TIMEOUT")
-        dprint "ERROR: WINDOWS TOOK TOO LONG TO SHUT DOWN. EXITING."
+        dprint "ERROR: WINDOWS TOOK TOO LONG TO DIE. EXITING."
         notify-send --expire-time=8000 --icon="dialog-error" --app-name="WinApps" --urgency="low" "WinApps" "Windows took too long to die."
         ;;
     "$EC_RESTART_TIMEOUT")
@@ -158,7 +158,7 @@ function dprint() {
     [ "$DEBUG" = "true" ] && echo "[$(date)-$RUNID] $1" >>"$LOG_PATH"
 }
 # Name: 'waFixRemovableMedia'
-# Role: If user left REMOVABLE_MEDIA config null,fallback to /run/media for udisks defaults ,warning.
+# Role: If REMOVABLE_MEDIA is empty, default to /run/media (udisks default) and show a warning.
 function waFixRemovableMedia() {
     if [ -z "$REMOVABLE_MEDIA" ]; then
         REMOVABLE_MEDIA="/run/media"  # Default for udisks
@@ -212,9 +212,6 @@ function waLoadConfig() {
         waThrowExit $EC_MISSING_CONFIG
     fi
 
-    # Update 'MULTI_FLAG' based on 'MULTIMON'.
-    MULTI_FLAG=$([[ $MULTIMON == "true" ]] && echo "/multimon" || echo "+span")
-
     # Update $RDP_SCALE.
     waFixScale
     # Update when $REMOVABLE_MEDIA is null
@@ -304,9 +301,10 @@ function waGetFreeRDPCommand() {
 function waCheckGroupMembership() {
     # Identify groups the current user belongs to.
     # shellcheck disable=SC2155 # Silence warnings regarding masking return values through simultaneous declaration and assignment.
-    local USER_GROUPS=$(groups "$(whoami)")
+    local USER_GROUPS=$(id -nG "$(whoami)")
 
-    if ! (echo "$USER_GROUPS" | grep -q -E "\blibvirt\b") || ! (echo "$USER_GROUPS" | grep -q -E "\bkvm\b"); then
+    if ! echo "$USER_GROUPS" | grep -qE '\b(libvirt|libvirtd)\b' || \
+       ! echo "$USER_GROUPS" | grep -qE '\bkvm\b'; then
         waThrowExit "$EC_NOT_IN_GROUP"
     fi
 }
@@ -328,6 +326,7 @@ function waCheckVMRunning() {
         if (virsh list --state-shutoff --name | xargs | grep -wq "$VM_NAME"); then
             dprint "WINDOWS SHUT OFF. BOOTING WINDOWS."
             notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows."
+            NEEDED_BOOT=true
             virsh start "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_START
             if (virsh list --state-paused --name | xargs | grep -wq "$VM_NAME"); then
                 dprint "WINDOWS PAUSED. RESUMING WINDOWS."
@@ -349,6 +348,7 @@ function waCheckVMRunning() {
                         dprint "WINDOWS SHUT OFF. BOOTING WINDOWS."
                         notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows."
                         virsh start "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_START
+                        NEEDED_BOOT=true
                         break
                     fi
                     sleep $TIME_INTERVAL
@@ -362,6 +362,7 @@ function waCheckVMRunning() {
                     dprint "WINDOWS DESTROYED. BOOTING WINDOWS."
                     notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows."
                     virsh start "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_START
+                    NEEDED_BOOT=true
                 fi
             elif (virsh domstate "$VM_NAME" | xargs | grep -wq "dying"); then
                 dprint "WINDOWS DYING. WAITING."
@@ -377,6 +378,7 @@ function waCheckVMRunning() {
                             dprint "WINDOWS DESTROYED. BOOTING WINDOWS."
                             notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows."
                             virsh start "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_START
+                            NEEDED_BOOT=true
                         fi
                         break
                     elif (virsh list --state-shutoff --name | xargs | grep -wq "$VM_NAME"); then
@@ -384,6 +386,7 @@ function waCheckVMRunning() {
                         dprint "WINDOWS SHUT OFF. BOOTING WINDOWS."
                         notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows."
                         virsh start "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_START
+                        NEEDED_BOOT=true
                         break
                     fi
                     sleep $TIME_INTERVAL
@@ -400,6 +403,45 @@ function waCheckVMRunning() {
 
     # Handle non-zero exit statuses.
     [ "$EXIT_STATUS" -ne 0 ] && waThrowExit "$EXIT_STATUS"
+
+    # Wait for VM to be fully ready
+    if [[ "$NEEDED_BOOT" == "true" ]]; then
+        dprint "WAITING FOR VM TO BE FULLY READY..."
+        notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Waiting for Windows to be ready..."
+
+        TIME_ELAPSED=0
+
+        while (( TIME_ELAPSED < BOOT_TIMEOUT )); do
+            # Check if VM is running
+            if (virsh list --state-running --name | xargs | grep -wq "$VM_NAME"); then
+                # Try to connect to RDP port to verify it's ready
+                if timeout 1 bash -c ">/dev/tcp/$RDP_IP/$RDP_PORT" 2>/dev/null; then
+                    dprint "VM IS READY"
+                    notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Windows is ready."
+                    # Add a delay after Windows is ready
+                    if [ "$NEEDED_BOOT" = "true" ]; then
+                        sleep 10
+                    fi
+                    break
+                fi
+            fi
+
+            sleep 5
+            TIME_ELAPSED=$((TIME_ELAPSED + 5))
+
+            # Show progress every 30 seconds
+            if (( TIME_ELAPSED % 30 == 0 )); then
+                notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Still waiting for Windows to be ready... ($TIME_ELAPSED seconds elapsed)"
+            fi
+        done
+
+        # If we timed out waiting for the VM
+        if (( TIME_ELAPSED >= BOOT_TIMEOUT )); then
+            dprint "TIMEOUT WAITING FOR VM TO BE READY"
+            notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Timeout waiting for Windows to be ready. Please try again."
+            waThrowExit $EC_FAIL_START
+        fi
+    fi
 }
 
 # Name: 'waCheckContainerRunning'
@@ -431,6 +473,7 @@ function waCheckContainerRunning() {
             dprint "WINDOWS CREATED. BOOTING WINDOWS."
             notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows."
             $COMPOSE_COMMAND --file "$COMPOSE_PATH" start &>/dev/null
+            NEEDED_BOOT=true
             ;;
         "restarting")
             dprint "WINDOWS RESTARTING. WAITING."
@@ -441,6 +484,7 @@ function waCheckContainerRunning() {
                     EXIT_STATUS=0
                     dprint "WINDOWS RESTARTED."
                     notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Restarted Windows."
+                    NEEDED_BOOT=true
                     break
                 fi
                 sleep $TIME_INTERVAL
@@ -456,11 +500,13 @@ function waCheckContainerRunning() {
             dprint "WINDOWS SHUT OFF. BOOTING WINDOWS."
             notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows."
             $COMPOSE_COMMAND --file "$COMPOSE_PATH" start &>/dev/null
+            NEEDED_BOOT=true
             ;;
         "dead")
             dprint "WINDOWS DEAD. RECREATING WINDOWS CONTAINER."
             notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Re-creating and booting Windows."
             $COMPOSE_COMMAND --file "$COMPOSE_PATH" down &>/dev/null && $COMPOSE_COMMAND --file "$COMPOSE_PATH" up -d &>/dev/null
+            NEEDED_BOOT=true
             ;;
         "unknown")
             EXIT_STATUS=$EC_UNKNOWN
@@ -469,6 +515,45 @@ function waCheckContainerRunning() {
 
     # Handle non-zero exit statuses.
     [ "$EXIT_STATUS" -ne 0 ] && waThrowExit "$EXIT_STATUS"
+
+    # Wait for container to be fully ready
+    if [[ "$CONTAINER_STATE" == "created" || "$CONTAINER_STATE" == "exited" || "$CONTAINER_STATE" == "dead" || "$CONTAINER_STATE" == "restarting" ]]; then
+        dprint "WAITING FOR CONTAINER TO BE FULLY READY..."
+        notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Waiting for Windows to be ready..."
+
+        TIME_ELAPSED=0
+
+        while (( TIME_ELAPSED < BOOT_TIMEOUT )); do
+            # Check if container is running
+            if [[ $("$WAFLAVOR" inspect --format='{{.State.Status}}' "$CONTAINER_NAME") == "running" ]]; then
+                # Try to connect to RDP port to verify it's ready
+                if timeout 1 bash -c ">/dev/tcp/$RDP_IP/$RDP_PORT" 2>/dev/null; then
+                    dprint "CONTAINER IS READY"
+                    notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Windows is ready."
+                    # Add a delay after Windows is ready
+                    if [ "$NEEDED_BOOT" = "true" ]; then
+                        sleep 10
+                    fi
+                    break
+                fi
+            fi
+
+            sleep 5
+            TIME_ELAPSED=$((TIME_ELAPSED + 5))
+
+            # Show progress every 30 seconds
+            if (( TIME_ELAPSED % 30 == 0 )); then
+                notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Still waiting for Windows to be ready... ($TIME_ELAPSED seconds elapsed)"
+            fi
+        done
+
+        # If we timed out waiting for the container
+        if (( TIME_ELAPSED >= BOOT_TIMEOUT )); then
+            dprint "TIMEOUT WAITING FOR CONTAINER TO BE READY"
+            notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Timeout waiting for Windows to be ready. Please try again."
+            waThrowExit $EC_FAIL_START
+        fi
+    fi
 }
 
 # Name: 'waCheckPortOpen'
@@ -521,11 +606,8 @@ function waRunCommand() {
             /u:"$RDP_USER" \
             /p:"$RDP_PASS" \
             /scale:"$RDP_SCALE" \
-            +dynamic-resolution \
             +auto-reconnect \
-            +home-drive \
-            +clipboard \
-            -wallpaper \
+            +dynamic-resolution \
             /wm-class:"Microsoft Windows" \
             /t:"Windows RDP Session [$RDP_IP]" \
             /v:"$RDP_IP" &>/dev/null &
@@ -540,12 +622,7 @@ function waRunCommand() {
             /u:"$RDP_USER" \
             /p:"$RDP_PASS" \
             /scale:"$RDP_SCALE" \
-            +dynamic-resolution \
             +auto-reconnect \
-            +home-drive \
-            +clipboard \
-            -wallpaper \
-            "$MULTI_FLAG" \
             /app:program:"$2" \
             /v:"$RDP_IP" &>/dev/null &
 
@@ -577,12 +654,7 @@ function waRunCommand() {
                 /u:"$RDP_USER" \
                 /p:"$RDP_PASS" \
                 /scale:"$RDP_SCALE" \
-                +dynamic-resolution \
                 +auto-reconnect \
-                +home-drive \
-                +clipboard \
-                -wallpaper \
-                "$MULTI_FLAG" \
                 /wm-class:"$FULL_NAME" \
                 /app:program:"$WIN_EXECUTABLE",icon:"$ICON",name:"$FULL_NAME" \
                 /v:"$RDP_IP" &>/dev/null &
@@ -593,7 +665,7 @@ function waRunCommand() {
             # Convert path from UNIX to Windows style.
             FILE_PATH=$(echo "$2" | sed \
                 -e 's|^'"${HOME}"'|\\\\tsclient\\home|' \
-                -e 's|^\('"${REMOVABLE_MEDIA//|/\\|}"'\)/[^/]*|\\\\tsclient\\media|' \
+                -e 's|^'"${REMOVABLE_MEDIA}"'|\\\\tsclient\\media|' \
                 -e 's|/|\\|g')
             dprint "UNIX_FILE_PATH: ${2}"
             dprint "WINDOWS_FILE_PATH: ${FILE_PATH}"
@@ -603,15 +675,10 @@ function waRunCommand() {
                 /u:"$RDP_USER" \
                 /p:"$RDP_PASS" \
                 /scale:"$RDP_SCALE" \
-                +dynamic-resolution \
                 +auto-reconnect \
-                +home-drive \
-                +clipboard \
                 /drive:media,"$REMOVABLE_MEDIA" \
-                -wallpaper \
-                "$MULTI_FLAG" \
                 /wm-class:"$FULL_NAME" \
-                /app:program:"$WIN_EXECUTABLE",icon:"$ICON",name:$"FULL_NAME",cmd:\""$FILE_PATH"\" \
+                /app:program:"$WIN_EXECUTABLE",icon:"$ICON",name:"$FULL_NAME",cmd:\""$FILE_PATH"\" \
                 /v:"$RDP_IP" &>/dev/null &
 
             # Capture the process ID.
@@ -640,7 +707,7 @@ function waCheckIdle() {
     local SUSPEND_WINDOWS=0
 
     # Prevent 'autopause' functionality with unsupported Windows backends.
-    if [ "$WAFLAVOR" != "manual" ] && [ "$WAFLAVOR" != "docker" ]; then
+    if [ "$WAFLAVOR" != "manual" ]; then
         # Check if there are no WinApps-related FreeRDP processes running.
         if ! ls "$APPDATA_PATH"/FreeRDP_Process_*.cproc &>/dev/null; then
             SUSPEND_WINDOWS=1

compose.yaml

@@ -44,6 +44,6 @@ services:
       # NOTE: 'disk1' will be mounted as the main drive. THIS DISK WILL BE FORMATTED BY DOCKER.
       # All following disks (disk2, ...) WILL NOT BE FORMATTED.
       # - /dev/disk/by-id/<id>:/disk1
-      # - dev/disk/by-id/<id>:/disk2
+      # - /dev/disk/by-id/<id>:/disk2
     # group_add:      # uncomment this line and the next one for using rootless podman containers
     #   - keep-groups # to make /dev/kvm work with podman. needs "crun" installed, "runc" will not work! Add your user to the 'kvm' group or another that can access /dev/kvm.

docs/docker.md

@@ -13,8 +13,8 @@ Although WinApps supports using `QEMU+KVM+libvirt` as a backend for running Wind
 
 > [!IMPORTANT]
 > The iptables kernel module must be loaded for folder sharing with the host to work.
-> Check that the output of `lsmod | grep ip_tables` and `lsmod | grep iptable_nat` is non empty.
-> If the output of one of the previous command is empty, run `echo -e "ip_tables\niptable_nat" | sudo tee /etc/modules-load.d/iptables.conf` and reboot.
+> Check that the output of `lsmod | grep ip_tables` and `lsmod | grep iptable_nat` is non-empty.
+> If the output of one of the previous commands is empty, run `echo -e "ip_tables\niptable_nat" | sudo tee /etc/modules-load.d/iptables.conf` and reboot.
 
 ## `Docker`
 ### Installation

docs/libvirt.md

@@ -1,6 +1,8 @@
 # Creating a `libvirt` Windows VM
-## Understanding The Virtualisation Stack
-This method of configuring a Windows virtual machine for use with WinApps is significantly more involved than utilising `Docker` or `Podman`. Nevertheless, expert users may prefer this method due to its greater flexibility and wider range of customisation options.
+This method of configuring a Windows virtual machine for use with WinApps is significantly more involved than utilising `Docker` or `Podman`. Nevertheless, expert users may prefer this method due to its greater flexibility and wider range of customisation options (e.g. GPU passthrough).
+
+<details>
+<summary><strong>Understanding The Virtualisation Stack</strong></summary>
 
 Before beginning, it is important to have a basic understanding of the various components involved in this particular method.
 
@@ -15,6 +17,8 @@ Together, these components form a powerful and flexible virtualization stack, wi
     <img src="./libvirt_images/Virtualisation_Stack.svg" width="500px"/>
 </p>
 
+</details>
+
 ## Prerequisites
 1. Ensure your CPU supports hardware virtualisation extensions by [reading this article](https://wiki.archlinux.org/title/KVM).
 
@@ -46,6 +50,8 @@ Together, these components form a powerful and flexible virtualization stack, wi
     sudo reboot # Reboot the system to ensure the user is added to the relevant groups.
     ```
 
+    Note: On NixOS, the group name for libvirt is `libvirtd` and not `libvirt`. In addition, user and group management on NixOS is handled through the Nix configuration files and not via traditional tools like `usermod`. Please see "Adding User to a group" on [this NixOS Wiki page](https://wiki.nixos.org/wiki/User_management).
+
     Note: Due to a known bug in `rpm-ostree`, which affects various distributions such as Silverblue, Bazzite, Bluefin, Kinoite, Aurora, UCore, and others, the commands provided earlier may not properly add your user to all required groups. If the `groups $USER` command does not show your user as being part of the necessary groups, you'll need to manually add these groups to `/etc/group` if they are present in `/usr/lib/group`.
 
     To resolve this:
@@ -144,7 +150,92 @@ Together, these components form a powerful and flexible virtualization stack, wi
     <img src="./libvirt_images/08.png" width="700px"/>
 </p>
 
-10. (Optional) Assign specific physical CPU cores to the virtual machine. This can improve performance by reducing context switching and ensuring that the virtual machine's workload consistently uses the same cores, leading to better CPU cache utilisation.
+10. Navigate to the `XML` tab, and edit the `<clock>` section to disable all timers except for the hypervclock, thereby drastically reducing idle CPU usage. Once changed, click `Apply`.
+    ```xml
+    <clock offset='localtime'>
+      <timer name='rtc' present='no' tickpolicy='catchup'/>
+      <timer name='pit' present='no' tickpolicy='delay'/>
+      <timer name='hpet' present='no'/>
+      <timer name='kvmclock' present='no'/>
+      <timer name='hypervclock' present='yes'/>
+    </clock>
+    ```
+
+<p align="center">
+    <img src="./libvirt_images/09.png" width="700px"/>
+</p>
+
+11. Enable Hyper-V enlightenments by adding the following to the `<hyperv>` section. Once changed, click `Apply`.
+
+    ```xml
+    <hyperv>
+      <relaxed state='on'/>
+      <vapic state='on'/>
+      <spinlocks state='on' retries='8191'/>
+      <vpindex state='on'/>
+      <synic state='on'/>
+      <stimer state='on'>
+        <direct state='on'/>
+      </stimer>
+      <reset state='on'/>
+      <frequencies state='on'/>
+      <reenlightenment state='on'/>
+      <tlbflush state='on'/>
+      <ipi state='on'/>
+    </hyperv>
+    ```
+
+> [!NOTE]
+> Hyper-V enlightenments make Windows (and other Hyper-V guests) think they are running on top of a Hyper-V compatible hypervisor. This enables use of Hyper-V specific features, allowing `KVM` to implement paravirtualised interfaces for improved virtual machine performance.
+
+12. Add the following XML snippet within the `<devices>` section to enable the GNU/Linux host to communicate with Windows using `QEMU Guest Agent`.
+
+    ```xml
+    <channel type='unix'>
+      <source mode='bind'/>
+      <target type='virtio' name='org.qemu.guest_agent.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='2'/>
+    </channel>
+    ```
+
+13. In the 'Memory' section, set the `Current allocation` to the minimum amount of memory you want the virtual machine to use, with a recommended value of `1024MB`.
+
+<p align="center">
+    <img src="./libvirt_images/10.png" width="500px"/>
+</p>
+
+14. (Optional) Under `Boot Options`, enable `Start virtual machine on host boot up`.
+
+<p align="center">
+    <img src="./libvirt_images/11.png" width="500px"/>
+</p>
+
+15. Navigate to 'SATA Disk 1' and set the `Disk bus` type to `VirtIO`. This allows disk access to be paravirtualised, improving virtual machine performance.
+
+<p align="center">
+    <img src="./libvirt_images/12.png" width="500px"/>
+</p>
+
+16. Navigate to 'NIC' and set the `Device model` type to `virtio` to enable paravirtualised networking.
+
+<p align="center">
+    <img src="./libvirt_images/13.png" width="500px"/>
+</p>
+
+17. Click the `Add Hardware` button in the lower left, and choose `Storage`. For `Device type`, select `CDROM device` and choose the VirtIO driver `.ISO` you downloaded earlier. Click `Finish` to add the new CD-ROM device.
+
+> [!IMPORTANT]
+> If you skip this step, the Windows installer will fail to recognise and list the virtual hard drive you created earlier.
+
+<p align="center">
+    <img src="./libvirt_images/14.png" width="500px"/>
+</p>
+
+<details>
+<summary><strong>(Optional) Assign Specific Physical CPU Cores</strong></summary>
+
+Assigning specific physical CPU cores to the virtual machine can improve performance by reducing context switching and ensuring that the virtual machine's workload consistently uses the same cores, leading to better CPU cache utilisation. This is an optional step.
+
 1. Run `lscpu -e` to determine which L1, L2 and L3 caches are associated with which CPU cores.
 
     Example 1 (Intel 11th Gen Core i7-1185G7):
@@ -193,7 +284,7 @@ Together, these components form a powerful and flexible virtualization stack, wi
 
     Example 1:
     - CPU cores share the same singular L3 cache, so this cannot be optimised.
-        - CPU cores utilise different L1 and L2 caches, so isolatng corresponding thread pairs will help improve performance.
+    - CPU cores utilise different L1 and L2 caches, so isolating corresponding thread pairs will help improve performance.
     - Thus, if limiting the virtual machine to a maximum of 4 threads, there are 10 possible optimal configurations:
         - T<sub>0</sub>+T<sub>4</sub>
         - T<sub>1</sub>+T<sub>5</sub>
@@ -250,95 +341,11 @@ Together, these components form a powerful and flexible virtualization stack, wi
 > [!NOTE]
 > More information on configuring CPU pinning can be found in [this excellent guide](https://wiki.archlinux.org/title/PCI_passthrough_via_OVMF#CPU_pinning).
 
-11. Navigate to the `XML` tab, and edit the `<clock>` section to disable all timers except for the hypervclock, thereby drastically reducing idle CPU usage. Once changed, click `Apply`.
-    ```xml
-    <clock offset='localtime'>
-      <timer name='rtc' present='no' tickpolicy='catchup'/>
-      <timer name='pit' present='no' tickpolicy='delay'/>
-      <timer name='hpet' present='no'/>
-      <timer name='kvmclock' present='no'/>
-      <timer name='hypervclock' present='yes'/>
-    </clock>
-    ```
+</details>
 
-<p align="center">
-    <img src="./libvirt_images/09.png" width="700px"/>
-</p>
-
-12. Enable Hyper-V enlightenments by adding the following to the `<hyperv>` section. Once changed, click `Apply`.
-
-    ```xml
-    <hyperv>
-      <relaxed state='on'/>
-      <vapic state='on'/>
-      <spinlocks state='on' retries='8191'/>
-      <vpindex state='on'/>
-      <synic state='on'/>
-      <stimer state='on'>
-        <direct state='on'/>
-      </stimer>
-      <reset state='on'/>
-      <frequencies state='on'/>
-      <reenlightenment state='on'/>
-      <tlbflush state='on'/>
-      <ipi state='on'/>
-    </hyperv>
-    ```
-
-> [!NOTE]
-> Hyper-V enlightenments make Windows (and other Hyper-V guests) think they are running on top of a Hyper-V compatible hypervisor. This enables use of Hyper-V specific features, allowing `KVM` to implement paravirtualised interfaces for improved virtual machine performance.
-
-13. Add the following XML snippet within the `<devices>` section to enable the GNU/Linux host to communicate with Windows using `QEMU Guest Agent`.
-
-    ```xml
-    <channel type='unix'>
-      <source mode='bind'/>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    ```
-
-14. In the 'Memory' section, set the `Current allocation` to the minimum amount of memory you want the virtual machine to use, with a recommended value of `1024MB`.
-
-<p align="center">
-    <img src="./libvirt_images/10.png" width="500px"/>
-</p>
-
-15. (Optional) Under `Boot Options`, enable `Start virtual machine on host boot up`.
-
-<p align="center">
-    <img src="./libvirt_images/11.png" width="500px"/>
-</p>
-
-16. Navigate to 'SATA Disk 1' and set the `Disk bus` type to `VirtIO`. This allows disk access to be paravirtualised, improving virtual machine performance.
-
-<p align="center">
-    <img src="./libvirt_images/12.png" width="500px"/>
-</p>
-
-17. Navigate to 'NIC' and set the `Device model` type to `virtio` to enable paravirtualised networking.
-
-<p align="center">
-    <img src="./libvirt_images/13.png" width="500px"/>
-</p>
-
-18. Click the `Add Hardware` button in the lower left, and choose `Storage`. For `Device type`, select `CDROM device` and choose the VirtIO driver `.ISO` you downloaded earlier. Click `Finish` to add the new CD-ROM device.
-
-> [!IMPORTANT]
-> If you skip this step, the Windows installer will fail to recognise and list the virtual hard drive you created earlier.
-
-<p align="center">
-    <img src="./libvirt_images/14.png" width="500px"/>
-</p>
-
-19. Click `Begin Installation` in the top left.
-
-<p align="center">
-    <img src="./libvirt_images/15.png" width="700px"/>
-</p>
-
-### Example `.XML` File
 Below is an example `.XML` file that describes a Windows 11 virtual machine.
+<details>
+<summary><strong>Example .XML File</strong></summary>
 
 ```xml
 <domain type="kvm">
@@ -561,14 +568,21 @@ Below is an example `.XML` file that describes a Windows 11 virtual machine.
 </domain>
 ```
 
+</details>
+
 ## Install Windows
-Install Windows as you would on any other machine.
+Click `Begin Installation` in the top left.
+
+<p align="center">
+    <img src="./libvirt_images/15.png" width="700px"/>
+</p>
 
 <p align="center">
     <img src="./libvirt_images/16.png" width="700px"/>
 </p>
 
 Once you get to the point of selecting the location for installation, you will see there are no disks available. This is because the `VirtIO driver` needs to be specified manually.
+
 1. Select `Load driver`.
 
 <p align="center">
@@ -613,19 +627,17 @@ Following the above, choose to "Continue with limited setup".
 </p>
 
 ## Final Configuration Steps
-Open `File Explorer` and navigate to the drive where the `VirtIO` driver `.ISO` is mounted. Run `virtio-win-gt-x64.exe` to launch the `VirtIO` driver installer.
+Open `File Explorer` and navigate to the drive where the "virtio-win" `.iso` is mounted. Run `virtio-win-guest-tools.exe` to install all necessary drivers as well as `QEMU Guest Agent`. Leave everything as default and click `Next` through the installer.
 
 <p align="center">
     <img src="./libvirt_images/24.png" width="700px"/>
 </p>
 
-Leave everything as default and click `Next` through the installer. This will install all required device drivers as well as the 'Memory Ballooning' service.
-
 <p align="center">
     <img src="./libvirt_images/25.png" width="700px"/>
 </p>
 
-Next, install the `QEMU Guest Agent` within Windows. This agent allows the GNU/Linux host to request a graceful shutdown of the Windows system. To do this, either run `virtio-win-guest-tools.exe` or `guest-agent\qemu-ga-x86_64.msi`. You can confirm the guest agent was successfully installed by running `Get-Service QEMU-GA` within a PowerShell window. The output should resemble:
+Confirm `QEMU Guest Agent` was successfully installed by running `Get-Service QEMU-GA` within a PowerShell window. The output should resemble:
 
 ```
 Status   Name               DisplayName
@@ -652,7 +664,7 @@ You can then test whether the host GNU/Linux system can communicate with Windows
 }
 ```
 
-Next, you will need to make some registry changes to enable RDP Applications to run on the system. Start by downloading the [RDPApps.reg](../oem/RDPApps.reg) file, right-clicking on the `Raw` button, and clicking on `Save target as`. Repeat the same thing for the [install.bat](../oem/install.bat) and the [NetProfileCleanup.ps1](../oem/NetProfileCleanup.ps1). **Do not download the Container.reg.**
+Next, you will need to make some registry changes to enable RDP Applications to run on the system. Start by downloading the [RDPApps.reg](../oem/RDPApps.reg) file, right-clicking on the `Raw` button, and clicking on `Save target as`. Repeat the same thing for the [install.bat](../oem/install.bat) and the [NetProfileCleanup.ps1](../oem/NetProfileCleanup.ps1). **Do not download 'Container.reg'** - this file is only required for users using docker or podman.
 
 <p align="center">
     <img src="./libvirt_images/26.png" width="700px"/>
@@ -664,33 +676,11 @@ Once you have downloaded all three files, right-click the install.bat and select
     <img src="./libvirt_images/27.png" width="700px"/>
 </p>
 
-Rename the Windows virtual machine so that WinApps can locate it by navigating to the start menu and typing `About` to bring up the `About your PC` settings.
+Once this is complete, restart the Windows virtual machine.
 
-<p align="center">
-    <img src="./libvirt_images/28.png" width="700px"/>
-</p>
+<details>
+<summary><strong>(Optional) Configuring a Fallback Shared Folder</strong></summary>
 
-Scroll down and click on `Rename this PC`.
-
-<p align="center">
-    <img src="./libvirt_images/29.png" width="700px"/>
-</p>
-
-Rename the PC to `RDPWindows`, but **DO NOT** restart the virtual machine.
-
-<p align="center">
-    <img src="./libvirt_images/30.png" width="700px"/>
-</p>
-
-Scroll down to `Remote Desktop`, and enable `Enable Remote Desktop`.
-
-<p align="center">
-    <img src="./libvirt_images/31.png" width="700px"/>
-</p>
-
-At this point, you will need to restart the Windows virtual machine.
-
-## (Optional) Configuring a Fallback Shared Folder
 When connecting to Windows through FreeRDP, your home folder will be shared automatically. However, this sharing setup does not apply when using Windows via virt-manager. To configure a fallback shared folder, follow these steps:
 
 1. Navigate to "Virtual Hardware Details", then "Memory" and then check the box for "Enable shared memory".
@@ -707,7 +697,11 @@ When connecting to Windows through FreeRDP, your home folder will be shared auto
 
 5. Reboot Windows.
 
-## (Optional) Configuring a Static IP Address
+</details>
+
+<details>
+<summary><strong>(Optional) Configuring a Static IP Address</strong></summary>
+
 1. Identify the Windows MAC address.
     ```bash
     virsh dumpxml "RDPWindows" | grep "mac address"
@@ -742,12 +736,18 @@ When connecting to Windows through FreeRDP, your home folder will be shared auto
 
     5. Reboot Windows.
 
+</details>
+
+<details>
+<summary><strong>(Optional) Installing Spice Guest Tools</strong></summary>
+
+You may also wish to install [Spice Guest Tools](https://www.spice-space.org/download/windows/spice-guest-tools/spice-guest-tools-latest.exe) inside the virtual machine, which enables features like auto-desktop resize and cut-and-paste when accessing the virtual machine through `virt-manager`. Since WinApps uses RDP, however, this is unnecessary if you don't plan to access the virtual machine via `virt-manager`.
+
+</details>
+
 ## Installing Windows Software and Configuring WinApps
 You may now proceed to install other applications like 'Microsoft 365', 'Adobe Creative Cloud' or any other applications you would like to use through WinApps.
 
-> [!NOTE]
-> You may also wish to install [Spice Guest Tools](https://www.spice-space.org/download/windows/spice-guest-tools/spice-guest-tools-latest.exe) inside the virtual machine, which enables features like auto-desktop resize and cut-and-paste when accessing the virtual machine through `virt-manager`. Since WinApps uses RDP, however, this is unnecessary if you don't plan to access the virtual machine via `virt-manager`.
-
 > [!IMPORTANT]
 > Ensure `WAFLAVOR` is set to `"libvirt"` in your `~/.config/winapps/winapps.conf` to prevent WinApps looking for a `Docker` installation instead.
 

flake.lock

@@ -32,13 +32,28 @@
         "type": "github"
       }
     },
+    "nix-filter": {
+      "locked": {
+        "lastModified": 1731533336,
+        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1724819573,
-        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "lastModified": 1751984180,
+        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
         "type": "github"
       },
       "original": {
@@ -52,6 +67,7 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
+        "nix-filter": "nix-filter",
         "nixpkgs": "nixpkgs"
       }
     },

flake.nix

@@ -1,17 +1,29 @@
 {
-  description = "WinApps Nix packages & NixOS module";
+  description = "WinApps Nix packages";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
     flake-utils.url = "github:numtide/flake-utils";
+    nix-filter.url = "github:numtide/nix-filter";
+  };
+
+  nixConfig = {
+    extra-substituters = [
+      "https://cache.garnix.io"
+    ];
+
+    extra-trusted-public-keys = [
+      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+    ];
   };
 
   outputs =
     {
       nixpkgs,
       flake-utils,
+      nix-filter,
       ...
     }:
     flake-utils.lib.eachDefaultSystem (
@@ -19,11 +31,13 @@
       let
         pkgs = import nixpkgs { inherit system; };
       in
-      {
+      rec {
         formatter = pkgs.nixfmt-rfc-style;
 
-        packages.winapps = pkgs.callPackage ./packages/winapps { };
-        packages.winapps-launcher = pkgs.callPackage ./packages/winapps-launcher { };
+        packages.winapps = pkgs.callPackage ./packages/winapps { inherit nix-filter; };
+        packages.winapps-launcher = pkgs.callPackage ./packages/winapps-launcher {
+          inherit (packages) winapps;
+        };
       }
     );
 }

fonts/unageo/OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2023 The Unageo Project Authors (https://github.com/RichardSepsi/Unageo)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

fonts/unageo/README.md

@@ -1,16 +0,0 @@
-## Unageo typeface
-
-Unageo is a simple, geometric typeface with variable weight and italic angle support, that was made with digital use in mind, however it works in print just as well .
-
-It's designed to use perfect geometric shapes where possible while still maintaining great readability and it uses almost uniform stroke width all across each glyph on all weights.
-
-Other than latin, Unageo also supports cyrillic and greek scripts.
-Unageo cyrillic was made in bulgarian style, that uses more rounded shapes and differentiated letter heights which makes it easier to tell letters apart and further improves readability.
-Greek uses the same rounded shapes and adds smooth lines to give it a more unique style.
-
-### How was it made?
-Unageo is my first attempt at making a font, and since I had almost no prior experience with font creation and limited software avalability, I worked on Unageo with an unusual workflow. I designed the characters in inkscape and imported the outlines into fontforge. Since I'm familiar with inkscape, designing the glyphs  wasn't too hard and inkscape has great tools for working with perfect geometry. It wasn't as great with fontforge, but I got accustomed to it quite fine and I was able to finish my font. After it was done, I used fontmake to generate my variable fonts and then fonttools mutator to generate the static fonts. Static fonts can also be exported directly from fontforge as the sources are interpolable.
-
-##
-
-![alt text](https://github.com/RichardSepsi/Unageo/blob/main/documentation/Unageo.png?raw=true)

install/ExtractPrograms.ps1

@@ -49,7 +49,7 @@ Function GetApplicationIcon {
 # Args:
 #    - 'Names': An array of application names.
 #    - 'Paths': An array of executable paths.
-#    - 'Source': The source of the applications (e.g. Windows Registry, Package manangers, Universal Windows Platform (UWP), etc.)
+#    - 'Source': The source of the applications (e.g. Windows Registry, Package managers, Universal Windows Platform (UWP), etc.)
 function PrintArrayData {
     param (
         [string[]]$Names,
@@ -240,7 +240,7 @@ function AppSearchUWP {
     PrintArrayData -Names $exeNames -Paths $exePaths -Source "uwp"
 }
 
-# Name: 'AppSearchWinReg'
+# Name: 'AppSearchChocolatey'
 # Role: Search for chocolatey shims.
 function AppSearchChocolatey {
     # Initialise empty arrays.
@@ -272,7 +272,7 @@ function AppSearchChocolatey {
     }
 }
 
-# Name: 'AppSearchWinReg'
+# Name: 'AppSearchScoop'
 # Role: Search for scoop shims.
 function AppSearchScoop {
     # Initialise empty arrays.

oem/RDPApps.reg

@@ -1,5 +1,17 @@
 Windows Registry Editor Version 5.00
 
+    ; Enable Remote Desktop
+    ; NOTE: The relevant firewall rule must be added separately with either:
+    ;   Enable-NetFirewallRule -DisplayGroup "Remote Desktop"
+    ;   or
+    ;   netsh advfirewall firewall set rule group="remote desktop" new enable=Yes
+    [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]
+    "fDenyTSConnections"=dword:00000000
+
+    ; Require Network Level Authentication (NLA) for Remote Desktop
+    [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp]
+    "UserAuthentication"=dword:00000001
+
     ; Disable RemoteApp allowlist so all applications can be used in Remote Desktop sessions
     [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList]
     "fDisabledAllowList"=dword:00000001

oem/install.bat

@@ -1,25 +1,79 @@
 @echo off
+title WinApps Setup Wizard
 
-reg import %~dp0\RDPApps.reg
-
-if exists %~dp0\Container.reg (
-    reg import %~dp0\Container.reg
+:: Check for administrative privileges
+fltmc >nul 2>&1 || (
+    echo [INFO] Script not running as administrator. Attempting to relaunch with elevation...
+    powershell -Command "Start-Process '%~f0' -Verb runAs"
+    exit /b
 )
 
-REM Create network profile cleanup scheduled task
-copy %~dp0\NetProfileCleanup.ps1 %windir%
-set "taskname=NetworkProfileCleanup"
-set "command=powershell.exe -ExecutionPolicy Bypass -File "%windir%\NetProfileCleanup.ps1^""
+echo ============================================
+echo             WinApps Setup Wizard
+echo ============================================
+echo.
+echo [INFO] Starting setup...
 
-schtasks /query /tn "%taskname%" >nul 2>&1
+:: Apply RDP and system configuration tweaks
+echo [INFO] Importing "RDPApps.reg"...
+if exist "%~dp0RDPApps.reg" (
+    reg import "%~dp0RDPApps.reg" >nul 2>&1
     if %ERRORLEVEL% equ 0 (
-    echo Task "%taskname%" already exists, deleting it first...
-    schtasks /delete /tn "%taskname%" /f
-)
-
-schtasks /create /tn "%taskname%" /tr "%command%" /sc onstart /ru "SYSTEM" /rl HIGHEST /f
-if %ERRORLEVEL% equ 0 (
-    echo Scheduled task "%taskname%" created successfully.
+        echo [SUCCESS] Imported "RDPApps.reg".
     ) else (
-    echo Failed to create scheduled task.
+        echo [ERROR] Failed to import "RDPApps.reg".
+    )
+) else (
+    echo [ERROR] "RDPApps.reg" not found. Skipping...
+)
+
+:: Allow Remote Desktop connections through the firewall
+echo [INFO] Allowing Remote Desktop connections through the firewall...
+powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass ^
+  -Command "if (Get-Command Enable-NetFirewallRule -ErrorAction SilentlyContinue) { try { Enable-NetFirewallRule -DisplayGroup 'Remote Desktop' -ErrorAction Stop; exit 0 } catch { exit 1 } } else { exit 2 }" >nul 2>&1
+if %ERRORLEVEL% equ 0 (
+    echo [SUCCESS] Firewall changes applied successfully.
+) else (
+    :: Fallback to using 'netsh' to make the firewall modification
+    netsh advfirewall firewall set rule group="remote desktop" new enable=Yes >nul 2>&1
+    if %ERRORLEVEL% equ 0 (
+        echo [SUCCESS] Firewall changes applied successfully.
+    ) else (
+        echo [ERROR] Failed to apply firewall changes.
+        echo         Please manually enable Remote Desktop via 'Settings ► System ► Remote Desktop'.
+    )
+)
+
+:: Configure the system clock to use UTC instead of local time
+if exist "%~dp0Container.reg" (
+    echo [INFO] Importing "Container.reg"...
+    reg import "%~dp0Container.reg" >nul 2>&1
+    if %ERRORLEVEL% equ 0 (
+        echo [SUCCESS] Imported "Container.reg".
+    ) else (
+        echo [ERROR] Failed to import "Container.reg".
+    )
+) else (
+    echo [WARNING] "Container.reg" not found. Skipping...
+)
+
+:: Create a startup task to clean up stale network profiles
+echo [INFO] Creating network profile cleanup task...
+
+:: Initialise values required to create the startup task
+set "scriptpath=%windir%\NetProfileCleanup.ps1"
+set "taskname=WinApps_NetworkProfileCleanup"
+set "command=powershell.exe -ExecutionPolicy Bypass -File ""%scriptpath%"""
+
+:: Copy the script to the Windows directory
+copy /Y "%~dp0NetProfileCleanup.ps1" "%scriptpath%" >nul
+if %ERRORLEVEL% neq 0 (
+    echo [ERROR] Failed to copy "NetProfileCleanup.ps1" to "%windir%".
+) else (
+    schtasks /create /tn "%taskname%" /tr "%command%" /sc onstart /ru "SYSTEM" /rl HIGHEST /f >nul 2>&1
+    if %ERRORLEVEL% equ 0 (
+        echo [SUCCESS] Created scheduled task "%taskname%".
+    ) else (
+        echo [ERROR] Failed to create scheduled task "%taskname%".
+    )
 )

packages/winapps-launcher/default.nix

@@ -4,8 +4,8 @@
   fetchFromGitHub,
   makeWrapper,
   makeDesktopItem,
-  callPackage,
   yad,
+  winapps ? throw "Pass in the winapps package",
   ...
 }:
 let
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
     yad
-    (callPackage ../winapps { })
+    winapps
   ];
 
   patches = [ ./WinApps-Launcher.patch ];

packages/winapps/default.nix

@@ -1,33 +1,36 @@
 {
   stdenv,
   lib,
-  fetchFromGitHub,
   makeWrapper,
-  freerdp3,
+  freerdp,
   dialog,
   libnotify,
   netcat,
   iproute2,
+  writeShellScriptBin,
+  nix-filter ? throw "Pass github:numtide/nix-filter as an argument!",
   ...
 }:
-let
-  rev = "2b2f4cea698096829fbd1c3c15970034a6f53261";
-  hash = "sha256-km8q3IL5sETbFsscNy4dDxYTytuKPJQJY81p7tSk63A=";
-in
 stdenv.mkDerivation rec {
   pname = "winapps";
-  version = "0-unstable-2025-06-05";
+  version = "0-unstable-2025-07-02";
 
-  src = fetchFromGitHub {
-    owner = "winapps-org";
-    repo = "winapps";
-
-    inherit rev hash;
+  src = nix-filter {
+    root = ./../..;
+    include = [
+      "apps"
+      "install"
+      "bin"
+      "icons"
+      "LICENSE.md"
+      "COPYRIGHT.md"
+      "setup.sh"
+    ];
   };
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
-    freerdp3
+    (writeShellScriptBin "xfreerdp3" ''${lib.getExe' freerdp "xfreerdp"} "$@"'')
     libnotify
     dialog
     netcat
@@ -35,7 +38,6 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    ./winapps.patch
     ./setup.patch
   ];
 

packages/winapps/setup.patch

@@ -1,5 +1,5 @@
 diff --git a/setup.sh b/setup.sh
-index 0debe4d..6aeea08 100755
+index d514bcc..ff53ead 100755
 --- a/setup.sh
 +++ b/setup.sh
 @@ -39,8 +39,8 @@ readonly SYS_BIN_PATH="/usr/local/bin"                  # UNIX path to 'bin' dir
@@ -7,9 +7,9 @@ index 0debe4d..6aeea08 100755
  readonly USER_BIN_PATH_WIN='\\tsclient\home\.local\bin' # WINDOWS path to 'bin' directory for a '--user' WinApps installation.
  # 'SOURCE'
 -readonly SYS_SOURCE_PATH="${SYS_BIN_PATH}/winapps-src" # UNIX path to WinApps source directory for a '--system' WinApps installation.
--readonly USER_SOURCE_PATH="${USER_BIN_PATH}/winapps-src" # UNIX path to WinApps source directory for a '--system' WinApps installation.
+-readonly USER_SOURCE_PATH="${USER_BIN_PATH}/winapps-src" # UNIX path to WinApps source directory for a '--user' WinApps installation.
 +readonly SYS_SOURCE_PATH="@out@/src" # UNIX path to WinApps source directory for a '--system' WinApps installation.
-+readonly USER_SOURCE_PATH="@out@/src" # UNIX path to WinApps source directory for a '--system' WinApps installation.
++readonly USER_SOURCE_PATH="@out@/src" # UNIX path to WinApps source directory for a '--user' WinApps installation.
  # 'APP'
  readonly SYS_APP_PATH="/usr/share/applications"                        # UNIX path to 'applications' directory for a '--system' WinApps installation.
  readonly USER_APP_PATH="${HOME}/.local/share/applications"             # UNIX path to 'applications' directory for a '--user' WinApps installation.
@@ -22,7 +22,7 @@ index 0debe4d..6aeea08 100755
  
  # REMOTE DESKTOP CONFIGURATION
  readonly RDP_PORT=3389         # Port used for RDP on Windows.
-@@ -155,13 +155,6 @@ function waGetSourceCode() {
+@@ -157,13 +157,6 @@ function waGetSourceCode() {
          echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} You might want to remove your old installation on '${SCRIPT_DIR_PATH}'."
      fi
  
@@ -36,7 +36,7 @@ index 0debe4d..6aeea08 100755
      # Silently change the working directory.
      if ! cd "$SOURCE_PATH" &>/dev/null; then
          # Display the error type.
-@@ -186,21 +179,8 @@ function waGetSourceCode() {
+@@ -188,21 +181,8 @@ function waGetSourceCode() {
  # Name: 'waGetInquirer'
  # Role: Loads the inquirer script, even if the source isn't cloned yet
  function waGetInquirer() {
@@ -59,7 +59,7 @@ index 0debe4d..6aeea08 100755
  }
  
  # Name: 'waCheckInput'
-@@ -805,7 +785,7 @@ function waCheckGroupMembership() {
+@@ -807,7 +787,7 @@ function waCheckGroupMembership() {
      # Identify groups the current user belongs to.
      USER_GROUPS=$(groups "$(whoami)")
  
@@ -68,7 +68,7 @@ index 0debe4d..6aeea08 100755
          # Complete the previous line.
          echo -e "${FAIL_TEXT}Failed!${CLEAR_TEXT}\n"
  
-@@ -1239,11 +1219,11 @@ function waConfigureWindows() {
+@@ -1242,11 +1222,11 @@ function waConfigureWindows() {
      # Populate variables.
      WIN_BASH="\
  #!/usr/bin/env bash
@@ -82,7 +82,7 @@ index 0debe4d..6aeea08 100755
  Terminal=false
  Type=Application
  Icon=${APPDATA_PATH}/icons/windows.svg
-@@ -1290,13 +1270,13 @@ function waConfigureApp() {
+@@ -1293,13 +1273,13 @@ function waConfigureApp() {
      # Determine the content of the bash script for the application.
      APP_BASH="\
  #!/usr/bin/env bash
@@ -98,7 +98,16 @@ index 0debe4d..6aeea08 100755
  Terminal=false
  Type=Application
  Icon=${APP_ICON}
-@@ -1550,7 +1530,7 @@ function waInstall() {
+@@ -1349,6 +1329,8 @@ function waConfigureOfficiallySupported() {
+             fi
+ 
+             # Copy the protocol handler to the appropriate directory.
++            # Fix permissions for nix.
++            $SUDO chmod u+w "$TARGET_DIR/ms-office-protocol-handler.desktop"
+             $SUDO cp "./apps/ms-office-protocol-handler.desktop" "$TARGET_DIR/ms-office-protocol-handler.desktop"
+         fi
+ 
+@@ -1566,7 +1548,7 @@ function waInstall() {
      echo -e "${BOLD_TEXT}Installing WinApps.${CLEAR_TEXT}"
  
      # Check for existing conflicting WinApps installations.
@@ -107,7 +116,7 @@ index 0debe4d..6aeea08 100755
  
      # Load the WinApps configuration file.
      waLoadConfig
-@@ -1626,8 +1606,8 @@ function waInstall() {
+@@ -1635,8 +1617,11 @@ function waInstall() {
      waFindInstalled
  
      # Install the WinApps bash scripts.
@@ -115,10 +124,13 @@ index 0debe4d..6aeea08 100755
 -    $SUDO ln -sf "${SOURCE_PATH}/setup.sh" "${BIN_PATH}/winapps-setup"
 +
 +
++
++    # Fix permissions for nix.
++    $SUDO chmod u+w -R "${APPDATA_PATH}"
  
      # Configure the Windows RDP session application launcher.
      waConfigureWindows
-@@ -1677,18 +1657,15 @@ function waUninstall() {
+@@ -1697,18 +1682,15 @@ function waUninstall() {
      local DESKTOP_FILE_NAME=""        # Stores the name of the '.desktop' file for the application.
      local BASH_SCRIPT_NAME=""         # Stores the name of the application.
  
@@ -139,7 +151,7 @@ index 0debe4d..6aeea08 100755
  
      # Remove each '.desktop' file.
      for DESKTOP_FILE_PATH in "${WINAPPS_DESKTOP_FILES[@]}"; do
-@@ -1709,7 +1686,7 @@ function waUninstall() {
+@@ -1729,7 +1711,7 @@ function waUninstall() {
      done
  
      # Store the paths of bash scripts calling 'WinApps' to launch specific applications in an array, returning an empty array if no such files exist.
@@ -148,7 +160,7 @@ index 0debe4d..6aeea08 100755
  
      # Remove each bash script.
      for BASH_SCRIPT_PATH in "${WINAPPS_APP_BASH_SCRIPTS[@]}"; do
-@@ -1730,10 +1707,9 @@ function waUninstall() {
+@@ -1750,10 +1732,9 @@ function waUninstall() {
      done
  
      # Print caveats.

packages/winapps/winapps.patch

@@ -1,11 +0,0 @@
---- a/bin/winapps
-+++ b/bin/winapps
-@@ -295,7 +295,7 @@ function waCheckGroupMembership() {
-     # shellcheck disable=SC2155 # Silence warnings regarding masking return values through simultaneous declaration and assignment.
-     local USER_GROUPS=$(groups "$(whoami)")
-
--    if ! (echo "$USER_GROUPS" | grep -q -E "\blibvirt\b") || ! (echo "$USER_GROUPS" | grep -q -E "\bkvm\b"); then
-+    if ! (echo "$USER_GROUPS" | grep -q -E "\blibvirtd\b") || ! (echo "$USER_GROUPS" | grep -q -E "\bkvm\b"); then
-         waThrowExit "$EC_NOT_IN_GROUP"
-     fi
- }

setup.sh

@@ -21,7 +21,7 @@ readonly EC_BAD_ARGUMENT="2"     # Unsupported argument passed to script.
 readonly EC_EXISTING_INSTALL="3" # Existing conflicting WinApps installation.
 readonly EC_NO_CONFIG="4"        # Absence of a valid WinApps configuration file.
 readonly EC_MISSING_DEPS="5"     # Missing dependencies.
-readonly EC_NO_SUDO="6"          # Insufficient privilages to invoke superuser access.
+readonly EC_NO_SUDO="6"          # Insufficient privileges to invoke superuser access.
 readonly EC_NOT_IN_GROUP="7"     # Current user not in group 'libvirt' and/or 'kvm'.
 readonly EC_VM_OFF="8"           # Windows 'libvirt' VM powered off.
 readonly EC_VM_PAUSED="9"        # Windows 'libvirt' VM paused.
@@ -40,7 +40,7 @@ readonly USER_BIN_PATH="${HOME}/.local/bin"             # UNIX path to 'bin' dir
 readonly USER_BIN_PATH_WIN='\\tsclient\home\.local\bin' # WINDOWS path to 'bin' directory for a '--user' WinApps installation.
 # 'SOURCE'
 readonly SYS_SOURCE_PATH="${SYS_BIN_PATH}/winapps-src" # UNIX path to WinApps source directory for a '--system' WinApps installation.
-readonly USER_SOURCE_PATH="${USER_BIN_PATH}/winapps-src" # UNIX path to WinApps source directory for a '--system' WinApps installation.
+readonly USER_SOURCE_PATH="${USER_BIN_PATH}/winapps-src" # UNIX path to WinApps source directory for a '--user' WinApps installation.
 # 'APP'
 readonly SYS_APP_PATH="/usr/share/applications"                        # UNIX path to 'applications' directory for a '--system' WinApps installation.
 readonly USER_APP_PATH="${HOME}/.local/share/applications"             # UNIX path to 'applications' directory for a '--user' WinApps installation.
@@ -92,10 +92,9 @@ VM_NAME="RDPWindows" # Name of the Windows VM (FOR 'libvirt' ONLY).
 WAFLAVOR="docker"    # Imported variable.
 RDP_SCALE=100        # Imported variable.
 RDP_FLAGS=""         # Imported variable.
-MULTIMON="false"     # Imported variable.
 DEBUG="true"         # Imported variable.
 FREERDP_COMMAND=""   # Imported variable.
-MULTI_FLAG=""        # Set based on value of $MULTIMON.
+
 PORT_TIMEOUT=5      # Default port check timeout.
 RDP_TIMEOUT=30      # Default RDP connection test timeout.
 APP_SCAN_TIMEOUT=60 # Default application scan timeout.
@@ -152,7 +151,7 @@ function waGetSourceCode() {
     SCRIPT_DIR_PATH=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")
 
     # Check if winapps is currently installed on $SOURCE_PATH
-    if [[ -f "$SCRIPT_DIR_PATH/winapps" && "$SCRIPT_DIR_PATH" -ne "$SOURCE_PATH" ]]; then
+    if [[ -f "$SCRIPT_DIR_PATH/winapps" && "$SCRIPT_DIR_PATH" != "$SOURCE_PATH" ]]; then
         # Display a warning.
         echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} You are running a WinApps installation located outside of default location '${SOURCE_PATH}'. A new installation will be created."
         echo -e "${WARNING_TEXT}[WARNING]${CLEAR_TEXT} You might want to remove your old installation on '${SCRIPT_DIR_PATH}'."
@@ -1047,9 +1046,6 @@ function waCheckRDPAccess() {
         /p:"$RDP_PASS" \
         /scale:"$RDP_SCALE" \
         +auto-reconnect \
-        +home-drive \
-        -wallpaper \
-        +dynamic-resolution \
         /app:program:"C:\Windows\System32\cmd.exe",cmd:"/C type NUL > $TEST_PATH_WIN && tsdiscon" \
         /v:"$RDP_IP" &>"$FREERDP_LOG" &
 
@@ -1142,6 +1138,10 @@ function waFindInstalled() {
         # Extract the name of the application from the absolute path of the folder.
         APPLICATION="$(basename "$APPLICATION")"
 
+        if [[ "$APPLICATION" == "ms-office-protocol-handler.desktop" ]]; then
+            continue
+        fi
+
         # Source 'Info' File Containing:
         # - The Application Name          (FULL_NAME)
         # - The Shortcut Name             (NAME)
@@ -1156,7 +1156,7 @@ function waFindInstalled() {
         echo "IF EXIST \"${WIN_EXECUTABLE}\" ECHO ${APPLICATION} >> ${TMP_INST_FILE_PATH_WIN}" >>"$BATCH_SCRIPT_PATH"
     done
 
-    # Append a command to the batch script to run the PowerShell script and store it's output in the 'detected' file.
+    # Append a command to the batch script to run the PowerShell script and store its output in the 'detected' file.
     # shellcheck disable=SC2129 # Silence warning regarding repeated redirects.
     echo "powershell.exe -ExecutionPolicy Bypass -File ${PS_SCRIPT_HOME_PATH_WIN} > ${DETECTED_FILE_PATH_WIN}" >>"$BATCH_SCRIPT_PATH"
 
@@ -1177,9 +1177,6 @@ function waFindInstalled() {
         /p:"$RDP_PASS" \
         /scale:"$RDP_SCALE" \
         +auto-reconnect \
-        +home-drive \
-        -wallpaper \
-        +dynamic-resolution \
         /app:program:"C:\Windows\System32\cmd.exe",cmd:"/C "$BATCH_SCRIPT_PATH_WIN"" \
         /v:"$RDP_IP" &>"$FREERDP_LOG" &
 
@@ -1282,7 +1279,7 @@ function waConfigureApp() {
 
     # Source 'Info' File Containing:
     # - The Application Name          (FULL_NAME)
-    # - The Shortcut Nsame            (NAME)
+    # - The Shortcut Name             (NAME)
     # - Application Categories        (CATEGORIES)
     # - Executable Path               (WIN_EXECUTABLE)
     # - Supported MIME Types          (MIME_TYPES)
@@ -1326,9 +1323,9 @@ MimeType=${MIME_TYPES}"
 function waConfigureOfficiallySupported() {
     # Declare variables.
     local OSA_LIST=() # Stores a list of all officially supported applications installed on Windows.
+    local OFFICE_APPS=("access" "access-o365" "access-o365-x86" "access-x86" "adobe-cc" "acrobat9" "acrobat-x-pro" "aftereffects-cc" "audition-cc" "bridge-cc" "bridge-cc-x86" "bridge-cs6" "bridge-cs6-x86" "cmd" "dymo-connect" "excel" "excel-o365" "excel-o365-x86" "excel-x86" "excel-x86-2010" "explorer" "iexplorer" "illustrator-cc" "lightroom-cc" "linqpad8" "mirc" "mspaint" "onenote" "onenote-o365" "onenote-o365-x86" "onenote-x86" "outlook" "outlook-o365" "outlook-o365-x86" "powerbi" "powerbi-store" "powerpoint" "powerpoint-o365" "powerpoint-o365-x86" "powerpoint-x86" "publisher" "publisher-o365" "publisher-o365-x86" "publisher-x86" "project" "project-x86" "remarkable-desktop" "ssms20" "visual-studio-comm" "visual-studio-ent" "visual-studio-pro" "visio" "visio-x86" "word" "word-o365" "word-o365-x86" "word-x86" "word-x86-2010")
 
     # Read the list of officially supported applications that are installed on Windows into an array, returning an empty array if no such files exist.
-    # This will remove leading and trailing whitespace characters as well as ignore empty lines.
     readarray -t OSA_LIST < <(grep -v '^[[:space:]]*$' "$INST_FILE_PATH" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' 2>/dev/null || true)
 
     # Create application entries for each officially supported application.
@@ -1342,6 +1339,19 @@ function waConfigureOfficiallySupported() {
         # Configure the application.
         waConfigureApp "$OSA" svg
 
+        # Check if the application is an Office app and copy the protocol handler.
+        if [[ " ${OFFICE_APPS[*]} " == *" $OSA "* ]]; then
+            # Determine the target directory based on whether the installation is for the system or user.
+            if [[ "$OPT_SYSTEM" -eq 1 ]]; then
+                TARGET_DIR="$SYS_APP_PATH"
+            else
+                TARGET_DIR="$USER_APP_PATH"
+            fi
+
+            # Copy the protocol handler to the appropriate directory.
+            $SUDO cp "./apps/ms-office-protocol-handler.desktop" "$TARGET_DIR/ms-office-protocol-handler.desktop"
+        fi
+
         # Print feedback.
         echo -e "${DONE_TEXT}Done!${CLEAR_TEXT}"
     done
@@ -1369,7 +1379,7 @@ function waConfigureApps() {
     for OSA in "${OSA_LIST[@]}"; do
         # Source 'Info' File Containing:
         # - The Application Name          (FULL_NAME)
-        # - The Shortcut Nsame            (NAME)
+        # - The Shortcut Name             (NAME)
         # - Application Categories        (CATEGORIES)
         # - Executable Path               (WIN_EXECUTABLE)
         # - Supported MIME Types          (MIME_TYPES)
@@ -1564,13 +1574,6 @@ function waInstall() {
     # Check for missing dependencies.
     waCheckInstallDependencies
 
-    # Update $MULTI_FLAG.
-    if [[ $MULTIMON == "true" ]]; then
-        MULTI_FLAG="/multimon"
-    else
-        MULTI_FLAG="+span"
-    fi
-
     # Update $RDP_SCALE.
     waFixScale
 
@@ -1673,10 +1676,21 @@ function waEnsureOnPath() {
 # Name: 'waUninstall'
 # Role: Uninstalls WinApps.
 function waUninstall() {
+
     # Print feedback.
     [ "$OPT_SYSTEM" -eq 1 ] && echo -e "${BOLD_TEXT}REMOVING SYSTEM INSTALLATION.${CLEAR_TEXT}"
     [ "$OPT_USER" -eq 1 ] && echo -e "${BOLD_TEXT}REMOVING USER INSTALLATION.${CLEAR_TEXT}"
 
+    # Determine the target directory for the protocol handler based on the installation type.
+    if [[ "$OPT_SYSTEM" -eq 1 ]]; then
+        TARGET_DIR="$SYS_APP_PATH"
+    else
+        TARGET_DIR="$USER_APP_PATH"
+    fi
+
+    # Remove the 'ms-office-protocol-handler.desktop' file if it exists.
+    $SUDO rm -f "$TARGET_DIR/ms-office-protocol-handler.desktop"
+
     # Declare variables.
     local WINAPPS_DESKTOP_FILES=()    # Stores a list of '.desktop' file paths.
     local WINAPPS_APP_BASH_SCRIPTS=() # Stores a list of bash script paths.