fix: Add Nvidia Version to main base case (#107)

integration-tests/test-repo/config/akmods.yml

@@ -0,0 +1,22 @@
+# TODO: Add back installs after upstream issues are fixed
+
+modules:
+  # Tests installing rpms from a combo image stage
+  - type: akmods
+    base: surface
+    nvidia-version: 545
+    # install:
+    #   - nvidia
+    #   - openrazer
+    #   - openrgb
+
+  # Tests pulling main image
+  - type: akmods
+
+  # Tests pulling image for main nvidia
+  - type: akmods
+    nvidia-version: 545
+
+  # Test pulling image for base asus
+  - type: akmods
+    base: asus

integration-tests/test-repo/config/recipe.yml

@@ -1,29 +1,13 @@
-# image will be published to ghcr.io/<user>/<name>
 name: template
-# description will be included in the image's metadata
 description: This is my personal OS image.
-
-# the base image to build on top of (FROM) and the version tag to use
 base-image: ghcr.io/ublue-os/silverblue-surface
-image-version: 39 # latest is also supported if you want new updates ASAP
-
-# module configuration, executed in order
-# you can include multiple instances of the same module
+image-version: 39
 modules:
-  - type: akmods
-    base: surface
-    nvidia-version: 545
-    install:
-      - nvidia
-      - openrazer
-  - type: akmods
-    install:
-      - openrgb
+  - from-file: akmods.yml
+
   - type: files
     files:
-      - usr: /usr # copies config/files/usr into your image's /usr.
-                  # put configuration files you want in /etc/ on a booted system 
-                  # in /usr/etc/ in the image. read more in files module reference.
+      - usr: /usr
 
   - type: script
     scripts:
@@ -36,26 +20,20 @@ modules:
       - micro
       - starship
     remove:
-      - firefox # default firefox removed in favor of flatpak
-      - firefox-langpacks # langpacks needs to also be removed to prevent dependency problems
+      - firefox
+      - firefox-langpacks
 
   - type: default-flatpaks
-    notify: true # Send notification after install/uninstall is finished (true/false)
+    notify: true
     system:
-      # If no repo information is specified, Flathub will be used by default
-      # repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
-      # repo-name: flathub
-      # repo-title: "Flathub (system-wide)" # Optional; this sets the remote's user-facing name in graphical frontends like GNOME Software
       install:
         - org.mozilla.firefox
         - org.gnome.Loupe
-        - one.ablaze.floorp//lightning # This is an example of flatpak which has multiple branches in selection (flatpak//branch).
-      # Flatpak runtimes are not supported (like org.winehq.Wine//stable-23.08),
-      # only normal flatpak applications are (like Floorp Lightning web browser in this example).
-      # Installing different branches of the same Flatpak is not supported.
+        - one.ablaze.floorp//lightning
       remove:
         - org.gnome.eog
 
-  - type: signing # this sets up the proper policy & signing files for signed images to work fully
+  - type: signing
+
   - type: test-module
 

recipe/src/module.rs

@@ -119,7 +119,7 @@ impl<'a> Module<'a> {
                 (Some(b), _) if !b.is_empty() => (format!("akmods:{b}-{os_version}"), None),
                 (_, Some(nv)) if nv > 0 => (
                     format!("akmods:main-{os_version}"),
-                    Some(format!("akmods-nvidia:main-{os_version}")),
+                    Some(format!("akmods-nvidia:main-{os_version}-{nv}")),
                 ),
                 _ => (format!("akmods:main-{os_version}"), None),
             })