though it does require changes for the
though it does require changes for the nvidia.just and custom.just to be made in config ... but i think that's probably not a concern.I commented on the PR regarding that. The inclusion of the NVIDIA config in the "main justfile config RPM" kinda makes sense in a lot of ways. The issue is the
custom.just, it's currently holding anything added by startingpoint + anything the person making a downstream image wants to add to it (they fork startingpoint and add their own stuff to custom.just), so we can't include that one in the main config repo.
I'm also unsure about how all of this will work long-term, after just's include directive is on by default. Will we then switch profile.d to insert include /path/to/main.just etc? Or will we tell users to insert the modular pieces they want manually? I think automating it still makes sense for people who don't have a justfile yet. So it's good that we have this framework for patching the ~/.justfile now.
But yeah, custom.just is in an awkward spot atm.7 Replies
@bsherman There's another issue with I haven't got a clue if that is actually a thing that's necessary at all. Flatpaks are supposed to be able to make PWA (web app
custom.just the way it's being redirected now. It was originally just where startingpoint adds a few custom commands. But since just is modular and can include any files people want, we probably shouldn't encourage monolithic monkey-patched just-files.
So custom.just needs some thinking...
- main: Core ublue things.
- nvidia: Nvidia things.
- custom: Startingpoint's custom commands. It contains some awkward things that don't belong in main, such as just setup-flatpaks that uses the startingpoint recipe to install flatpaks. Although that is a pretty bad command anyway which could be deleted for all I care, since it doesn't fit with yafti's design intents.
- downstream images: They can either add to custom.just or add their own separate .just-files somewhere else... Not sure what's best.
Speaking of monkey-patching: Great job splitting the NVIDIA stuff into a separate file so that it isn't patching the main config anymore. 🙂
@bsherman You can see the unique commands that startingpoint adds here:
https://github.com/ublue-os/startingpoint/blob/a3b7543913f211e29d6a38338e994e88a2885578/usr/share/ublue-os/just/custom.just
The only thing that may be of interest to main.just is the setup-pwa but .desktop files) without needing any external commands.
Actually setup-pwa is nonsense, I will remove it.
All modern flatpaks have the necessary permissions to handle that themselves:
https://github.com/flathub/com.microsoft.Edge/blob/beta/com.microsoft.Edge.yaml#L37I kinda like how I did it since it provides for main and nvidia to have “official” stuff
But the config provided custom.just is blank. Do anything downstream (including startingpoint) can do whatever they like there.
Yeah exactly, I like it.
It may benefit from a comment explaining that, by default it’s appended to the main.just but yeah
Oh. Company just arrived. I’m out.
Here's the updated
custom.just with the only remaining commands, which you can see is a bunch of opinionated commands that don't belong in the main justfile repo:
https://github.com/ublue-os/startingpoint/blob/482ee0aa58a6824b41bb3a2e169e3ed39e0523a7/usr/share/ublue-os/just/custom.just
Aight. Take care. 🙂 Everything is looking good. And having a dummy custom.just is a good idea to indicate that it should be used by downstream images. But we shouldn't move anything from startingpoint up to the just-config repo, since none of it is general-purpose stuff.
Thanks again for everything. Apart from the small script changes, and small change to how nvidia repo was injecting its just-commands, everything looks done.False alarm. Company not here
Haha okay. 🙂 Here's the updates to the script then, which should be working as-is since it was minor changes:
https://github.com/ublue-os/config/pull/42#issuecomment-1546756193