Skip to content

Commit

Permalink
feat: add nvidia image, updated mako config
Browse files Browse the repository at this point in the history
  • Loading branch information
gerblesh committed Sep 17, 2023
1 parent c682c55 commit 0fd9acf
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
# Don't add module configuration files, you will get errors.
recipe:
- recipe.yml
- recipe-nvidia.yml
# !!!

steps:
Expand Down
8 changes: 6 additions & 2 deletions boot_menu.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
ublue_variants:
- label: gerblesh/usway-rewrite
- label: gerblesh/usway
ks: /kickstart/ublue-os.ks
flavors:
- label: usway-rewrite
- label: usway
- label: gerblesh/usway-nvidia
ks: /kickstart/ublue-os-nvidia.ks
flavors:
- label: usway-nvidia
2 changes: 0 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ run_module() {
# If the type is not found, that means that the module config
# is in a separate file, and has to be read from it
FILE=$(echo "$MODULE" | yq '.from-file')

#MODULE_CONFIG=$(yq -o=j -I=0 '.' "$CONFIG_DIRECTORY/$FILE")
run_modules "$CONFIG_DIRECTORY/$FILE"
fi
echo "======"
Expand Down
1 change: 1 addition & 0 deletions config/desktop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# this will include desktop specific config files later
12 changes: 9 additions & 3 deletions config/files/usr/etc/homedir/.config/mako/config
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,18 @@ height=175
width=500
max-icon-size=128
border-size=4
icon-path=/usr/share/icons/Papirus/:/usr/share/icons/Adwaita
icon-path=/usr/share/icons/Catppuccin-SE
on-button-left=exec makoctl menu -n "$id" fuzzel -d --prompt 'Select action: ' && makoctl dismiss -n "$id"
format=<i><small><span color='#45475a'>%a</span></small></i>\n<b>%s</b>\n%b
format=<span color='#45475a' size='smaller' style='italic'>%a</span>\n<span size='larger' weight='bold'>%s</span>\n%b

[app-name=""]
format=<span color='#45475a' size='smaller' style='italic'>%a</span>\n<span size='larger' weight='bold'>%s</span>\n%b

[actionable]
format=<i><small><span color='#45475a'>%a</span></small></i>\n<span color='#eba0ac'>(A) </span> <b>%s</b>\n%b
format=<span color='#45475a' size='smaller' style='italic'>%a</span>\n<span color='#eba0ac' size='smaller' weight='bold'>(A) </span><span size='larger' weight='bold'>%s</span>\n%b

[actionable app-name=""]
format=<span color='#eba0ac' size='smaller' weight='bold'>(A) </span><span size='larger' weight='bold'>%s</span>\n%b

[urgency=high]
border-color=#f38ba8
Expand Down
14 changes: 14 additions & 0 deletions config/recipe-nvidia.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# image will be published to ghcr.io/<user>/<name>
name: usway-nvidia
# description will be included in the image's metadata
description: A starting point for further customization of uBlue images. Make your own! https://ublue.it/making-your-own/

# the base image to build on top of (FROM) and the version tag to use
base-image: ghcr.io/ublue-os/sericea-nvidia
image-version: 38 # latest is also supported if you want new updates ASAP

# list of modules, executed in order
# you can include multiple instances of the same module
modules:
- from-file: common.yml
- from-file: desktop.yml

0 comments on commit 0fd9acf

Please sign in to comment.