Remove justfiles in all recipe files and moved flatpak installs from …

…yafti to recipes
DocKDE · Jan 31, 2024 · 2f0adf1 · 2f0adf1
1 parent da8acf4
commit 2f0adf1
Show file tree

Hide file tree

Showing 3 changed files with 145 additions and 9 deletions.
diff --git a/config/recipe-dx.yml b/config/recipe-dx.yml
@@ -24,6 +24,7 @@ modules:
     repos:
       - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo
       - https://copr.fedorainfracloud.org/coprs/varlad/helix/repo/fedora-%OS_VERSION%/varlad-helix-fedora-%OS_VERSION%.repo
+      - https://copr.fedorainfracloud.org/coprs/kylegospo/webapp-manager/repo/fedora-%OS_VERSION%/kylegospo-webapp-manager-fedora-%OS_VERSION%.repo
       - https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-%OS_VERSION%/ublue-os-staging-fedora-%OS_VERSION%.repo
       - https://download.docker.com/linux/fedora/docker-ce.repo
       - https://pkgs.tailscale.com/stable/fedora/tailscale.repo
@@ -56,6 +57,7 @@ modules:
       - docker-compose-plugin
       - fira-code-fonts
       - helix
+      - webapp-manager
       # hasn't been built yet
       # - gnome-shell-extension-pano
       - guake
@@ -79,11 +81,80 @@ modules:
   - type: bling # configure what to pull in from ublue-os/bling
     install:
       - 1password # install 1Password (stable) and `op` CLI tool
-      - justfiles # add "!include /usr/share/ublue-os/just/bling.just"
-                  # in your custom.just (added by default) or local justfile
       - ublue-update # https://github.com/ublue-os/ublue-update
       - dconf-update-service # a service unit that updates the dconf db on boot
       - laptop # installs TLP and configures your system for laptop usage
+
+  - type: default-flatpaks
+    notify: true   # Send notification after install/uninstall is finished (true/false)
+    system:
+      # If no repo information is specified, Flathub will be used by default
+      repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
+      repo-name: flathub
+      # repo-title: "Flathub (system-wide)" # Optional; this sets the remote's user-facing name in graphical frontends like GNOME Software
+      install:
+      # Core GNOME apps
+      - org.gnome.Calculator
+      - org.gnome.Calendar
+      - org.gnome.Snapshot
+      - org.gnome.Characters
+      - org.gnome.clocks
+      - org.gnome.Connections
+      - org.gnome.Contacts
+      - org.gnome.baobab
+      - org.gnome.SimpleScan
+      - org.gnome.Evince
+      - com.mattjakeman.ExtensionManager
+      - org.gnome.font-viewer
+      - org.gnome.Loupe
+      - org.gnome.Logs
+      - org.gnome.Maps
+      - org.gnome.Photos
+      - org.gnome.NautilusPreviewer
+      - org.gnome.TextEditor
+      - org.gnome.Weather
+      # Custom
+      - org.gnome.Loupe
+      - io.bassi.Amberol
+      - org.gtk.Gtk3theme.adw-gtk3 
+      - org.gtk.Gtk3theme.adw-gtk3-dark
+      - com.bitwarden.desktop
+      - io.freetubeapp.FreeTube
+      - org.gnome.gThumb
+      - com.github.iwalton3.jellyfin-media-player
+      - io.mpv.Mpv
+      - com.nextcloud.desktopclient.nextcloud
+      - com.github.junrrein.PDFSlicer
+      - org.signal.Signal
+      - io.github.flattool.Warehouse
+      - com.github.xournalpp.xournalpp
+      - com.github.tchx84.Flatseal
+      - io.github.giantpinkrobots.flatsweep
+      - org.gustavoperedo.FontDownloader
+      - org.mozilla.firefox
+      - org.libreoffice.LibreOffice      
+      - org.mozilla.Thunderbird      
+      # Dev apps
+      - com.github.qarmin.czkawka
+      - fr.handbrake.ghb
+      - rest.insomnia.Insomnia
+      - com.slack.Slack
+      - com.notesnook.Notesnook
+      - com.github.Eloston.UngoogledChromium
+      - us.zoom.Zoom
+      # - one.ablaze.floorp//lightning # This is an example of flatpak which has multiple branches in selection (flatpak//branch).
+      # Flatpak runtimes are not supported (like org.winehq.Wine//stable-23.08).
+      # Only normal flatpak applications are (like Floorp Lightning web browser in this example).
+      # Multiple install of same flatpaks with different branches is not supported.
+      remove:
+      - org.gnome.eog
+      #
+    # A flatpak repo can also be added without having to install flatpaks,
+    # as long as one of the repo- fields is present
+    user:
+      repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
+      repo-name: flathub
+
   - type: script
     scripts:
       # this sets up the proper policy & signing files for signed images to work

diff --git a/config/recipe-plasma.yml b/config/recipe-plasma.yml
@@ -23,6 +23,7 @@ modules:
       - https://pkgs.tailscale.com/stable/fedora/tailscale.repo
       - https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-%OS_VERSION%/ublue-os-staging-fedora-%OS_VERSION%.repo
       - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo
+      - https://copr.fedorainfracloud.org/coprs/kylegospo/webapp-manager/repo/fedora-%OS_VERSION%/kylegospo-webapp-manager-fedora-%OS_VERSION%.repo
       - https://copr.fedorainfracloud.org/coprs/varlad/helix/repo/fedora-%OS_VERSION%/varlad-helix-fedora-%OS_VERSION%.repo
       - https://download.docker.com/linux/fedora/docker-ce.repo
       - https://pkgs.tailscale.com/stable/fedora/tailscale.repo
@@ -50,6 +51,7 @@ modules:
       - docker-compose-plugin
       - fira-code-fonts
       - helix
+      - webapp-manager
       - yakuake
       - starship
       - util-linux-user
@@ -66,15 +68,79 @@ modules:
 
   - type: bling # configure what to pull in from ublue-os/bling
     install:
-      - justfiles # add "!include /usr/share/ublue-os/just/bling.just"
-                  # in your custom.just (added by default) or local justfile
+      - 1password # install 1Password (stable) and `op` CLI tool
       - ublue-update # https://github.com/ublue-os/ublue-update
       - laptop # installs TLP and configures your system for laptop usage
 
-
-  - type: yafti # if included, yafti and it's dependencies (pip & libadwaita)
-                #  will be installed and set up
-    custom-flatpaks: # this section is optional
+  - type: default-flatpaks
+    notify: true   # Send notification after install/uninstall is finished (true/false)
+    system:
+      # If no repo information is specified, Flathub will be used by default
+      repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
+      repo-name: flathub
+      # repo-title: "Flathub (system-wide)" # Optional; this sets the remote's user-facing name in graphical frontends like GNOME Software
+      install:
+      # Core GNOME apps
+      - org.gnome.Calculator
+      - org.gnome.Calendar
+      - org.gnome.Snapshot
+      - org.gnome.Characters
+      - org.gnome.clocks
+      - org.gnome.Connections
+      - org.gnome.Contacts
+      - org.gnome.baobab
+      - org.gnome.SimpleScan
+      - org.gnome.Evince
+      - com.mattjakeman.ExtensionManager
+      - org.gnome.font-viewer
+      - org.gnome.Loupe
+      - org.gnome.Logs
+      - org.gnome.Maps
+      - org.gnome.Photos
+      - org.gnome.NautilusPreviewer
+      - org.gnome.TextEditor
+      - org.gnome.Weather
+      # Custom
+      - org.gnome.Loupe
+      - io.bassi.Amberol
+      - org.gtk.Gtk3theme.adw-gtk3 
+      - org.gtk.Gtk3theme.adw-gtk3-dark
+      - com.bitwarden.desktop
+      - io.freetubeapp.FreeTube
+      - org.gnome.gThumb
+      - com.github.iwalton3.jellyfin-media-player
+      - io.mpv.Mpv
+      - com.nextcloud.desktopclient.nextcloud
+      - com.github.junrrein.PDFSlicer
+      - org.signal.Signal
+      - io.github.flattool.Warehouse
+      - com.github.xournalpp.xournalpp
+      - com.github.tchx84.Flatseal
+      - io.github.giantpinkrobots.flatsweep
+      - org.gustavoperedo.FontDownloader
+      - org.mozilla.firefox
+      - org.libreoffice.LibreOffice      
+      - org.mozilla.Thunderbird      
+      # Dev apps
+      - com.github.qarmin.czkawka
+      - fr.handbrake.ghb
+      - rest.insomnia.Insomnia
+      - com.slack.Slack
+      - com.notesnook.Notesnook
+      - com.github.Eloston.UngoogledChromium
+      - us.zoom.Zoom
+      # - one.ablaze.floorp//lightning # This is an example of flatpak which has multiple branches in selection (flatpak//branch).
+      # Flatpak runtimes are not supported (like org.winehq.Wine//stable-23.08).
+      # Only normal flatpak applications are (like Floorp Lightning web browser in this example).
+      # Multiple install of same flatpaks with different branches is not supported.
+      remove:
+      - org.gnome.eog
+      #
+    # A flatpak repo can also be added without having to install flatpaks,
+    # as long as one of the repo- fields is present
+    user:
+      repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
+      repo-name: flathub
 
   - type: script
     scripts:

diff --git a/config/recipe.yml b/config/recipe.yml
@@ -101,7 +101,6 @@ modules:
       - com.github.xournalpp.xournalpp
       - com.github.tchx84.Flatseal
       - io.github.giantpinkrobots.flatsweep
-      - io.missioncenter.MissionCenter
       - org.gustavoperedo.FontDownloader
       - org.mozilla.firefox
       - org.libreoffice.LibreOffice