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

[pull] main from bluefin-main #70

Open
wants to merge 120 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
c40eff7
feat: incus enable script (#759)
bketelsen Dec 29, 2023
85b74ea
feat: add brew package (#760)
castrojo Dec 29, 2023
73c3e50
fix(dx): use upstream wolfi as a base image (#761)
castrojo Dec 30, 2023
98a4e80
feat: add dive command (#762)
castrojo Dec 30, 2023
c049d6c
feat: bluefin-cli enable sudo/chown linuxbrew (#763)
m2Giles Dec 31, 2023
f5409ca
feat(dx): add command-not-found (#765)
castrojo Dec 31, 2023
e856ac0
feat: add playerctl (#766)
ispanos Dec 31, 2023
d6737cb
feat: add dx-specific user setup, install devcontainers/docker vscode…
jeefy Jan 1, 2024
075e32c
fix: call the correct binary from the service unit (#770)
castrojo Jan 1, 2024
f8dabd4
fix(-dx): Workaround swtpm SELinux issues (#764)
m2Giles Jan 1, 2024
d965108
fix: start docker.service on-demand instead of on-boot (#772)
p5 Jan 1, 2024
97ea484
fix: remove `systemctl enable docker` from `just docker` command (#773)
p5 Jan 2, 2024
3dd7809
feat(dx): Add wheel users to docker,incus-admin,lxd,libvirt groups (#…
m2Giles Jan 2, 2024
e4ab9d3
feat(toolbox): Verify wolfi-base before building (#774)
EyeCantCU Jan 2, 2024
dae9abe
feat(bluefin-cli): Add host-spawn and create symlinks (#776)
m2Giles Jan 2, 2024
3d0b059
fix(bluefin-cli): Make sure /usr/bin/sh exists (#778)
m2Giles Jan 3, 2024
bf5868a
feat(ci): Verify remaining toolboxes (#779)
EyeCantCU Jan 3, 2024
bcf3ab1
fix: remove `--disable-content-trust` push flag (#780)
p5 Jan 3, 2024
895aee9
feat: add topgrade (#782)
castrojo Jan 4, 2024
9a8c9b2
fix: Update README.md to update the http links to https (#787)
andrewbaker-uk Jan 4, 2024
12f3f00
fix: Hide menu icons without deleting .desktop files (#786)
ispanos Jan 4, 2024
084c9f7
feat: add firewall-config - gui for firewall (#793)
ispanos Jan 5, 2024
7f52f32
feat(bluefin-cli): Persist State of Cellar (#785)
m2Giles Jan 5, 2024
006cdf2
feat: Add Warehouse (#798)
nicknamenamenick Jan 8, 2024
4ad81a6
chore: clean-up dotfiles from home dir (#794)
ispanos Jan 8, 2024
aaa69ea
feat: add gaming, gamingutilities, utilities folders in gnome (#792)
ispanos Jan 8, 2024
6b781fb
chore: Cleanup bluefin-cli (#801)
m2Giles Jan 9, 2024
3ece3ee
chore(deps): bump EyeCantCU/cosign-action from 0.2.1 to 0.2.2 (#799)
dependabot[bot] Jan 12, 2024
1768b71
feat: add contributors action (#802)
castrojo Jan 12, 2024
9f94c3e
chore(ci): fix syntax error (#803)
castrojo Jan 12, 2024
0d92fad
fix: provide build workflow with write permissions to the repo conten…
p5 Jan 12, 2024
a4ac751
chore(ci): extract contributors readme action to separate workflow (#…
p5 Jan 12, 2024
40f91a6
fix: Make Wolfi build again (#812)
hirnidrin Jan 13, 2024
0e2d892
feat: move toolboxes to ublue-os/toolboxes (#814)
castrojo Jan 14, 2024
3b069e1
docs: add repobeats and star history (#816)
castrojo Jan 15, 2024
fd4da30
chore(readme): Use dark theme supported markup for star history
KyleGospo Jan 15, 2024
5655a19
fix: update repobeats
castrojo Jan 15, 2024
47c7f6f
feat: set theme for Prompt (#819)
castrojo Jan 17, 2024
c0a70bc
fix: Add missing quotes to dconf string value. (#821)
hirnidrin Jan 18, 2024
9b122a7
chore(just): cleanup in prep for just reorg in ublue-os/config (#817)
HikariKnight Jan 18, 2024
8639734
feat: use topgrade for manual upgrades (#822)
castrojo Jan 20, 2024
a7ba176
fix: Replace upstream file instead of adding new one for ujust update
KyleGospo Jan 20, 2024
58e4244
fix: make topgrade --yes by default (#824)
castrojo Jan 21, 2024
7f76f9d
feat: Add pods to default install (#825)
castrojo Jan 21, 2024
219f74e
feat: match bazzite's logomenu (#826)
castrojo Jan 21, 2024
5454fbf
chore: remove private for bluefin-cli ujust (#827)
m2Giles Jan 22, 2024
c90900b
chore: Remove now unneeded xpad-noone driver (#831)
KyleGospo Jan 24, 2024
d89aeba
feat: Switch to much smaller nerd-fonts package (#837)
KyleGospo Jan 26, 2024
bf1e771
feat: Switch to topgrade powered ublue-update (#835)
KyleGospo Jan 26, 2024
d52702b
feat(ci): Introduce a testing tag (#838)
EyeCantCU Jan 27, 2024
502664a
feat: Add default config for Pods flatpak (#839)
KyleGospo Jan 27, 2024
e116567
fix: Correct skel.d error in installer
KyleGospo Jan 27, 2024
efc420a
feat: add user-motd banner (#840)
bsherman Jan 28, 2024
fa98f72
chore: doens't -> doesn't (#841)
jplock Jan 28, 2024
bc2128e
feat: Initial Container wireup (#844)
m2Giles Jan 28, 2024
807b5b3
fix(just): correct the arg order for AssembleList when making mlbox (…
HikariKnight Jan 28, 2024
d97f710
fix: quadlet locations (#846)
m2Giles Jan 28, 2024
f855259
feat: Add dynamic MOTD tips and image info (#847)
KyleGospo Jan 28, 2024
45eaad7
fix: Correct motd syntax
KyleGospo Jan 28, 2024
0c9abd5
fix: Correct skel path for dx files
KyleGospo Jan 28, 2024
96cd5e3
fix: small adjustments to motd (#848)
castrojo Jan 28, 2024
72b9106
feat: jazz up the motd (#849)
castrojo Jan 28, 2024
0a83c8b
fix: Add nerd fonts to all images
KyleGospo Jan 29, 2024
90b0702
chore: Remove nerd font repo once it's no longer needed
KyleGospo Jan 29, 2024
fddddea
fix(motd): minor text fix (#851)
castrojo Jan 29, 2024
08e3360
fix: add more tips
castrojo Jan 29, 2024
844bc15
fix: update motd generation (#853)
castrojo Jan 29, 2024
f3603de
feat(just): remove things we don't use from the justfile (#852)
castrojo Jan 29, 2024
238ee63
Update 10-tips.md
castrojo Jan 29, 2024
47504be
fix: add flathub donation link
castrojo Jan 29, 2024
81e27f9
Update 10-tips.md
castrojo Jan 29, 2024
de1c9c9
fix: update bluefin.md
castrojo Jan 29, 2024
a3ed979
fix: more tips
castrojo Jan 29, 2024
a301ebf
refactor: remove local user-motd.sh mod as it is now provided upstrea…
bsherman Jan 29, 2024
cbe6532
fix: Restore Ubuntu & Cascadia code fonts after previous switch to si…
KyleGospo Jan 29, 2024
3df0332
feat: Switch to TuneD from PPD (F39+) (#836)
KyleGospo Jan 29, 2024
91ab228
feat: add mastodon tip
castrojo Jan 29, 2024
81f1648
fix: mastodon url
castrojo Jan 29, 2024
9eaed15
feat: Switch to system level flatpaks (#790)
KyleGospo Jan 29, 2024
0a88a21
fix: update tips (#860)
castrojo Jan 30, 2024
4c6fcef
fix: Ensure flathub repo is always installed (#861)
KyleGospo Jan 30, 2024
2bedbb1
Update bluefin.md
castrojo Jan 30, 2024
c64c8fb
fix: improve ujust bluefin-cli (#857)
m2Giles Jan 30, 2024
aa27a95
feat: Replace tips with a check engine light when the booted image is…
KyleGospo Jan 31, 2024
507ae9a
feat: Add modified Catppuccin theme with dark/light support as the de…
KyleGospo Jan 31, 2024
39aa492
fix: icon spacing
castrojo Jan 31, 2024
d75cda9
chore: remove -dx container options (#866)
m2Giles Jan 31, 2024
02e8f36
Update 10-tips.md
castrojo Jan 31, 2024
ce2e723
fix: correct Pods packagename (#867)
castrojo Feb 1, 2024
c003805
Update 10-tips.md
castrojo Feb 2, 2024
1070868
fix: wrong file name for quadlet (#869)
m2Giles Feb 3, 2024
cce1728
chore: match bazzites topgrade.toml (#870)
m2Giles Feb 3, 2024
45d93e6
chore: Support new line in MOTD (#872)
KyleGospo Feb 4, 2024
86f5b41
Revert "chore: match bazzites topgrade.toml" (#873)
m2Giles Feb 4, 2024
1faa99a
fix(just): clean up distroboxes (#871)
castrojo Feb 3, 2024
9839d49
fix: update tips
castrojo Feb 4, 2024
f75119d
fix: update tips
castrojo Feb 4, 2024
61ea499
feat: prompt integration with quadlets (#874)
m2Giles Feb 5, 2024
d1afdc8
chore(deps): bump sigstore/cosign-installer from 3.3.0 to 3.4.0 (#875)
dependabot[bot] Feb 5, 2024
684d27a
feat: Enable GSP by default for Nvidia hardware, needed by NVK (#877)
KyleGospo Feb 6, 2024
e801dfb
chore(ci): fix possible empty version meta on image (#878)
bsherman Feb 7, 2024
3e0e074
fix: Correct default font applied to VSCode (#879)
KyleGospo Feb 8, 2024
6173cc9
feat: add podman wrapper for vscode (#885)
89luca89 Feb 10, 2024
922550e
fix: chmod (#887)
bketelsen Feb 10, 2024
98873c5
feat: add ability to set Prompt terminal transparency with ujust (#886)
dperson Feb 11, 2024
c3251a9
feat(dx): add remote-containers extension to vscode (#888)
castrojo Feb 11, 2024
267e5be
feat: improve prompt integration with quadlets (#889)
m2Giles Feb 11, 2024
36adbfd
fix: correct name in enable-bluefin-cli.sh (#894)
m2Giles Feb 11, 2024
95ca17f
feat: Get Atuin from bluefin-cli (#895)
m2Giles Feb 11, 2024
954d4e0
fix: enable MOTD for fish (#897)
m2Giles Feb 12, 2024
32067d1
chore: add a safety check for atuin in justfile (#899)
m2Giles Feb 12, 2024
45fddbd
fix: Update libadwaita package for Prompt (#901)
KyleGospo Feb 12, 2024
a7d993d
feat: set terminal quick launch shortcuts (#903)
castrojo Feb 12, 2024
3e04e66
fix: shortcut should be Return not Enter (#904)
castrojo Feb 13, 2024
232a053
fix: remove fedora shortcut from -dx (#905)
castrojo Feb 13, 2024
df40f7b
fix: correct dconf key in default-uuid bluefin-cli (#908)
m2Giles Feb 14, 2024
93dcf1d
feat: Add GNOME Boxes to development tools section (#909)
dylanmtaylor Feb 16, 2024
614ada6
fix(fish): address overriden config (#912)
bayou-brogrammer Feb 17, 2024
3a29aff
feat: vscode-distrobox script (#914)
bketelsen Feb 17, 2024
5a5d112
feat: improve podman-host script for vscode integration (#915)
89luca89 Feb 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: remove -dx container options (ublue-os#866)
  • Loading branch information
m2Giles authored Jan 31, 2024
commit d75cda95903d28a305fa4406826cb04f484e5a22
2 changes: 1 addition & 1 deletion fetch-quadlets.sh
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ EOF
cat > "/usr/share/ublue-os/bluefin-cli/${i}.sh" <<EOF
#!/bin/sh

if test ! -f "/run/user/\${UID}/container-entry" && test -n "\$PS1" && test \$(podman ps --all --filter name=$i | grep -q " $i\$") && test ! -f "/run/.containerenv"; then
if test -n "\$PS1" && test ! -f "/run/.containerenv" && test ! -f "/run/user/\${UID}/container-entry" && test \$(podman ps --all --filter name=$i | grep -q " $i\$") ; then
touch "/run/user/\${UID}/container-entry"
exec /usr/bin/distrobox-enter $i
fi
30 changes: 9 additions & 21 deletions usr/libexec/bluefin-cli.sh
Original file line number Diff line number Diff line change
@@ -7,11 +7,9 @@ source /usr/lib/ujust/ujust.sh
###
targets=(
"bluefin-cli"
"bluefin-dx-cli"
"fedora-toolbox"
"ubuntu-toolbox"
"wolfi-toolbox"
"wolfi-dx-toolbox"
)

###
@@ -26,6 +24,7 @@ function Exiting(){
function Good_Exit(){
echo ""
echo "Finished Bluefin-CLI setup, rerun with ${blue}ujust bluefin-cli${normal} to reconfigure"
exit 0
}

###
@@ -45,7 +44,6 @@ function ctrl_c(){
Exiting
}


###
# Choose if you want to use the Host or Container for first terminal
###
@@ -75,23 +73,10 @@ function Make_container(){

###
# Choose which container they want to use
# For bluefin-cli and wolfi, ask if they want dx
###
function Choose_container(){
DX_VERSION=1
echo "Which Container Toolbox would you like to use?"
CONTAINER_CHOICE=$(Choose "${targets[@]}")
if test "$CONTAINER_CHOICE" = "bluefin-cli" || test "$CONTAINER_CHOICE" = "wolfi-toolbox"; then
printf "Would you like to use developer toolkit version?\n"
printf "It has packages for building Apks and other SDKs.\n"
DX_VERSION=$(Confirm)
if test "$DX_VERSION" -eq 0; then
MATCH=$(echo "$CONTAINER_CHOICE" | cut -d "-" -f 2)
CONTAINER_CHOICE="${CONTAINER_CHOICE%%"${MATCH}"*}dx-${MATCH}${CONTAINER_CHOICE##*"${MATCH}"}"
fi
fi
unset "$DX_VERSION"
unset "$MATCH"
String_check "$CONTAINER_CHOICE"
}

@@ -120,8 +105,8 @@ function Is_enabled_and_stop(){
Enabled=0
Enabled=$(systemctl --user is-enabled "$i".target)
if test "$Enabled" = "enabled" && test "$i" != "$1"; then
echo "$i is enabled."
echo "Would you like to disable and stop container?"
echo "${red}$i${normal} is ${red}enabled${normal}."
echo "Would you like to ${red}disable and stop container${red}?"
Disable=$(Confirm)
if test "$Disable" -eq 0; then
systemctl --user --now disable "$i".target
@@ -133,7 +118,7 @@ function Is_enabled_and_stop(){
fi
unset "$Disable"
elif test "$Enabled" = "enabled" && test "$i" = "$1"; then
echo "$1 is already enabled..."
echo "${blue}$1 is already enabled${normal}..."
MATCH=1
fi
unset "$Enabled"
@@ -142,6 +127,7 @@ function Is_enabled_and_stop(){
Make_bashrc_d_file "$TERMINAL_CHOICE" "$1"
Good_Exit
fi
unset $MATCH
}

###
@@ -161,8 +147,9 @@ function Already_exists_and_rm(){
echo "Removing $1..."
podman rm --force "$1"
else
printf "Not removing %s and cannot continue since %s already exists..." "$1" "$1"
Exiting
echo "Reuisng existing $1 container."
Make_bashrc_d_file "$TERMINAL_CHOICE" "$1"
Good_Exit
fi
unset "$Delete"
elif test "$Exists" -eq 1 && test "$i" != "$1"; then
@@ -215,6 +202,7 @@ function Make_bashrc_d_file(){
echo "Setting first terminal be Container for bash using ~/.bashrc.d"
echo "Enter into container using prompt's menu after first entry"
echo "${blue}This requires your bash shell to source files in ~/.bashrc.d/${normal}"
test -e "${HOME}/.bashrc.d/00-container.sh" && rm "${HOME}/.bashrc.d/00-container.sh"
cp "/usr/share/ublue-os/bluefin-cli/${2}.sh" "${HOME}/.bashrc.d/00-container.sh"
else
echo "${red}Not implemented for non-Bash shells${normal} at this time..."