ximper: refactoring

conf.d/ximper.mk

@@ -104,13 +104,13 @@ endif
 endif
 
 # base target (for most images)
-distro/.ximper-base: distro/.ximper-bare \
+distro/.ximper-minimal-env: distro/.ximper-bare \
 	use/isohybrid use/vmguest use/memtest \
 	use/efi/dtb +efi; @:
 
 
 # graphical target (not enforcing xorg drivers or blobs)
-distro/.ximper-x11: distro/.ximper-base mixin/ximper-x11 \
+distro/.ximper-x11: distro/.ximper-minimal-env mixin/ximper-x11 \
 	use/x11/wacom use/x11/amdgpu +wireless \
 	use/live/x11 use/live/repo \
 	use/live/suspend \
@@ -129,7 +129,7 @@ distro/.ximper-wm: distro/.ximper-x11 \
 	@$(call add,LIVE_PACKAGES,volumes-profile-kdesktop)
 
 
-distro/.ximper-install: distro/.ximper-base +installer \
+distro/.ximper-install: distro/.ximper-minimal-env +installer \
 	use/branding use/bootloader/grub use/luks use/stage2/kms \
 	use/install2/fs use/install2/vnc use/install2/repo
 	@$(call add,INSTALL2_PACKAGES,fdisk)
@@ -157,9 +157,8 @@ distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 \
 	@$(call add,THE_PACKAGES,btrfs-progs)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 
-distro/ximper: distro/.ximper-install-x11-systemd \
+distro/ximper-base: distro/.ximper-install-x11-systemd \
 	distro/.ximper-wm \
-	mixin/ximper-gnome \
 	mixin/ximper-desktop-common-software \
 	use/kernel/latest \
 	+plymouth;
@@ -173,13 +172,19 @@ distro/ximper: distro/.ximper-install-x11-systemd \
 	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
 	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
 
-distro/ximper-nvidia: distro/ximper use/x11/nvidia use/stage2/kms/nvidia
+mixin/ximper-nvidia: use/x11/nvidia use/stage2/kms/nvidia
 	@$(call add,THE_PACKAGES,apt-scripts-nvidia) 
 	@$(call add,BASE_PACKAGES,apt-scripts-nvidia)
 	@$(call add,BASE_PACKAGES,nvidia-vaapi-driver)
 	@$(call add,EFI_BOOTARGS,nomodeset xdriver=fbdev)
 	@$(call add,BASE_BOOTARGS,nvidia-drm.modeset=1)
 
+distro/ximper-gnome: distro/ximper-base \
+	mixin/ximper-gnome
+
+distro/ximper-gnome-nvidia: distro/ximper-gnome \
+	mixin/ximper-nvidia
+
 endif
 
 # Fonts mixins