revert: nvidia multi images support

read here: Vanilla-OS/nvidia-image#49

recipe.json

@@ -5,7 +5,6 @@
  "images": {
  "default": "ghcr.io/vanilla-os/desktop:main",
  "nvidia": "ghcr.io/vanilla-os/nvidia:main",
- "nvidia-proprietary": "ghcr.io/vanilla-os/nvidia-proprietary:main",
  "vm": "ghcr.io/vanilla-os/vm:main"
  },
  "default_root_size": 12288,
@@ -14,7 +13,7 @@
  "/boot": 900,
  "/boot/efi": 512,
  "/": 21504,
- "/var": 25600
+  "/var": 25600
  },
  "tour": {
  "welcome": {
@@ -83,4 +82,4 @@
  "template": "encryption"
  }
  }
-}
+}

vanilla_installer/defaults/nvidia.py

@@ -16,9 +16,6 @@
 
 from gi.repository import Adw, Gtk
 
-import subprocess
-
-
 @Gtk.Template(resource_path="/org/vanillaos/Installer/gtk/default-nvidia.ui")
 class VanillaDefaultNvidia(Adw.Bin):
  __gtype_name__ = "VanillaDefaultNvidia"
@@ -30,8 +27,6 @@ class VanillaDefaultNvidia(Adw.Bin):
  info_popover = Gtk.Template.Child()
 
  use_proprietary = None
- use_open = None
- suggested_drivers = None
 
  def __init__(self, window, distro_info, key, step, **kwargs):
  super().__init__(**kwargs)
@@ -41,49 +36,24 @@ def __init__(self, window, distro_info, key, step, **kwargs):
  self.__step = step
  self.delta = False
 
- self.suggested_drivers = self.get_suggested_drivers()
-
- if self.suggested_drivers == "open":
- self.info_popover.set_visible(False)
-
- self.btn_yes.connect("clicked", self.use_drivers)
- self.btn_no.connect("clicked", self.no_drivers)
+ self.btn_yes.connect("clicked", self.use_proprietary_drivers)
+ self.btn_no.connect("clicked", self.use_open_drivers)
  self.btn_info.connect("clicked", self.show_info_popover)
 
  def get_finals(self):
  return {
  "nvidia": {
  "use-proprietary": self.use_proprietary,
- "use-open": self.use_open,
  }
  }
 
- def use_drivers(self, _):
- self.use_open = self.suggested_drivers == "open"
- self.use_proprietary = self.suggested_drivers == "proprietary"
-
+ def use_open_drivers(self, _):
+ self.use_proprietary = False
  self.__window.next()
 
- def no_drivers(self, _):
- self.use_proprietary = False
- self.use_open = False
+ def use_proprietary_drivers(self, _):
+ self.use_proprietary = True
  self.__window.next()
 
  def show_info_popover(self, _):
- self.info_popover.popup()
-
- def get_suggested_drivers(self):
- """
- lspci | grep -E 'NVIDIA.*(GeForce [4-8][0-9]{2}|GeForce GTX [6-9]..)' && exit 0 || exit 1
- 0 is legacy, 1 is non-legacy
- """
- res = subprocess.run(
- "lspci | grep -E 'NVIDIA.*(GeForce [4-8][0-9]{2}|GeForce GTX [6-9]..)' && exit 0 || exit 1",
- shell=True,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- )
- if res.returncode == 0:
- return "proprietary"
-
- return "open"
+ self.info_popover.popup()

vanilla_installer/utils/processor.py

@@ -487,8 +487,6 @@ def gen_install_recipe(log_path, finals, sys_recipe):
  oci_image = final["custom_image"]
  elif "nvidia" in final.keys():
  if final["nvidia"]["use-proprietary"]:
- oci_image = images["nvidia-proprietary"]
- if final["nvidia"]["use-open"]:
  oci_image = images["nvidia"]
  elif "vm" in final.keys():
  if final["vm"]["use-vm-tools"]: