Commit b1376899 authored by Roman Alifanov's avatar Roman Alifanov

Move neofetch and btop to desktop+ximper tag. Add cascadia-code font,…

Move neofetch and btop to desktop+ximper tag. Add cascadia-code font, extension-manager, switcheroo-control to default packages.
parent 78d4a501
...@@ -6,7 +6,9 @@ mixin/ximper-desktop-commom-software: ...@@ -6,7 +6,9 @@ mixin/ximper-desktop-commom-software:
eog eog-plugins\ eog eog-plugins\
mate-document-viewer mate-document-viewer-djvu mate-document-viewer-dvi mate-document-viewer-pixbuf mate-document-viewer-xps\ mate-document-viewer mate-document-viewer-djvu mate-document-viewer-dvi mate-document-viewer-pixbuf mate-document-viewer-xps\
\ \
blackbox-terminal neofetch btop\ extension-manager\
\
blackbox-terminal\
\ \
gradience Kvantum\ gradience Kvantum\
\ \
...@@ -19,7 +21,7 @@ mixin/ximper-desktop: +alsa +nm-native \ ...@@ -19,7 +21,7 @@ mixin/ximper-desktop: +alsa +nm-native \
use/x11/xorg use/xdg-user-dirs use/l10n \ use/x11/xorg use/xdg-user-dirs use/l10n \
use/branding/notes use/branding/notes
@$(call set,LOCALES,en_US) @$(call set,LOCALES,en_US)
@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit dvd+rw-tools) @$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit dvd+rw-tools fonts-cascadia-code)
@$(call add,THE_PACKAGES,polkit-rule-admin-root) @$(call add,THE_PACKAGES,polkit-rule-admin-root)
@$(call add,THE_BRANDING,alterator graphics indexhtml) @$(call add,THE_BRANDING,alterator graphics indexhtml)
@$(call add,THE_BRANDING,notes) @$(call add,THE_BRANDING,notes)
...@@ -38,7 +40,7 @@ mixin/ximper-desktop: +alsa +nm-native \ ...@@ -38,7 +40,7 @@ mixin/ximper-desktop: +alsa +nm-native \
mixin/ximper-x11: use/luks \ mixin/ximper-x11: use/luks \
use/kernel/disable-usb-autosuspend \ use/kernel/disable-usb-autosuspend \
use/branding use/ntp/chrony use/services/lvm2-disable use/branding use/ntp/chrony use/services/lvm2-disable
@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular && !extra)) @$(call add,THE_LISTS,$(call tags,(base || desktop) && ximper && !extra))
@$(call add,THE_PACKAGES,disable-usb-autosuspend) @$(call add,THE_PACKAGES,disable-usb-autosuspend)
@$(call add,THE_PACKAGES,btrfs-progs) @$(call add,THE_PACKAGES,btrfs-progs)
@$(call add,THE_PACKAGES,gpm) @$(call add,THE_PACKAGES,gpm)
...@@ -51,7 +53,7 @@ mixin/ximper-gnome3: use/x11/gnome3/minimal use/fonts/ttf/redhat +nm-gtk ...@@ -51,7 +53,7 @@ mixin/ximper-gnome3: use/x11/gnome3/minimal use/fonts/ttf/redhat +nm-gtk
@$(call add,THE_PACKAGES,xcalib templates) @$(call add,THE_PACKAGES,xcalib templates)
@$(call add,THE_PACKAGES,chrome-gnome-shell) @$(call add,THE_PACKAGES,chrome-gnome-shell)
@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland) @$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
@$(call add,THE_PACKAGES,gnome-terminal-nautilus sushi gnome-epub-thumbnailer alacarte gnome-power-manager power-profiles-daemon gnome-bluetooth3.0\ @$(call add,THE_PACKAGES,gnome-terminal-nautilus sushi gnome-epub-thumbnailer gnome-font-viewer alacarte gnome-power-manager switcheroo-control power-profiles-daemon gnome-bluetooth3.0\
gnome-shell-extension-appindicator gnome-shell-extension-dash-to-dock gnome-shell-extension-gsconnect\ gnome-shell-extension-appindicator gnome-shell-extension-dash-to-dock gnome-shell-extension-gsconnect\
branding-etersoft-ximper-gnome-settings) branding-etersoft-ximper-gnome-settings)
ifeq (sisyphus,$(BRANCH)) ifeq (sisyphus,$(BRANCH))
...@@ -84,7 +86,7 @@ distro/.ximper-x11: distro/.ximper-base mixin/ximper-x11 \ ...@@ -84,7 +86,7 @@ distro/.ximper-x11: distro/.ximper-base mixin/ximper-x11 \
use/live/suspend use/browser/firefox \ use/live/suspend use/browser/firefox \
use/syslinux/ui/gfxboot use/grub/ui/gfxboot use/syslinux/ui/gfxboot use/grub/ui/gfxboot
@$(call add,THE_BRANDING,bootloader) @$(call add,THE_BRANDING,bootloader)
@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular)) @$(call add,THE_LISTS,$(call tags,(base || desktop) && ximper))
@$(call add,LIVE_LISTS,$(call tags,base rescue)) @$(call add,LIVE_LISTS,$(call tags,base rescue))
@$(call add,LIVE_PACKAGES,gpm) @$(call add,LIVE_PACKAGES,gpm)
@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop) @$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
...@@ -112,7 +114,7 @@ distro/.ximper-install: distro/.ximper-base +installer \ ...@@ -112,7 +114,7 @@ distro/.ximper-install: distro/.ximper-base +installer \
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics) @$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
endif endif
@$(call add,THE_LISTS,$(call tags,base regular)) @$(call add,THE_LISTS,$(call tags,base ximper))
@$(call add,INSTALL2_BRANDING,alterator notes) @$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,INSTALL2_PACKAGES,btrfs-progs) @$(call add,INSTALL2_PACKAGES,btrfs-progs)
@$(call add,THE_BRANDING,alterator) @$(call add,THE_BRANDING,alterator)
......
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