Commit graph

18 commits

Author SHA1 Message Date
fiftydinar
189048b119
chore: Remove usage of yq in favor of jq (#369)
* chore: Remove usage of `yq` in favor of `jq`

* fix: Missed bracket in `default-flatpaks`

* fix: `get_json_array` complaining about unpopulated arrays

* fix(files): Forgot to input `-r` flag for some `jq` calls

* fix(gschema-overrides): Use `try` in `get_json_array`

* chore(default-flatpaks): Replace `yq` with `jq` in run-time setup binaries

* chore: Switch to simplified `jq` syntax without brackets

* chore(default-flatpaks): Switch `repo-info` file from `yml` to `json`

* fix(default-flatpaks): Some `yq` calls

* chore: Revert back to bracket syntax for more reliable `jq` parsing

* chore(files): Missed bracket syntax

* chore: Approve bot suggestion about quoting

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update modules/files/files.sh

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix(yafti): Populating custom flatpaks

It's populated in reverse order compared to the format in recipe, but it works

* fix(fonts): Variable substitution is needed

* fix: Typo

* fix(fonts): Forgot to assign FONTS variable

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2024-12-02 19:02:13 +00:00
fiftydinar
f176a3516e
feat(gschema-overrides): Make include array truly optional & includ… (#360)
* feat(gschema-overrides): Make `include` array truly optional & include all gschemas by default

* chore(gschema-overrides): Make recipe input matching log a bit clearer

* docs(gschema-overrides): Make some points clearer

* docs(gschema-overrides): Fix some unfinished line

* docs(gschema-override): Some indentation fixes

* docs(gschema-overrides): Remove redundant comment in module.yml
2024-11-14 21:08:48 +01:00
xyny
77eb501e86
docs: gschema-overrides clarify relocatable schema example 2024-07-28 10:08:04 +00:00
fiftydinar
210647d810
docs(gschema-overrides): Forgot to change config to files in example configuration 2024-07-28 11:38:47 +02:00
xyny
e749fe71d3 chore: remove raw github URLs from module.ymls (unneeded after recent refactor) 2024-07-26 16:02:32 +03:00
Daniel Barenholz
4a433d6112
docs(chezmoi+gschema-overrides): Fix some typos (#298)
* docs(chezmoi): Fix typos

* docs(gschema-overrides): Fix typo
2024-07-26 12:52:12 +00:00
fiftydinar
c0929e759c
docs: Update documentation to reflect change from config/ to files/ (#283)
* docs: Update documentation to reflect change from `config/` to `files/`

* docs(files): Match documentation between template & module.yml

* docs(files): Add example about using subfolder

* docs(files): Some small style fixes

* docs: Fix `files/system` typo

Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>

* docs: Fix `files/system` typo pt. 2

Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>

* chore(files): Update typespec to be compatible with legacy & new recipe

Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>

---------

Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>
2024-07-21 19:21:28 +00:00
fiftydinar
55858a8d83
chore: Adjust modules to use the future /tmp/files/ directory (#278)
* chore: Adjust modules to use the future `/tmp/files/` directory

* docs: Replace old `config/` with `files/` directory

* Revert "docs: Replace old `config/` with `files/` directory"

This reverts commit 68870a3d02136860b4f3bca2d34618d71dcae160.

* chore(files): Support new recipe format proposed by @xynydev

* chore(files): Support legacy recipe format along with new one

Mixed usage of it in recipe is supported too.

---------

Co-authored-by: Gerald Pinder <gmpinder@gmail.com>
Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>
2024-07-21 10:10:32 +00:00
xyny
be6e4ba5bd
feat: add typespec schemas for modules (#233)
* feat: add typespec for bling and akmods for testing

* chore: temporarily change module source to dev branch

* feat: add missing module typespecs from blue-build/schema

* feat: add schemas for default-flatpaks module

* chore: annotate some parameters as optional

* fix: typo in default-flatpaks schema

* feat: add schema for files module

* feat: add script module schema

* feat: add signing module schema

* docs: add module.yml docs etc.

* fix(default-flatpaks): don't capitalize string in typespec

* feat: add schemas for gnome-extensions

* fix(files): properly declare string: string record type

* chore: add tsp for gschema-overrides

* chore: tsp for systemd module

* chore: add link to systemd tsp to module.yml

* chore: add tsp for yafti module

* feat: add docstrings for files module

* feat: add tsp for chezmoi module

* feat: docstrings for akmods tsp

* feat: docstrings for bling tsp

* feat: docstrings for default flatpaks tsp

* fix: link to files module docs page in files module tsp

* feat: docstrings for fonts module tsp

* feat: add docstrings for gnome extensions tsp

* feat: docstrings for gschema overrides tsp

* feat: docstrings for rpm ostree tsp

* feat: docstrings for script tsp

* feat: docstrings for signing module

* feat: docstrings for systemd tsp

* feat: docstrings for yafti module

* fix: typo in files tsp

* feat: typespec for brew module

* chore: update rpm ostree tsp for keys: prop

* fix: use typespec to declare default values

* fix: errors from previous commit

* docs: add typespec instructions

* docs: chore: add typespec docs link for docs syntax

* chore: switch to semicolon for ending property definitions

* docs: fix: typo inlude -> include

* feat: tsp for justfiles module

* chore: change links to reference main branch

---------

Co-authored-by: fiftydinar <65243233+fiftydinar@users.noreply.github.com>
2024-07-09 16:25:31 +00:00
jonah
b866a27cf1
docs: Improve documentation of relocatable schemas (#177)
* docs(bling): Add documentation about dconf-update-service

* docs(gschema-overrides): Improve relocatable schema info and include better example

* chore: add more details to dconf desc

* chore: minor gschema relocatable rewording

---------

Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>
2024-03-26 07:12:01 +00:00
fiftydinar
76cb237acc Merge remote-tracking branch 'upstream/main' into gschema-override-newline 2024-02-25 18:36:40 +01:00
xynydev
c6aea9234c chore: replace URLs with ublue-os/bling 2024-02-21 16:39:34 +02:00
fiftydinar
adab64e38e chore(gschema-overrides): Add missing quotes for file variable 2024-02-21 15:09:36 +01:00
fiftydinar
769cd4bf3d fix(gschema-overrides): Ditch workaround for trimming newlines
It is no longer needed, since get_yaml_array uses `readarray -t` command now instead of regular `readarray`.

It may also fix rare parsing issue some user had (array element looks fine, but it's still not parsed properly). Note that this is a speculated issue, not something we're 100% sure of.

Merge this after BlueBuild transition period, since legacy build.sh doesn't have get_yaml_array fix.
Alternatively, I can define custom get_yaml_array function here, with note for supporting legacy templates.
2024-02-21 15:04:12 +01:00
fiftydinar
67619ce418
fix(gschema-overrides): Get rid of files module dependency (#120)
* chore(gschema-overrides): Get rid of `files` module dependency

Gschema.override files are now placed in /config/gschema-override folder.

* chore(gschema-overrides): Don't use 1st slash for new override location in docs

* chore: Use `zz1-` prefix instead of `z1-`

It ensures that no gschema override will bypass user one with override starting with letter z.
2024-02-05 10:46:13 +00:00
xynydev
03ac42e16f fix: switch urls to fetch main branch in module.ymls 2024-02-04 18:18:35 +02:00
xyny
5e455a1477
refactor: start using module.yml for module metadata (#116)
* feat: add initial module.yml for rpm-ostree

* chore: add shortdesc to module.yml

* feat: add missing module.ymls

* feat: add website rebuild action for module reference updates

* chore: remove old readme in modules dir

* refactor: switch to a hybrid module.yml + README arrangement

* chore: switch docs to use starlight aside syntax
2024-02-04 16:05:22 +00:00
fiftydinar
b528a0acc9
feat: Add gschema-overrides module (#110)
* feat: Add `gschema-overrides` module

* chore: Clarify "including prefix" section better

* chore: Some formatting fix

* chore: Don't mention higher prefix, as it can confuse users

* fix: Add partial troubleshooting of most preferred gschema-overide

It does not support aborting on fail currently, as I have to think on how to implement it when multiple gschema-override files are included in the module.

* Revert "fix: Add partial troubleshooting of most preferred gschema-overide"

This reverts commit 1dde51938e45648c7f53b696e61249339a2eb277.

* fix: Use `z1-` prefix for to avoid future conflict with Universal Blue images

* chore: Fix some README remarks from xynydev

* chore: Note that GTK DEs other than Gnome are also supported

* chore: Be more specific about GTK-based DEs

* chore: Clarify using module section a tiny bit better

* chore: Add editing gschema.overrides section & make README formatting cleaner

* chore: Reword some sentences better

* fix: don't use multiple toplevel headings, replace <br> tags with spammed spaces

---------

Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>
2024-02-02 17:57:00 +00:00