From 7f42d00987fa8476cd7d90f6a9a2e87333dcad7b Mon Sep 17 00:00:00 2001 From: Tsubajashi Date: Thu, 7 Sep 2023 02:42:54 +0200 Subject: [PATCH 1/6] feat: Add Admin Tools area and Cockpit Client in Yafti (#468) --- usr/etc/yafti.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr/etc/yafti.yml b/usr/etc/yafti.yml index 74f21c1a3cb..258bc8f1b16 100644 --- a/usr/etc/yafti.yml +++ b/usr/etc/yafti.yml @@ -99,6 +99,11 @@ screens: - Gstreamer for OBS: com.obsproject.Studio.Plugin.Gstreamer - Gstreamer VAAPI for OBS: com.obsproject.Studio.Plugin.GStreamerVaapi - Boatswain for Streamdeck: com.feaneron.Boatswain + Admin Tools: + description: Helper Utilities for Administration + default: false + packages: + - Cockpit Client: org.cockpit_project.CockpitClient final-screen: source: yafti.screen.title From f055ddd9b44e8f33040b174aff1718bd95109d42 Mon Sep 17 00:00:00 2001 From: Tsubajashi Date: Thu, 7 Sep 2023 13:30:19 +0200 Subject: [PATCH 2/6] feat: Reorganizing Yafti with new submenus (#469) --- usr/etc/yafti.yml | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/usr/etc/yafti.yml b/usr/etc/yafti.yml index 258bc8f1b16..221e20ec960 100644 --- a/usr/etc/yafti.yml +++ b/usr/etc/yafti.yml @@ -34,8 +34,6 @@ screens: description: Core Applications default: true packages: - - Backup: org.gnome.DejaDup - - Blackbox Terminal: com.raggesilver.BlackBox - Calculator: org.gnome.Calculator - Calendar: org.gnome.Calendar - Characters: org.gnome.Characters @@ -50,16 +48,14 @@ screens: - Logs: org.gnome.Logs - Maps: org.gnome.Maps - Nautilus Preview: org.gnome.NautilusPreviewer - - PinApp Menu Editor: io.github.fabrialberio.pinapp - - Syncthing: com.github.zocker_160.SyncThingy - Text Editor: org.gnome.TextEditor - Weather: org.gnome.Weather - Disk Usage Analyzer: org.gnome.baobab - Clocks: org.gnome.clocks - Picture Viewer: org.gnome.eog - Font Viewer: org.gnome.font-viewer - - Font Downloader: org.gustavoperedo.FontDownloader - Web Browsers: + - Blackbox Terminal: com.raggesilver.BlackBox + Other Web Browsers: description: Additional browsers to complement Firefox default: false packages: @@ -72,13 +68,12 @@ screens: default: false packages: - Bottles: com.usebottles.bottles - - Discord: com.discordapp.Discord - Heroic Games Launcher: com.heroicgameslauncher.hgl - Lutris: net.lutris.Lutris - MangoHUD: org.freedesktop.Platform.VulkanLayer.MangoHud//22.08 - Steam: com.valvesoftware.Steam - Gamescope for Steam: org.freedesktop.Platform.VulkanLayer.gamescope - - Proton Updater for Steam: net.davidotek.pupgui2 + - Proton Updater (GTK) for Steam: com.vysp3r.ProtonPlus Office: description: Bow to Capitalism default: false @@ -87,7 +82,6 @@ screens: - LibreOffice: org.libreoffice.LibreOffice - Obsidian: md.obsidian.Obsidian - OnlyOffice: org.onlyoffice.desktopeditors - - Slack: com.slack.Slack - Standard Notes: org.standardnotes.standardnotes - Thunderbird Email: org.mozilla.Thunderbird Streaming: @@ -99,6 +93,19 @@ screens: - Gstreamer for OBS: com.obsproject.Studio.Plugin.Gstreamer - Gstreamer VAAPI for OBS: com.obsproject.Studio.Plugin.GStreamerVaapi - Boatswain for Streamdeck: com.feaneron.Boatswain + Communication: + description: Tools to communicate and collaborate + packages: + - Discord: com.discordapp.Discord + - Slack: com.slack.Slack + Utilities: + description: Useful Utilities + default: true + packagess: + - Font Downloader: org.gustavoperedo.FontDownloader + - PinApp Menu Editor: io.github.fabrialberio.pinapp + - Backup: org.gnome.DejaDup + - Syncthing: com.github.zocker_160.SyncThingy Admin Tools: description: Helper Utilities for Administration default: false From 4be22b317227ded69bf619129abb8eccc048ca91 Mon Sep 17 00:00:00 2001 From: bobslept <38557801+bobslept@users.noreply.github.com> Date: Thu, 7 Sep 2023 13:49:11 +0200 Subject: [PATCH 3/6] fix(yafti): add link to announcements and discussions (#470) --- usr/etc/yafti.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr/etc/yafti.yml b/usr/etc/yafti.yml index 221e20ec960..1cc13eb7589 100644 --- a/usr/etc/yafti.yml +++ b/usr/etc/yafti.yml @@ -122,6 +122,8 @@ screens: run: /usr/bin/gnome-software - "Website": run: /usr/bin/xdg-open https://ublue.it + - "Discussions and Announcements": + run: /usr/bin/xdg-open https://github.com/orgs/ublue-os/discussions/categories/bluefin - "Join the Discord Community": run: /usr/bin/xdg-open https://discord.gg/XjG48C7VHx description: | From af3c13d3676bc87c226848648097a5429ca1337f Mon Sep 17 00:00:00 2001 From: bobslept <38557801+bobslept@users.noreply.github.com> Date: Thu, 7 Sep 2023 15:33:38 +0200 Subject: [PATCH 4/6] fix(yafti): typo leads to invalid screen (#473) --- usr/etc/yafti.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/etc/yafti.yml b/usr/etc/yafti.yml index 1cc13eb7589..c9594e95991 100644 --- a/usr/etc/yafti.yml +++ b/usr/etc/yafti.yml @@ -101,7 +101,7 @@ screens: Utilities: description: Useful Utilities default: true - packagess: + packages: - Font Downloader: org.gustavoperedo.FontDownloader - PinApp Menu Editor: io.github.fabrialberio.pinapp - Backup: org.gnome.DejaDup From 72551236bc162eb96a13e23d83c5fcf682010214 Mon Sep 17 00:00:00 2001 From: bobslept <38557801+bobslept@users.noreply.github.com> Date: Thu, 7 Sep 2023 17:22:36 +0200 Subject: [PATCH 5/6] fix(yafti): move core apps to seperate screen (#474) --- usr/etc/yafti.yml | 49 +++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/usr/etc/yafti.yml b/usr/etc/yafti.yml index c9594e95991..898c46eb4fe 100644 --- a/usr/etc/yafti.yml +++ b/usr/etc/yafti.yml @@ -23,17 +23,18 @@ screens: - run: flatpak remote-delete fedora --force - run: flatpak remove --system --noninteractive --all - run: flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo - applications: + install-required-packages: source: yafti.screen.package values: - title: Application Installation - show_terminal: true + title: Install required packages package_manager: yafti.plugin.flatpak + show-terminal: true groups: Core: description: Core Applications default: true packages: + - Blackbox Terminal: com.raggesilver.BlackBox - Calculator: org.gnome.Calculator - Calendar: org.gnome.Calendar - Characters: org.gnome.Characters @@ -54,15 +55,24 @@ screens: - Clocks: org.gnome.clocks - Picture Viewer: org.gnome.eog - Font Viewer: org.gnome.font-viewer - - Blackbox Terminal: com.raggesilver.BlackBox - Other Web Browsers: - description: Additional browsers to complement Firefox + applications: + source: yafti.screen.package + values: + title: Application Installation + show_terminal: true + package_manager: yafti.plugin.flatpak + groups: + Admin Tools: + description: Helper Utilities for Administration default: false packages: - - Brave: com.brave.Browser - - Google Chrome: com.google.Chrome - - Microsoft Edge: com.microsoft.Edge - - Opera: com.opera.Opera + - Cockpit Client: org.cockpit_project.CockpitClient + Communication: + default: false + description: Tools to communicate and collaborate + packages: + - Discord: com.discordapp.Discord + - Slack: com.slack.Slack Gaming: description: "Rock and Stone!" default: false @@ -84,6 +94,14 @@ screens: - OnlyOffice: org.onlyoffice.desktopeditors - Standard Notes: org.standardnotes.standardnotes - Thunderbird Email: org.mozilla.Thunderbird + Other Web Browsers: + description: Additional browsers to complement Firefox + default: false + packages: + - Brave: com.brave.Browser + - Google Chrome: com.google.Chrome + - Microsoft Edge: com.microsoft.Edge + - Opera: com.opera.Opera Streaming: description: Stream to the Internet default: false @@ -93,11 +111,6 @@ screens: - Gstreamer for OBS: com.obsproject.Studio.Plugin.Gstreamer - Gstreamer VAAPI for OBS: com.obsproject.Studio.Plugin.GStreamerVaapi - Boatswain for Streamdeck: com.feaneron.Boatswain - Communication: - description: Tools to communicate and collaborate - packages: - - Discord: com.discordapp.Discord - - Slack: com.slack.Slack Utilities: description: Useful Utilities default: true @@ -106,12 +119,6 @@ screens: - PinApp Menu Editor: io.github.fabrialberio.pinapp - Backup: org.gnome.DejaDup - Syncthing: com.github.zocker_160.SyncThingy - Admin Tools: - description: Helper Utilities for Administration - default: false - packages: - - Cockpit Client: org.cockpit_project.CockpitClient - final-screen: source: yafti.screen.title values: From 52c65824e9cfeb819225e2c1040c2fc4e16f5b55 Mon Sep 17 00:00:00 2001 From: bobslept <38557801+bobslept@users.noreply.github.com> Date: Fri, 8 Sep 2023 16:04:56 +0200 Subject: [PATCH 6/6] fix: switch to copr for nerd-fonts (#476) --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index ac9e25b7291..685d9eca13b 100644 --- a/Containerfile +++ b/Containerfile @@ -59,7 +59,7 @@ COPY packages.json /tmp/packages.json COPY build.sh /tmp/build.sh RUN wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -RUN wget https://terra.fyralabs.com/terra.repo -O /etc/yum.repos.d/terra.repo +RUN wget https://copr.fedorainfracloud.org/coprs/bobslept/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/bobslept-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/bobslept-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo # Handle packages via packages.json RUN /tmp/build.sh @@ -96,7 +96,7 @@ RUN systemctl disable pmlogger.service RUN /tmp/workarounds.sh # Clean up repos, everything is on the image so we don't need them -RUN rm -f /etc/yum.repos.d/terra.repo +RUN rm -f /etc/yum.repos.d/bobslept-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo RUN rm -f /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo RUN rm -f /etc/yum.repos.d/vscode.repo RUN rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo