Commit 0c703611 authored by Roman Alifanov's avatar Roman Alifanov

separated distro/ximper-gnome and distro/ximper-gnome-nvidia

parent 61802584
...@@ -26,7 +26,7 @@ mixin/ximper-desktop-common-software: ...@@ -26,7 +26,7 @@ mixin/ximper-desktop-common-software:
\ \
etersoft/01_games\ etersoft/01_games\
etersoft/games-portproton etersoft/games-lutris etersoft/games-mangohud\ etersoft/games-portproton etersoft/games-lutris etersoft/games-mangohud\
etersoft/games-32bit-libs etersoft/games-vkbasalt etersoft/games-steam\ etersoft/games-vkbasalt etersoft/games-steam\
\ \
etersoft/02_peripheral\ etersoft/02_peripheral\
etersoft/peripherals-openrgb etersoft/peripherals-asusctl-rog-gui\ etersoft/peripherals-openrgb etersoft/peripherals-asusctl-rog-gui\
...@@ -44,7 +44,7 @@ mixin/ximper-desktop-common-software: ...@@ -44,7 +44,7 @@ mixin/ximper-desktop-common-software:
@$(call add,LIVE_GROUPS,\ @$(call add,LIVE_GROUPS,\
etersoft/gnome-settings\ etersoft/gnome-settings\
etersoft/chromium-gost etersoft/libreoffice etersoft/atril\ etersoft/chromium-gost etersoft/libreoffice etersoft/atril\
etersoft/portproton etersoft/telegram etersoft/32bit-libs etersoft/gnome-ssh-agent\ etersoft/portproton etersoft/telegram etersoft/gnome-ssh-agent\
slinux/graphics-full-shotwell slinux/flatpak etersoft/timeshift\ slinux/graphics-full-shotwell slinux/flatpak etersoft/timeshift\
etersoft/gparted\ etersoft/gparted\
) )
...@@ -160,7 +160,7 @@ distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 +systemd +systemd ...@@ -160,7 +160,7 @@ distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 +systemd +systemd
@$(call add,THE_PACKAGES,btrfs-progs) @$(call add,THE_PACKAGES,btrfs-progs)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd) @$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
distro/ximper-base: distro/.ximper-install-x11-systemd \ distro/.ximper-base: distro/.ximper-install-x11-systemd \
use/live/rw use/live/ru use/live/x11 use/live/repo \ use/live/rw use/live/ru use/live/x11 use/live/repo \
use/live/suspend \ use/live/suspend \
mixin/ximper-desktop-common-software \ mixin/ximper-desktop-common-software \
...@@ -193,10 +193,13 @@ mixin/ximper-nvidia: use/x11/nvidia use/stage2/kms/nvidia ...@@ -193,10 +193,13 @@ mixin/ximper-nvidia: use/x11/nvidia use/stage2/kms/nvidia
distro/ximper-gnome: distro/ximper-base \ distro/ximper-gnome: distro/.ximper-base \
mixin/ximper-gnome mixin/ximper-gnome
@$(call add,MAIN_GROUPS,etersoft/games-32bit-libs)
@$(call add,LIVE_GROUPS,etersoft/32bit-libs)
distro/ximper-gnome-nvidia: distro/ximper-gnome \ distro/ximper-gnome-nvidia: distro/.ximper-base \
mixin/ximper-gnome \
mixin/ximper-nvidia mixin/ximper-nvidia
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment