fix!: move justfile to standardized, non-conflicting new location
- The old location was conflicting with upstream images (main, nvidia, etc), and was causing the file to be overwritten. - It was therefore decided that each image should prefix their own justfile names, to avoid clobbering, to easily allow image makers to bundle multiple "modular" justfiles, and to allow end-users to easily include the particular modules they want. - The name `custom.just` represents a "template name" for this "custom uBlue image", while being neutral enough to use long-term (unlike the alternative name `startingpoint.just`, which doesn't flow nicely). - All redundant commands that already existed upstream in `ublue-os/main` have been removed, to follow the new "modular inclusion" nature of uBlue's "justfile" organization, which also means that we'll never have to manually update it to match upstream anymore. No more duplicated effort! ;) - Updated README instructions to mention the new way of including justfiles, until the upstream "just" project has finished their "include" functionality. - The ".just" suffix is the official upstream suffix for modular justfile inclusions.
This commit is contained in:
12
README.md
12
README.md
@@ -97,9 +97,17 @@ The `latest` tag will automatically point to the latest build. That build will s
|
|||||||
|
|
||||||
## Just
|
## Just
|
||||||
|
|
||||||
The `just` task runner is included in `main` for further customization after first boot.
|
The `just` task runner is included in `ublue-os/main`-derived images, and we have provided several template commands which help you perform further customization after first boot.
|
||||||
|
|
||||||
You can copy the justfile from `/usr/share/ublue-os/just/justfile` to `~/.justfile` to get started. When `just` supports [include directives](https://just.systems/man/en/chapter_52.html), you will instead be able to simply include that path into your own justfile, without having to copy it manually.
|
You can merge our template justfiles into your own local configuration. When `just` supports [include directives](https://just.systems/man/en/chapter_52.html), you will instead be able to simply include these paths into your own justfile, without having to copy anything manually.
|
||||||
|
|
||||||
|
Run the following commands when you're logged into the operating system, to merge uBlue's provided configurations into your own user config. (The "touch" command is only necessary on certain shells which won't let you merge into non-existent files.)
|
||||||
|
|
||||||
|
```sh
|
||||||
|
touch ~/.justfile
|
||||||
|
cat /usr/share/ublue-os/just/main.just >> ~/.justfile
|
||||||
|
cat /usr/share/ublue-os/just/custom.just >> ~/.justfile
|
||||||
|
```
|
||||||
|
|
||||||
After doing that, you'll be able to run the following commands:
|
After doing that, you'll be able to run the following commands:
|
||||||
|
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ firstboot:
|
|||||||
# on build, in a category named "Custom". If you prefer, you can instead remove
|
# on build, in a category named "Custom". If you prefer, you can instead remove
|
||||||
# everything below and directly edit "yafti.yml" to have more control.
|
# everything below and directly edit "yafti.yml" to have more control.
|
||||||
# Alternatively, if you've disabled "yafti", you can still install these via
|
# Alternatively, if you've disabled "yafti", you can still install these via
|
||||||
# the "just setup-flatpaks" command from our "justfile".
|
# the "just setup-flatpaks" command from our "custom.just" template file.
|
||||||
# This is just an example selection:
|
# This is just an example selection:
|
||||||
flatpaks:
|
flatpaks:
|
||||||
- org.mozilla.firefox
|
- org.mozilla.firefox
|
||||||
|
|||||||
@@ -1,28 +1,3 @@
|
|||||||
default:
|
|
||||||
@just --list
|
|
||||||
|
|
||||||
bios:
|
|
||||||
systemctl reboot --firmware-setup
|
|
||||||
|
|
||||||
changelogs:
|
|
||||||
rpm-ostree db diff --changelogs
|
|
||||||
|
|
||||||
distrobox-boxkit:
|
|
||||||
echo 'Creating Boxkit distrobox ...'
|
|
||||||
distrobox create --image ghcr.io/ublue-os/boxkit -n boxkit -Y
|
|
||||||
|
|
||||||
distrobox-debian:
|
|
||||||
echo 'Creating Debian distrobox ...'
|
|
||||||
distrobox create --image quay.io/toolbx-images/debian-toolbox:unstable -n debian -Y
|
|
||||||
|
|
||||||
distrobox-opensuse:
|
|
||||||
echo 'Creating openSUSE distrobox ...'
|
|
||||||
distrobox create --image quay.io/toolbx-images/opensuse-toolbox:tumbleweed -n opensuse -Y
|
|
||||||
|
|
||||||
distrobox-ubuntu:
|
|
||||||
echo 'Creating Ubuntu distrobox ...'
|
|
||||||
distrobox create --image quay.io/toolbx-images/ubuntu-toolbox:22.04 -n ubuntu -Y
|
|
||||||
|
|
||||||
setup-flatpaks:
|
setup-flatpaks:
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
echo 'Installing flatpaks from the ublue recipe ...'
|
echo 'Installing flatpaks from the ublue recipe ...'
|
||||||
@@ -60,14 +35,3 @@ setup-gaming:
|
|||||||
nix-me-up:
|
nix-me-up:
|
||||||
echo 'Setting phasers to kill. Installing nix.'
|
echo 'Setting phasers to kill. Installing nix.'
|
||||||
/usr/bin/ublue-nix-install
|
/usr/bin/ublue-nix-install
|
||||||
|
|
||||||
update:
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
echo "Staging system update..."
|
|
||||||
rpm-ostree update
|
|
||||||
|
|
||||||
echo "Updating Flatpaks..."
|
|
||||||
flatpak update -y
|
|
||||||
|
|
||||||
echo "Updating Distroboxes..."
|
|
||||||
distrobox upgrade -a
|
|
||||||
Reference in New Issue
Block a user