Skip to content
This repository has been archived by the owner on Oct 18, 2024. It is now read-only.

Commit

Permalink
fix!: move justfile to standardized, non-conflicting new location
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
Arcitec authored and xynydev committed May 14, 2023
1 parent 2f85593 commit cec7397
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 39 deletions.
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,17 @@ The `latest` tag will automatically point to the latest build. That build will s

## 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:

Expand Down
2 changes: 1 addition & 1 deletion recipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ firstboot:
# 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.
# 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:
flatpaks:
- org.mozilla.firefox
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
#!/usr/bin/env bash
echo 'Installing flatpaks from the ublue recipe ...'
Expand Down Expand Up @@ -60,14 +35,3 @@ setup-gaming:
nix-me-up:
echo 'Setting phasers to kill. Installing nix.'
/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

0 comments on commit cec7397

Please sign in to comment.