From dca9c8ce2e512091124181f5292b820ec10718be Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 16 Oct 2026 14:36:30 +0200 Subject: [PATCH] Set requested desktop software packages --- TASKS.md | 3 ++- docs/desktop-app-configs.md | 8 +++++--- profiles/desktop-apps.json | 19 +++++++++++-------- tests/Manifest.Tests.ps1 | 13 ++++++++++++- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/TASKS.md b/TASKS.md index 4978f52..7eed7b3 100644 --- a/TASKS.md +++ b/TASKS.md @@ -102,7 +102,8 @@ open until it is run on disposable machines with the required account setups. ## Requested desktop configuration -- [x] Add WinGet packages for MPC-HC, Ontime, XnView MP, and Nextcloud Desktop. +- [x] Add the requested WinGet packages: XnView MP, Zoom, Nextcloud Desktop, + Notepad++, HandBrake, GIMP, Krita, LibreOffice, and Waterfox. - [x] Add a safe registry-value adapter for MPC-HC settings. - [x] Manage Ontime user settings without treating projects, uploads, or logs as config. - [x] Manage XnView MP preferences without committing its catalog or thumbnails. diff --git a/docs/desktop-app-configs.md b/docs/desktop-app-configs.md index c8f8255..3fd11f3 100644 --- a/docs/desktop-app-configs.md +++ b/docs/desktop-app-configs.md @@ -1,8 +1,10 @@ # Desktop application configuration -The `desktop-apps` profile installs MPC-HC, Ontime, XnView MP, and Nextcloud -Desktop and declares their safe configuration surfaces. Close an application -before applying its config so it does not immediately overwrite the result. +The `desktop-apps` profile installs XnView MP, Zoom, Nextcloud Desktop, Notepad++, +HandBrake, GIMP, Krita, LibreOffice, and Waterfox. It also declares safe +configuration surfaces for MPC-HC and Ontime when those applications are +installed separately. Close an application before applying its config so it +does not immediately overwrite the result. The checked-in declarations start as safe no-ops or comment-only files. Populate only the values you want shared across every selected machine. diff --git a/profiles/desktop-apps.json b/profiles/desktop-apps.json index b3484b1..89066d2 100644 --- a/profiles/desktop-apps.json +++ b/profiles/desktop-apps.json @@ -2,27 +2,30 @@ "$schema": "../schemas/profile.schema.json", "schemaVersion": 1, "name": "desktop-apps", - "description": "Media, event timing, image viewing, and file synchronization applications.", + "description": "Desktop productivity, communication, creative, media, and file synchronization applications.", "packages": [ - { "id": "clsid2.mpc-hc", "source": "winget", "scope": "machine", "update": "latest" }, - { "id": "cpvalente.ontime", "source": "winget", "update": "latest" }, { "id": "XnSoft.XnViewMP", "source": "winget", "scope": "machine", "update": "latest" }, - { "id": "Nextcloud.NextcloudDesktop", "source": "winget", "scope": "machine", "update": "latest" } + { "id": "Zoom.Zoom", "source": "winget", "scope": "machine", "update": "latest" }, + { "id": "Nextcloud.NextcloudDesktop", "source": "winget", "scope": "machine", "update": "latest" }, + { "id": "Notepad++.Notepad++", "source": "winget", "update": "latest" }, + { "id": "HandBrake.HandBrake", "source": "winget", "update": "latest" }, + { "id": "GIMP.GIMP", "source": "winget", "update": "latest" }, + { "id": "KDE.Krita", "source": "winget", "update": "latest" }, + { "id": "TheDocumentFoundation.LibreOffice", "source": "winget", "update": "latest" }, + { "id": "Waterfox.Waterfox", "source": "winget", "update": "latest" } ], "configs": [ { "name": "mpc-hc-settings", "source": "configs/mpc-hc/settings.json", "target": "HKCU:\\Software\\MPC-HC\\MPC-HC", - "mode": "registry", - "requiresPackage": "clsid2.mpc-hc" + "mode": "registry" }, { "name": "ontime-style", "source": "configs/ontime/override.css", "target": "%APPDATA%/Ontime/user/styles/override.css", - "mode": "copy", - "requiresPackage": "cpvalente.ontime" + "mode": "copy" }, { "name": "xnviewmp-settings", diff --git a/tests/Manifest.Tests.ps1 b/tests/Manifest.Tests.ps1 index eb23443..d47a6ca 100644 --- a/tests/Manifest.Tests.ps1 +++ b/tests/Manifest.Tests.ps1 @@ -5,9 +5,20 @@ BeforeAll { Describe 'Manifest resolution' { It 'resolves the checked-in example in profile order' { $result = Resolve-MachineManifest -RepositoryRoot "$PSScriptRoot/.." -Machine 'example-desktop' - $result.packages.Count | Should -Be 7 + $result.packages.Count | Should -Be 12 $result.configs.Count | Should -Be 7 $result.packages[0].id | Should -Be 'Git.Git' + $result.packages.id | Should -Contain 'XnSoft.XnViewMP' + $result.packages.id | Should -Contain 'Zoom.Zoom' + $result.packages.id | Should -Contain 'Nextcloud.NextcloudDesktop' + $result.packages.id | Should -Contain 'Notepad++.Notepad++' + $result.packages.id | Should -Contain 'HandBrake.HandBrake' + $result.packages.id | Should -Contain 'GIMP.GIMP' + $result.packages.id | Should -Contain 'KDE.Krita' + $result.packages.id | Should -Contain 'TheDocumentFoundation.LibreOffice' + $result.packages.id | Should -Contain 'Waterfox.Waterfox' + $result.packages.id | Should -Not -Contain 'clsid2.mpc-hc' + $result.packages.id | Should -Not -Contain 'cpvalente.ontime' } It 'lets later profiles replace and disable earlier items' {