diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85b104e..aabf86d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false # stop GH from cancelling all matrix builds if one fails matrix: recipe: - - recipe.yml + - recipe-silverblue-main.yml steps: # the build is fully handled by the reusable github action - name: Build Custom Image diff --git a/config/gschema-overrides/zz1-defaults.gschema.override b/files/gschema-overrides/zz1-defaults.gschema.override similarity index 100% rename from config/gschema-overrides/zz1-defaults.gschema.override rename to files/gschema-overrides/zz1-defaults.gschema.override diff --git a/config/scripts/google-chrome-stable-symlink.sh b/files/scripts/google-chrome-stable-symlink.sh similarity index 100% rename from config/scripts/google-chrome-stable-symlink.sh rename to files/scripts/google-chrome-stable-symlink.sh diff --git a/config/scripts/install-app-image-launcher.sh b/files/scripts/install-app-image-launcher.sh similarity index 100% rename from config/scripts/install-app-image-launcher.sh rename to files/scripts/install-app-image-launcher.sh diff --git a/config/scripts/install-argocd-cli.sh b/files/scripts/install-argocd-cli.sh similarity index 100% rename from config/scripts/install-argocd-cli.sh rename to files/scripts/install-argocd-cli.sh diff --git a/config/scripts/install-atuin.sh b/files/scripts/install-atuin.sh similarity index 100% rename from config/scripts/install-atuin.sh rename to files/scripts/install-atuin.sh diff --git a/config/scripts/install-bombardier.sh b/files/scripts/install-bombardier.sh similarity index 100% rename from config/scripts/install-bombardier.sh rename to files/scripts/install-bombardier.sh diff --git a/config/scripts/install-caddy.sh b/files/scripts/install-caddy.sh similarity index 100% rename from config/scripts/install-caddy.sh rename to files/scripts/install-caddy.sh diff --git a/config/scripts/install-dive.sh b/files/scripts/install-dive.sh similarity index 100% rename from config/scripts/install-dive.sh rename to files/scripts/install-dive.sh diff --git a/config/scripts/install-gum.sh b/files/scripts/install-gum.sh similarity index 100% rename from config/scripts/install-gum.sh rename to files/scripts/install-gum.sh diff --git a/config/scripts/install-jetbrains-toolbox.sh b/files/scripts/install-jetbrains-toolbox.sh similarity index 100% rename from config/scripts/install-jetbrains-toolbox.sh rename to files/scripts/install-jetbrains-toolbox.sh diff --git a/config/scripts/install-k9s.sh b/files/scripts/install-k9s.sh similarity index 100% rename from config/scripts/install-k9s.sh rename to files/scripts/install-k9s.sh diff --git a/config/scripts/install-kind.sh b/files/scripts/install-kind.sh similarity index 100% rename from config/scripts/install-kind.sh rename to files/scripts/install-kind.sh diff --git a/config/scripts/install-krew.sh b/files/scripts/install-krew.sh similarity index 100% rename from config/scripts/install-krew.sh rename to files/scripts/install-krew.sh diff --git a/config/scripts/install-kubectl.sh b/files/scripts/install-kubectl.sh similarity index 100% rename from config/scripts/install-kubectl.sh rename to files/scripts/install-kubectl.sh diff --git a/config/scripts/install-kubectx.sh b/files/scripts/install-kubectx.sh similarity index 100% rename from config/scripts/install-kubectx.sh rename to files/scripts/install-kubectx.sh diff --git a/config/scripts/install-kubens.sh b/files/scripts/install-kubens.sh similarity index 100% rename from config/scripts/install-kubens.sh rename to files/scripts/install-kubens.sh diff --git a/config/scripts/install-mirrord.sh b/files/scripts/install-mirrord.sh similarity index 100% rename from config/scripts/install-mirrord.sh rename to files/scripts/install-mirrord.sh diff --git a/config/scripts/install-paping.sh b/files/scripts/install-paping.sh similarity index 100% rename from config/scripts/install-paping.sh rename to files/scripts/install-paping.sh diff --git a/config/scripts/install-sshs.sh b/files/scripts/install-sshs.sh similarity index 100% rename from config/scripts/install-sshs.sh rename to files/scripts/install-sshs.sh diff --git a/config/scripts/install-stern.sh b/files/scripts/install-stern.sh similarity index 100% rename from config/scripts/install-stern.sh rename to files/scripts/install-stern.sh diff --git a/config/scripts/install-syft.sh b/files/scripts/install-syft.sh similarity index 100% rename from config/scripts/install-syft.sh rename to files/scripts/install-syft.sh diff --git a/config/scripts/install-tlrc.sh b/files/scripts/install-tlrc.sh similarity index 100% rename from config/scripts/install-tlrc.sh rename to files/scripts/install-tlrc.sh diff --git a/config/scripts/install-trivy.sh b/files/scripts/install-trivy.sh similarity index 100% rename from config/scripts/install-trivy.sh rename to files/scripts/install-trivy.sh diff --git a/config/scripts/install-zellij.sh b/files/scripts/install-zellij.sh similarity index 100% rename from config/scripts/install-zellij.sh rename to files/scripts/install-zellij.sh diff --git a/config/scripts/ld-symlink-workaround.sh b/files/scripts/ld-symlink-workaround.sh similarity index 100% rename from config/scripts/ld-symlink-workaround.sh rename to files/scripts/ld-symlink-workaround.sh diff --git a/config/scripts/setup-gcloud-repo.sh b/files/scripts/setup-gcloud-repo.sh similarity index 100% rename from config/scripts/setup-gcloud-repo.sh rename to files/scripts/setup-gcloud-repo.sh diff --git a/config/scripts/setup-google-chrome-repo.sh b/files/scripts/setup-google-chrome-repo.sh similarity index 100% rename from config/scripts/setup-google-chrome-repo.sh rename to files/scripts/setup-google-chrome-repo.sh diff --git a/config/scripts/setup-hashicorp-repo.sh b/files/scripts/setup-hashicorp-repo.sh similarity index 100% rename from config/scripts/setup-hashicorp-repo.sh rename to files/scripts/setup-hashicorp-repo.sh diff --git a/config/scripts/setup-vscode-repo.sh b/files/scripts/setup-vscode-repo.sh similarity index 100% rename from config/scripts/setup-vscode-repo.sh rename to files/scripts/setup-vscode-repo.sh diff --git a/config/files/etc/custom-image/.gitkeep b/files/system/etc/custom-image/.gitkeep similarity index 100% rename from config/files/etc/custom-image/.gitkeep rename to files/system/etc/custom-image/.gitkeep diff --git a/config/files/etc/dconf/db/local.d/02-keybinds b/files/system/etc/dconf/db/local.d/02-keybinds similarity index 100% rename from config/files/etc/dconf/db/local.d/02-keybinds rename to files/system/etc/dconf/db/local.d/02-keybinds diff --git a/config/files/etc/dconf/db/local.d/03-nautilus b/files/system/etc/dconf/db/local.d/03-nautilus similarity index 100% rename from config/files/etc/dconf/db/local.d/03-nautilus rename to files/system/etc/dconf/db/local.d/03-nautilus diff --git a/config/files/usr/bin/default-groups b/files/system/usr/bin/default-groups similarity index 100% rename from config/files/usr/bin/default-groups rename to files/system/usr/bin/default-groups diff --git a/config/files/usr/dotfiles/alacritty/alacritty.toml b/files/system/usr/dotfiles/alacritty/alacritty.toml similarity index 100% rename from config/files/usr/dotfiles/alacritty/alacritty.toml rename to files/system/usr/dotfiles/alacritty/alacritty.toml diff --git a/config/files/usr/dotfiles/lazygit/config.yml b/files/system/usr/dotfiles/lazygit/config.yml similarity index 100% rename from config/files/usr/dotfiles/lazygit/config.yml rename to files/system/usr/dotfiles/lazygit/config.yml diff --git a/config/files/usr/dotfiles/starship.toml b/files/system/usr/dotfiles/starship.toml similarity index 100% rename from config/files/usr/dotfiles/starship.toml rename to files/system/usr/dotfiles/starship.toml diff --git a/config/files/usr/dotfiles/zellij/.gitkeep b/files/system/usr/dotfiles/zellij/.gitkeep similarity index 100% rename from config/files/usr/dotfiles/zellij/.gitkeep rename to files/system/usr/dotfiles/zellij/.gitkeep diff --git a/config/files/usr/flameshot/flameshot-gui-workaround.sh b/files/system/usr/flameshot/flameshot-gui-workaround.sh similarity index 100% rename from config/files/usr/flameshot/flameshot-gui-workaround.sh rename to files/system/usr/flameshot/flameshot-gui-workaround.sh diff --git a/config/files/usr/lib/systemd/system/dconf-update.service b/files/system/usr/lib/systemd/system/dconf-update.service similarity index 100% rename from config/files/usr/lib/systemd/system/dconf-update.service rename to files/system/usr/lib/systemd/system/dconf-update.service diff --git a/config/files/usr/lib/systemd/system/default-groups.service b/files/system/usr/lib/systemd/system/default-groups.service similarity index 100% rename from config/files/usr/lib/systemd/system/default-groups.service rename to files/system/usr/lib/systemd/system/default-groups.service diff --git a/config/files/usr/lib/systemd/system/flatpak-theme.service b/files/system/usr/lib/systemd/system/flatpak-theme.service similarity index 100% rename from config/files/usr/lib/systemd/system/flatpak-theme.service rename to files/system/usr/lib/systemd/system/flatpak-theme.service diff --git a/config/files/usr/share/JetBrains/Toolbox/toolbox.svg b/files/system/usr/share/JetBrains/Toolbox/toolbox.svg similarity index 100% rename from config/files/usr/share/JetBrains/Toolbox/toolbox.svg rename to files/system/usr/share/JetBrains/Toolbox/toolbox.svg diff --git a/config/modules/build-tools.yml b/recipes/modules/build-tools.yml similarity index 100% rename from config/modules/build-tools.yml rename to recipes/modules/build-tools.yml diff --git a/config/modules/fonts.yml b/recipes/modules/fonts.yml similarity index 100% rename from config/modules/fonts.yml rename to recipes/modules/fonts.yml diff --git a/config/modules/tools-cli.yml b/recipes/modules/tools-cli.yml similarity index 100% rename from config/modules/tools-cli.yml rename to recipes/modules/tools-cli.yml diff --git a/config/modules/tools-gui.yml b/recipes/modules/tools-gui.yml similarity index 100% rename from config/modules/tools-gui.yml rename to recipes/modules/tools-gui.yml diff --git a/config/recipe.yml b/recipes/recipe-silverblue-main.yml similarity index 95% rename from config/recipe.yml rename to recipes/recipe-silverblue-main.yml index d5b0daf..e93ea79 100644 --- a/config/recipe.yml +++ b/recipes/recipe-silverblue-main.yml @@ -11,8 +11,8 @@ image-version: 40 # latest is also supported if you want new updates ASAP modules: - type: files files: - - usr: /usr - - etc: /etc + - source: system + destination: / - from-file: modules/tools-cli.yml - from-file: modules/tools-gui.yml