Skip to content

Commit 302ac4c

Browse files
authored
Merge branch 'main' into fedora-43
2 parents 0b4c653 + fd65765 commit 302ac4c

File tree

9 files changed

+17
-256
lines changed

9 files changed

+17
-256
lines changed

.github/workflows/build-iso-appimages.yml

Lines changed: 0 additions & 81 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
recipe:
3131
# !! Add your recipes here
3232
- recipe.yml
33-
- recipe-appimages.yml
33+
3434
steps:
3535
# the build is fully handled by the reusable github action
3636
- name: Build Custom Image

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ Gidro-OS was based on [Universal Blue's](https://universal-blue.org/) `silverblu
88
Reasoning for that is to have more control over the Universal Blue's base, which would make it possible for me to react immediately with changes if needed, to avoid some questionable additions to the base, to make image smaller (and with it, updates faster) etc.
99
You can see my changes to the base recipe [here](https://github.com/fiftydinar/gidro-os/blob/main/recipes/base.yml).
1010

11-
`gidro-os-appimages` is an experimental version of Gidro-OS with flatpak-related stuff removed & with [`AM` AppImage manager](https://github.com/ivan-hc/AM) installed, to see if AppImage-only usage can replace flatpaks in the future.
12-
If you want to try it, you can download the latest ISO artifact in Actions.
13-
1411
This image is created using the easy & robust [BlueBuild](https://blue-build.org/) tooling for creating & maintaining container-based Linux desktop images.
1512
It is similar to making custom ROMs in the Android community, but in a much easier & more reliable way.
1613

@@ -57,7 +54,6 @@ Installed packages (RPMs):
5754

5855
Installed packages (AppImages/static binaries):
5956
- [Android platform-tools](https://developer.android.com/tools/releases/platform-tools)
60-
- [soar](https://github.com/pkgforge/soar) (Package manager for static + pseudo-static binaries & AppImages. Auto-updates are integrated)
6157

6258
Installed extensions:
6359
- [Blur my Shell](https://github.com/aunetx/blur-my-shell)

recipes/general.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

recipes/module-recipes/scripts.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ scripts:
44
- android-tools.sh
55
- trivalent-patches.sh
66
- prefer-bootc-over-rpm-ostree.sh
7+
- disable-layering.sh
78
snippets:
89
# Clear font cache
910
- "fc-cache --system-only --really-force /usr/share/fonts/nokia-font"

recipes/module-recipes/soar.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

recipes/recipe-appimages.yml

Lines changed: 0 additions & 145 deletions
This file was deleted.

recipes/recipe.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,18 @@ base-image: quay.io/fedora-ostree-desktops/silverblue
88
image-version: 43 # latest is also supported if you want new updates ASAP
99

1010
modules:
11-
- from-file: general.yml
12-
- from-file: shared.yml
11+
- from-file: base.yml
12+
- from-file: module-recipes/files.yml
13+
- from-file: module-recipes/kargs.yml
14+
- from-file: module-recipes/dnf.yml
15+
- from-file: module-recipes/gnome-extensions.yml
16+
- from-file: module-recipes/justfiles.yml
17+
- type: yafti
18+
- from-file: module-recipes/default-flatpaks.yml
19+
- from-file: module-recipes/bling.yml
20+
- from-file: module-recipes/systemd.yml
21+
- type: gschema-overrides
22+
- from-file: module-recipes/wallpapers.yml
23+
- from-file: module-recipes/scripts.yml
24+
- type: initramfs
25+
- type: signing

recipes/shared.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)