From 5549e00157097ecf9219f534bef114b5ac003f6b Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Fri, 22 Aug 2025 22:48:44 -0400 Subject: [PATCH] ntsync-flatpak-fixes (#56) Reviewed-on: https://git.hydrosaber.com/eriq12/hydro-os/pulls/56 Co-authored-by: Eriq Taing Co-committed-by: Eriq Taing --- files/dnf/codium.repo | 8 -------- files/system/etc/modules-load.d/ntsync.conf | 1 - recipes/components/default-flatpak.yml | 19 ------------------- recipes/dnf/applications.yml | 4 +--- recipes/dnf/environment.yml | 13 ++++++++++--- recipes/recipe.yml | 1 - 6 files changed, 11 insertions(+), 35 deletions(-) delete mode 100644 files/dnf/codium.repo delete mode 100644 files/system/etc/modules-load.d/ntsync.conf delete mode 100644 recipes/components/default-flatpak.yml diff --git a/files/dnf/codium.repo b/files/dnf/codium.repo deleted file mode 100644 index 8e87c81..0000000 --- a/files/dnf/codium.repo +++ /dev/null @@ -1,8 +0,0 @@ -[gitlab.com_paulcarroty_vscodium_repo] -name=download.vscodium.com -baseurl=https://download.vscodium.com/rpms/ -enabled=1 -gpgcheck=1 -repo_gpgcheck=1 -gpgkey=https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg -metadata_expire=1h diff --git a/files/system/etc/modules-load.d/ntsync.conf b/files/system/etc/modules-load.d/ntsync.conf deleted file mode 100644 index 848573a..0000000 --- a/files/system/etc/modules-load.d/ntsync.conf +++ /dev/null @@ -1 +0,0 @@ -ntsync diff --git a/recipes/components/default-flatpak.yml b/recipes/components/default-flatpak.yml deleted file mode 100644 index 33df521..0000000 --- a/recipes/components/default-flatpak.yml +++ /dev/null @@ -1,19 +0,0 @@ -modules: - - type: default-flatpaks - configurations: - - scope: user - repo: - title: Flathub (user) - install: - - one.ablaze.floorp - - io.github.equicord.equibop - - scope: system - repo: - title: Flathub - notify: true - install: - - com.github.tchx84.Flatseal - - io.missioncenter.MissionCenter - - io.github.flattool.Ignition - - net.davidotek.pupgui2 - - org.gnome.Loupe \ No newline at end of file diff --git a/recipes/dnf/applications.yml b/recipes/dnf/applications.yml index b733cc0..f7154aa 100644 --- a/recipes/dnf/applications.yml +++ b/recipes/dnf/applications.yml @@ -3,11 +3,9 @@ modules: repos: nonfree: rpmfusion files: - - codium.repo + - https://repo.vscodium.dev/vscodium.repo copr: - mavit/discover-overlay - keys: - - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/raw/master/pub.gpg install: packages: # applications diff --git a/recipes/dnf/environment.yml b/recipes/dnf/environment.yml index c345047..6607bca 100644 --- a/recipes/dnf/environment.yml +++ b/recipes/dnf/environment.yml @@ -1,8 +1,6 @@ modules: - type: dnf repos: - files: - - codium.repo copr: - ublue-os/packages install: @@ -14,20 +12,26 @@ modules: # environment # xwayland - xorg-x11-server-Xwayland + # headset control - headsetcontrol + # media related - mediainfo - playerctl - alsa-firmware + # zip utilities - p7zip + # qt libraries - qt5-qtwayland - qt6-qtwayland + # vulkan - vulkan-tools - vulkan-validation-layers + # xdg-desktop-portals - xdg-desktop-portal - xdg-desktop-portal-gtk @@ -44,4 +48,7 @@ modules: # networking - bluez - bluez-tools - - firewall-config \ No newline at end of file + - firewall-config + + # packages for steam script + - lsb_release \ No newline at end of file diff --git a/recipes/recipe.yml b/recipes/recipe.yml index 7042d1c..9a7d0c3 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -16,7 +16,6 @@ modules: - from-file: components/script-module.yml - from-file: components/sys-files-module.yml - from-file: components/systemd-module.yml - - from-file: components/default-flatpak.yml - from-file: components/chezmoi-module.yml - type: signing