Merge branch 'master' of github.com:Ultramarine-Linux/taidan

catalogue/browser.yml

@@ -2,9 +2,7 @@ category: Browser
 choices:
   - name: Firefox
     provider: Mozilla
-    description: |
-      Firefox is an open source web browser using the Gecko engine. Firefox has
-      historically been the default in Ultramarine.
+    description: Firefox is an open source web browser using the Gecko engine. Firefox has historically been the default in Ultramarine.
     note: Some features like WebUSB may be unavailable.
     options:
       - checkbox: flatpak
@@ -14,21 +12,15 @@ choices:
 
   - name: Edge
     provider: Microsoft
-    description: |
-      Edge is a Chromium-based browser centered around the Microsoft ecosystem,
-      including many convenient and AI features.
+    description: Edge is a Chromium-based browser centered around the Microsoft ecosystem, including many convenient and AI features.
     options:
       - radio: [Edge Stable, Edge Dev, Edge Beta]
     actions: todo
 
   - name: Chrome
     provider: Google
-    description: |
-      Chrome is the world's most popular web browser and the base for many
-      others.
-    note: |
-      Chrome may say it is managed by an organization, this is because of
-      Fedora's bookmarks package.
+    description: Chrome is the world's most popular web browser and the base for many others.
+    note: Chrome may say it is managed by an organization, this is because of Fedora's bookmarks package.
     options:
       - radio: [Chrome Stable, Chrome Dev, Chrome Beta]
     actions:
@@ -38,50 +30,44 @@ choices:
 
   - name: Chromium
     provider: Google
-    description: |
-      Chromium is Chrome without the Google, everything should be similar, but
-      no tracking and no accounts.
+    description: Chromium is Chrome without the Google, everything should be similar, but no tracking and no accounts.
     actions: rpm:chromium
 
   - name: GNOME Web (Epiphany)
     provider: GNOME Foundation
-    description: |
-      GNOME Web is a WebKit based browser for the GNOME Desktop. Web is simple and well integrated with the GNOME Desktop.
+    description: GNOME Web is a WebKit based browser for the GNOME Desktop. Web is simple and well integrated with the GNOME Desktop.
     note: Some websites may not load or perform properly in GNOME Web, and some features like extensions aren't implemented yet.
     actions: rpm:epiphany
 
   - name: Zen Browser
     provider: Zen
-    description: |
-      Zen is a browser based on Firefox with optimized code for specific CPU micro-architectures and additional extension support.
+    description: Zen is a browser based on Firefox with optimized code for specific CPU micro-architectures and additional extension support.
     note: May not provide Widevine DRM support, due to licensing costs.
     actions: todo
 
   - name: LibreWolf
     provider: LibreWolf Community
-    description: |
-      LibreWolf is a privacy-oriented browser based on Firefox. LibreWolf protects your privacy with anti-fingerprinting and tracking features.
+    description: LibreWolf is a privacy-oriented browser based on Firefox. LibreWolf protects your privacy with anti-fingerprinting and tracking features.
     note: LibreWolf's privacy features may break some sites, and DRM is entirely broken (on purpose.)
     options:
     actions: todo
 
   - name: Vivaldi
     provider: Vivaldi Technologies
     description: |
-      Vivaldi is a Chromium-based browser that comes with everything AND the kitchen sink. From a built-in mail client, to automations and deep personalization. Vivaldi will cover more than just your browsing needs.
+      Vivaldi is a Chromium-based browser that comes with everything AND the kitchen sink. From a built-in mail client, 
+      to automations and deep personalization. Vivaldi will cover more than just your browsing needs.
     options:
     actions: todo
 
   - name: Floorp
     provider: Ablaze
-    description: |
-      Floorp is a Firefox-based browser from Japan with improved customization and privacy features.
+    description: Floorp is a Firefox-based browser from Japan with improved customization and privacy features.
     options:
     actions: todo
 
   - name: Brave
     provider: Brave Software
-    description: |
-      Brave is a Chromium-based browser with a built in ad-blocker, cryptocurrency features, and it's own search engine.
+    description: Brave is a Chromium-based browser with a built in ad-blocker, cryptocurrency features, and it's own search engine.
     options:
     actions: todo

catalogue/development.yml

@@ -14,7 +14,7 @@ choices:
 
   - name: Zed
     provider: Zed Industries
-    description: A high-performance, multiplayer code editor
+    description: A high-performance, multiplayer code editor.
     actions: rpm:zed
 
   - name: GNOME Builder

catalogue/gaming.yml

@@ -35,9 +35,7 @@ choices:
     description: Lets you run Windows software on Linux, such as applications and games.
     options:
       - checkbox: flatpak
-    actions:
-      - rpm:bottles
-      - flatpak:com.usebottles.bottles
+    actions: flatpak:com.usebottles.bottles
 
   - name: Cartridges
     provider: Kramo

catalogue/making.yml

@@ -2,7 +2,7 @@ category: Making
 choices:
   - name: KiCad
     provider: KiCad
-    description: A Cross Platform and Open Source Electronics Design Automation Suite
+    description: A Cross Platform and Open Source Electronics Design Automation Suite.
     options:
       - checkbox: flatpak
     actions:

catalogue/mediaprod.yml

@@ -11,7 +11,7 @@ choices:
 
   - name: Blender
     provider: Blender
-    description: 3D modeling, animation, rendering and post-production
+    description: 3D modeling, animation, rendering and post-production.
     options:
       - checkbox: flatpak
     actions:
@@ -29,7 +29,7 @@ choices:
 
   - name: Audacity
     provider: Muse Group
-    description: Multi-track audio editor and recorder
+    description: Multi-track audio editor and recorder.
     options:
       - checkbox: flatpak
     actions:
@@ -38,7 +38,7 @@ choices:
 
   - name: LMMS
     provider: LMMS
-    description: Linux MultiMedia Studio
+    description: Linux MultiMedia Studio.
     options:
       - checkbox: flatpak
     actions:

catalogue/productivity.yml

@@ -3,19 +3,22 @@ choices:
   - name: LibreOffice
     provider: The Document Foundation
     description: |
-      LibreOffice is an open source office suite. It features applications like a word processor, presentation builder, spreadsheet tool, and more. It's compatible with all Microsoft Office files.
-    actions: rpm:libreoffice
+      LibreOffice is an open source office suite. It features applications like a word processor, presentation builder,
+      spreadsheet tool, and more. It's compatible with all Microsoft Office files.
+    options:
+      - checkbox: flatpak
+    actions:
+      - rpm:libreoffice
+      - flatpak:org.libreoffice.LibreOffice
 
   - name: OnlyOffice
     provider: ONLYOFFICE
-    description: |
-      OnlyOffice is an office suite designed to behave like Microsoft Office, with familiar design and collaboration features.
+    description: OnlyOffice is an office suite designed to behave like Microsoft Office, with familiar design and collaboration features.
     actions: flatpak:org.onlyoffice.desktopeditors
 
   - name: Evolution
     provider: The GNOME Project
-    description: |
-      Evolution is a powerful personal information manager and email client with support for IMAP, POP3, and Exchange.
+    description: Evolution is a powerful personal information manager and email client with support for IMAP, POP3, and Exchange.
     options:
       - checkbox: flatpak
     actions:
@@ -24,8 +27,7 @@ choices:
 
   - name: Thunderbird
     provider: Mozilla
-    description: |
-      Thunderbird is a FOSS email, newsfeed, chat, and calendar client built on the same technology as Firefox.
+    description: Thunderbird is a FOSS email, newsfeed, chat, and calendar client built on the same technology as Firefox.
     options:
       - checkbox: flatpak
     actions:
@@ -43,8 +45,7 @@ choices:
 
   - name: Rnote
     provider: Flxzt
-    description: |
-      Rnote is a versatile note-taking app with infinite pages and PDF imports.
+    description: Rnote is a versatile note-taking app with infinite pages and PDF imports.
     options:
       - checkbox: flatpak
     actions:
@@ -53,6 +54,5 @@ choices:
 
   - name: Obsidian
     provider: Obsidian
-    description: |
-      Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files.
+    description: Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files.
     actions: flatpak:md.obsidian.Obsidian