diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8bf837c..1df12f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,7 @@ build-image: matrix: - RECIPE: - recipe-jp-desktop.yml + - recipe-jp-desktop-gaming.yml - recipe-jp-laptop.yml - recipe-cp-laptop.yml id_tokens: diff --git a/config/dev-packages.yml b/config/dev-packages.yml new file mode 100644 index 0000000..c48ae98 --- /dev/null +++ b/config/dev-packages.yml @@ -0,0 +1,36 @@ +modules: + - type: script + scripts: + - install-mkcert.sh + - setup-kubectl.sh + - type: rpm-ostree + repos: + - https://pkg.earthly.dev/earthly.repo + - https://copr.fedorainfracloud.org/coprs/varlad/helix/repo/fedora-%OS_VERSION%/varlad-helix-fedora-%OS_VERSION%.repo + - https://cli.github.com/packages/rpm/gh-cli.repo + install: + - cmake + - virt-manager + - "gcc-c++" + - docker + - earthly + - kubectl + - helm + - neovim + - helix + - openssl1.1 + - parallel + - gcc-aarch64-linux-gnu + - gcc-c++-aarch64-linux-gnu + - musl-gcc + - alacritty + - openssl-devel + - bat + - gh + remove: + - firefox + - firefox-langpacks + - type: script + scripts: + - setup-selinux-dockersock.sh + - install-codelldb.sh diff --git a/config/jp-apps.yml b/config/jp-apps.yml index d6b8d5f..7922c54 100644 --- a/config/jp-apps.yml +++ b/config/jp-apps.yml @@ -3,17 +3,7 @@ modules: files: - usr: /usr - distrobox: /usr - - type: script - scripts: - - install-mkcert.sh - - install-syncthing.sh - - setup-kubectl.sh - # - install-earthly.sh - from-file: jp-packages.yml - - type: script - scripts: - - setup-selinux-dockersock.sh - - install-codelldb.sh - type: fonts nerdfont: - JetBrainsMono diff --git a/config/jp-packages.yml b/config/jp-packages.yml index 0e0664b..43dd460 100644 --- a/config/jp-packages.yml +++ b/config/jp-packages.yml @@ -1,39 +1,23 @@ -type: rpm-ostree -repos: - - https://pkg.earthly.dev/earthly.repo - - https://copr.fedorainfracloud.org/coprs/varlad/helix/repo/fedora-%OS_VERSION%/varlad-helix-fedora-%OS_VERSION%.repo - - https://pkgs.tailscale.com/stable/fedora/%OS_VERSION%/tailscale.repo - - https://cli.github.com/packages/rpm/gh-cli.repo -install: - - libadwaita - - cmake - - cronie - - neofetch - - virt-manager - - plasma-browser-integration - - "gcc-c++" - - id3v2 - - docker - - xinput - - earthly - - kubectl - - helm - - neovim - - ripgrep - - helix - - tailscale - - strawberry - - openssl1.1 - - parallel - - gcc-aarch64-linux-gnu - - gcc-c++-aarch64-linux-gnu - - musl-gcc - - xclip - - alacritty - - openssl-devel - - bat - - gh -remove: - - firefox - - firefox-langpacks +modules: + - type: script + scripts: + - install-syncthing.sh + - type: rpm-ostree + repos: + - https://pkgs.tailscale.com/stable/fedora/%OS_VERSION%/tailscale.repo + install: + - libadwaita + - cronie + - neofetch + - plasma-browser-integration + - id3v2 + - xinput + - ripgrep + - tailscale + - strawberry + - xclip + - bat + remove: + - firefox + - firefox-langpacks diff --git a/config/recipe-jp-desktop-gaming.yml b/config/recipe-jp-desktop-gaming.yml new file mode 100644 index 0000000..aa2fe1a --- /dev/null +++ b/config/recipe-jp-desktop-gaming.yml @@ -0,0 +1,12 @@ +name: jp-desktop-gaming +base-image: ghcr.io/ublue-os/bazzite-nvidia +image-version: stable +description: The image of Wunker OS for JP's desktop gaming. +blue-build-tag: main-installer +modules: + - type: files + files: + - steam-firewall: /usr + - desktop-audio: /usr + - from-file: jp-apps.yml + - from-file: r2modman.yml diff --git a/config/recipe-jp-desktop.yml b/config/recipe-jp-desktop.yml index f9220a1..63bc238 100644 --- a/config/recipe-jp-desktop.yml +++ b/config/recipe-jp-desktop.yml @@ -15,4 +15,5 @@ modules: - COPY --from=registry.gitlab.com/wunker-bunker/xboxdrv-docker /usr/local/bin/xboxdrvctl /usr/bin/xboxdrvctl - COPY --from=registry.gitlab.com/wunker-bunker/xboxdrv-docker /usr/local/share/man/man1/xboxdrv.1 /usr/share/man/man1/xboxdrv.1 - from-file: jp-apps.yml + - from-file: dev-packages.yml - from-file: r2modman.yml diff --git a/config/recipe-jp-laptop.yml b/config/recipe-jp-laptop.yml index e43854d..c482ce1 100644 --- a/config/recipe-jp-laptop.yml +++ b/config/recipe-jp-laptop.yml @@ -5,3 +5,4 @@ description: The image of Wunker OS for JP's Laptop. modules: - from-file: framework.yml - from-file: jp-apps.yml + - from-file: dev-packages.yml