From 0fd9acf27af94d699c5bfbc9aedfa463079f2d90 Mon Sep 17 00:00:00 2001
From: gerblesh <101901964+gerblesh@users.noreply.github.com>
Date: Sat, 16 Sep 2023 17:31:05 -0700
Subject: [PATCH] feat: add nvidia image, updated mako config

---
 .github/workflows/build.yml                      |  1 +
 boot_menu.yml                                    |  8 ++++++--
 build.sh                                         |  2 --
 config/desktop.yml                               |  1 +
 config/files/usr/etc/homedir/.config/mako/config | 12 +++++++++---
 config/recipe-nvidia.yml                         | 14 ++++++++++++++
 6 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 config/desktop.yml
 create mode 100644 config/recipe-nvidia.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4af6064c87..b335e210f5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,6 +40,7 @@ jobs:
         # Don't add module configuration files, you will get errors.
         recipe:
           - recipe.yml
+          - recipe-nvidia.yml
 # !!!
 
     steps:
diff --git a/boot_menu.yml b/boot_menu.yml
index 2cb27987f6..2afc2c7eba 100644
--- a/boot_menu.yml
+++ b/boot_menu.yml
@@ -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
diff --git a/build.sh b/build.sh
index 717f8bd488..2ee040d2c0 100644
--- a/build.sh
+++ b/build.sh
@@ -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 "======"
diff --git a/config/desktop.yml b/config/desktop.yml
new file mode 100644
index 0000000000..c17b60bff4
--- /dev/null
+++ b/config/desktop.yml
@@ -0,0 +1 @@
+# this will include desktop specific config files later
diff --git a/config/files/usr/etc/homedir/.config/mako/config b/config/files/usr/etc/homedir/.config/mako/config
index 47c0caa4eb..c90b3251bb 100644
--- a/config/files/usr/etc/homedir/.config/mako/config
+++ b/config/files/usr/etc/homedir/.config/mako/config
@@ -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
diff --git a/config/recipe-nvidia.yml b/config/recipe-nvidia.yml
new file mode 100644
index 0000000000..4d31e284dd
--- /dev/null
+++ b/config/recipe-nvidia.yml
@@ -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