diff --git a/.github/workflows/update-submodule.yaml b/.github/workflows/update-submodule.yaml deleted file mode 100644 index 7cd5dce..0000000 --- a/.github/workflows/update-submodule.yaml +++ /dev/null @@ -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" diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 2c3ac9c..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "WinApps-Launcher"] - path = WinApps-Launcher - url = https://github.com/winapps-org/WinApps-Launcher.git diff --git a/README.md b/README.md index b7ed96b..0244532 100644 --- a/README.md +++ b/README.md @@ -570,6 +570,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. + +WinApps Launcher Animation. + ## Installation using Nix First, follow Step 1 of the normal installation guide to create your VM. diff --git a/WinApps-Launcher b/WinApps-Launcher deleted file mode 160000 index 9b3f6c5..0000000 --- a/WinApps-Launcher +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9b3f6c581791222a3a04508606755d6d0519f322 diff --git a/apps/emclient/icon.svg b/apps/emclient/icon.svg new file mode 100644 index 0000000..af01f0b --- /dev/null +++ b/apps/emclient/icon.svg @@ -0,0 +1,9 @@ + + logo-256 + + + + + + diff --git a/apps/emclient/info b/apps/emclient/info new file mode 100644 index 0000000..6142e7d --- /dev/null +++ b/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" diff --git a/apps/paint.net/icon.svg b/apps/paint.net/icon.svg new file mode 100644 index 0000000..e79ae5c --- /dev/null +++ b/apps/paint.net/icon.svg @@ -0,0 +1 @@ + diff --git a/apps/paint.net/info b/apps/paint.net/info new file mode 100644 index 0000000..9fba739 --- /dev/null +++ b/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" diff --git a/demo/launcher.gif b/demo/launcher.gif new file mode 100644 index 0000000..78e9129 Binary files /dev/null and b/demo/launcher.gif differ diff --git a/packages/winapps/default.nix b/packages/winapps/default.nix index 7c5c605..8e2c354 100644 --- a/packages/winapps/default.nix +++ b/packages/winapps/default.nix @@ -11,12 +11,12 @@ ... }: let - rev = "aa5b3e945526800da1b8891fd8b38272a4a6189d"; - hash = "sha256-nB56x76W+eyMqIturj26zDbKEMvp/IgDud/twz6pwCY="; + rev = "ce9a84dc5294c45a4b69847f5164628f7d6a4ae1"; + hash = "sha256-SsyJy9mCwBjKex8mfCnKrzKUM/+xws0EltI2aSkKTuM="; in stdenv.mkDerivation rec { pname = "winapps"; - version = "0-unstable-2025-06-20"; + version = "0-unstable-2025-07-02"; src = fetchFromGitHub { owner = "winapps-org";