bluebuild action update + flatpaks to just

tomrutsaert · Dec 8, 2024 · d1f8f0a · d1f8f0a
1 parent 9795f54
commit d1f8f0a
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Build Custom Image
-        uses: blue-build/github-action@v1.7.0
+        uses: blue-build/github-action@v1.8
         with:
           recipe: ${{ matrix.recipe }}
           cosign_private_key: ${{ secrets.SIGNING_SECRET }}

diff --git a/create_iso.sh b/create_iso.sh
@@ -4,7 +4,8 @@ mkdir -p ./iso-output
 sudo podman run --rm --privileged --volume ./iso-output:/build-container-installer/build --security-opt label=disable --pull=newer \
 ghcr.io/jasonn3/build-container-installer:latest \
 IMAGE_REPO=ghcr.io/tomrutsaert \
-IMAGE_NAME=myos-gnome-main \
+IMAGE_NAME=myos-hyprland-main \
 IMAGE_TAG=latest \
-VERSION=40 \
-VARIANT=Silverblue
+VERSION=41 \
+VARIANT=Server
+#VARIANT=Silverblue
diff --git a/files/justfiles/myjust.just b/files/justfiles/myjust.just
@@ -53,3 +53,34 @@ install-intellij:
     StartupWMClass=jetbrains-idea
     StartupNotify=true
     EOF
+
+install-flatpaks
+    sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    flatpak install -y flathub \
+    com.discordapp.Discord \
+    com.github.wwmm.easyeffects \
+    com.github.tchx84.Flatseal \
+    com.mattjakeman.ExtensionManager \
+    com.jeffser.Alpaca \
+    com.microsoft.Edge \
+    com.nextcloud.desktopclient.nextcloud \
+    com.slack.Slack \
+    com.spotify.Client \
+    de.hohnstaedt.xca \
+    dev.zed.Zed \
+    io.dbeaver.DBeaverCommunity \
+    io.podman_desktop.PodmanDesktop \
+    io.gitlab.adhami3310.Converter \
+    io.gitlab.liferooter.TextPieces \
+    it.mijorus.gearlever \
+    org.chromium.Chromium \
+    org.geany.Geany \
+    org.gimp.GIMP \
+    org.gnome.Loupe \
+    org.gnome.Papers \
+    org.gnome.TextEditor \
+    org.kde.kolourpaint \
+    org.libreoffice.LibreOffice \
+    org.mozilla.firefox \
+    org.telegram.desktop \
+    org.videolan.VLC
diff --git a/recipes/recipe-myos-gnome-main.yml b/recipes/recipe-myos-gnome-main.yml
@@ -13,6 +13,5 @@ modules:
   - from-file: virtualization.yml
   - from-file: fonts.yml
   - from-file: just.yml
-  - from-file: flatpaks.yml
   - from-file: gnome.yml
   - type: signing
diff --git a/recipes/recipe-myos-gnome-nvidia.yml b/recipes/recipe-myos-gnome-nvidia.yml
@@ -13,6 +13,5 @@ modules:
   - from-file: virtualization.yml
   - from-file: fonts.yml
   - from-file: just.yml
-  - from-file: flatpaks.yml
   - from-file: gnome.yml
   - type: signing
diff --git a/recipes/recipe-myos-hyprland-main.yml b/recipes/recipe-myos-hyprland-main.yml
@@ -10,5 +10,4 @@ modules:
   - from-file: virtualization.yml
   - from-file: fonts.yml
   - from-file: just.yml
-  - from-file: flatpaks.yml
   - type: signing
diff --git a/recipes/recipe-myos-hyprland-nvidia.yml b/recipes/recipe-myos-hyprland-nvidia.yml
@@ -10,5 +10,4 @@ modules:
   - from-file: virtualization.yml
   - from-file: fonts.yml
   - from-file: just.yml
-  - from-file: flatpaks.yml
   - type: signing
diff --git a/recipes/recipe-myos-sway-main.yml b/recipes/recipe-myos-sway-main.yml
@@ -10,5 +10,4 @@ modules:
   - from-file: virtualization.yml
   - from-file: fonts.yml
   - from-file: just.yml
-  - from-file: flatpaks.yml
   - type: signing
diff --git a/recipes/recipe-myos-sway-nvidia.yml b/recipes/recipe-myos-sway-nvidia.yml
@@ -10,5 +10,4 @@ modules:
   - from-file: virtualization.yml
   - from-file: fonts.yml
   - from-file: just.yml
-  - from-file: flatpaks.yml
   - type: signing
diff --git a/recipes/recipe-myos-wayfire-main.yml b/recipes/recipe-myos-wayfire-main.yml
@@ -13,5 +13,4 @@ modules:
   - from-file: virtualization.yml
   - from-file: fonts.yml
   - from-file: just.yml
-  - from-file: flatpaks.yml
   - type: signing
diff --git a/recipes/recipe-myos-wayfire-nvidia.yml b/recipes/recipe-myos-wayfire-nvidia.yml
@@ -13,5 +13,4 @@ modules:
   - from-file: virtualization.yml
   - from-file: fonts.yml
   - from-file: just.yml
-  - from-file: flatpaks.yml
   - type: signing