From a52094c8dbc8c48aec88c0c6993a7601a83bd2df Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Thu, 21 Sep 2023 19:35:12 -0700 Subject: [PATCH] fix: Use --nvidia when creating distrobox containers. feat: Switch to new numbered justfile system --- .../share/ublue-os/just/{bling.just => 100-bling.just} | 4 +--- files/usr/share/ublue-os/just/bling/distrobox.just | 8 +++++--- files/usr/share/ublue-os/just/bling/gaming.just | 2 ++ files/usr/share/ublue-os/just/bling/nix.just | 2 ++ files/usr/share/ublue-os/just/bling/shells.just | 2 ++ modules/bling/README.md | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) rename files/usr/share/ublue-os/just/{bling.just => 100-bling.just} (66%) diff --git a/files/usr/share/ublue-os/just/bling.just b/files/usr/share/ublue-os/just/100-bling.just similarity index 66% rename from files/usr/share/ublue-os/just/bling.just rename to files/usr/share/ublue-os/just/100-bling.just index 039da93..eebe7f1 100644 --- a/files/usr/share/ublue-os/just/bling.just +++ b/files/usr/share/ublue-os/just/100-bling.just @@ -1,6 +1,4 @@ !include /usr/share/ublue-os/just/bling/distrobox.just !include /usr/share/ublue-os/just/bling/gaming.just !include /usr/share/ublue-os/just/bling/nix.just -!include /usr/share/ublue-os/just/bling/shells.just - -set allow-duplicate-recipes \ No newline at end of file +!include /usr/share/ublue-os/just/bling/shells.just \ No newline at end of file diff --git a/files/usr/share/ublue-os/just/bling/distrobox.just b/files/usr/share/ublue-os/just/bling/distrobox.just index fb64c82..f2bbd67 100644 --- a/files/usr/share/ublue-os/just/bling/distrobox.just +++ b/files/usr/share/ublue-os/just/bling/distrobox.just @@ -1,3 +1,5 @@ +# vim: set ft=make : + update-distrobox-git: echo 'Installing latest git snapshot of Distrobox' curl -s https://raw.githubusercontent.com/89luca89/distrobox/main/install | sh -s -- --next --prefix ~/.local @@ -5,7 +7,7 @@ update-distrobox-git: [private] create-distrobox PRETTY_NAME IMAGE_TAG CONTAINER_NAME: echo "Creating {{PRETTY_NAME}} distrobox..." - distrobox create -i quay.io/toolbx-images/{{IMAGE_TAG}} -n {{CONTAINER_NAME}} -Y + distrobox create --nvidia -i quay.io/toolbx-images/{{IMAGE_TAG}} -n {{CONTAINER_NAME}} -Y distrobox-almalinux: (create-distrobox "Alma Linux" "almalinux-toolbox:latest" "alma") @@ -20,8 +22,8 @@ distrobox-rocky: (create-distrobox "Rocky Linux" "rockylinux-toolbox:latest" "ro distrobox-gamebox: echo 'Creating Arch-based Gaming distrobox...' - distrobox create -i ghcr.io/ublue-os/bazzite-arch -n bazzite-arch -Y + distrobox create --nvidia -i ghcr.io/ublue-os/bazzite-arch -n bazzite-arch -Y distrobox-bluefin: echo 'Creating Bluefin Ubuntu distrobox...' - distrobox create -i ghcr.io/ublue-os/ubuntu-toolbox:latest -n bluefin-ubuntu -Y + distrobox create --nvidia -i ghcr.io/ublue-os/ubuntu-toolbox:latest -n bluefin-ubuntu -Y diff --git a/files/usr/share/ublue-os/just/bling/gaming.just b/files/usr/share/ublue-os/just/bling/gaming.just index af395c4..181d8c6 100644 --- a/files/usr/share/ublue-os/just/bling/gaming.just +++ b/files/usr/share/ublue-os/just/bling/gaming.just @@ -1,3 +1,5 @@ +# vim: set ft=make : + setup-gaming: echo 'Setting up gaming experience ... lock and load.' distrobox create -i ghcr.io/ublue-os/bazzite-arch gamebox diff --git a/files/usr/share/ublue-os/just/bling/nix.just b/files/usr/share/ublue-os/just/bling/nix.just index e858b09..0737eae 100644 --- a/files/usr/share/ublue-os/just/bling/nix.just +++ b/files/usr/share/ublue-os/just/bling/nix.just @@ -1,3 +1,5 @@ +# vim: set ft=make : + # run the ublue nix installer from determinate systems https://github.com/DeterminateSystems/nix-installer nix-me-up: ublue-nix-install diff --git a/files/usr/share/ublue-os/just/bling/shells.just b/files/usr/share/ublue-os/just/bling/shells.just index 288674d..b57bb6b 100644 --- a/files/usr/share/ublue-os/just/bling/shells.just +++ b/files/usr/share/ublue-os/just/bling/shells.just @@ -1,2 +1,4 @@ +# vim: set ft=make : + change-root-shell: sudo lchsh -i diff --git a/modules/bling/README.md b/modules/bling/README.md index 4beb530..34b6dd5 100644 --- a/modules/bling/README.md +++ b/modules/bling/README.md @@ -10,7 +10,7 @@ The bling to pull in is declared under `install:`, and the code for installing t type: bling # configure what to pull in from ublue-os/bling install: - fonts # selection of common good free fonts - - justfiles # add "!include /usr/share/ublue-os/just/bling.just" + - justfiles # add "!include /usr/share/ublue-os/just/100-bling.just" # in your custom.just (added by default) or local justfile - nix-installer # these are the silverblue nix installer scripts from dnkmmr69420 - ublue-os-wallpapers