From 893d8b074f8be5a2e3b2b9dd0bd63406c7dac065 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Sun, 16 Feb 2020 14:10:50 +0700 Subject: [PATCH] mixin.mk, regular-vm.mk: use/x11/lightdm/slick for mixin/regular-cinnamon slick-greeter is well integrated with cinnamon. --- conf.d/mixin.mk | 2 +- conf.d/regular-vm.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk index 82a54b43..651efb4d 100644 --- a/conf.d/mixin.mk +++ b/conf.d/mixin.mk @@ -80,7 +80,7 @@ mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm-gtk mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck @$(call add,THE_BRANDING,graphics) -mixin/regular-cinnamon: use/x11/cinnamon +nm-gtk \ +mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm-gtk \ use/fonts/ttf/google use/net/nm/mmgui use/im; @: mixin/regular-kde5: use/x11/kde5 use/browser/falkon \ diff --git a/conf.d/regular-vm.mk b/conf.d/regular-vm.mk index 2bdfe730..c6e0f379 100644 --- a/conf.d/regular-vm.mk +++ b/conf.d/regular-vm.mk @@ -51,8 +51,7 @@ vm/regular-builder: vm/regular-jeos-sysv mixin/regular-builder; @: vm/regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \ mixin/vm-archdep; @: -vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep \ - use/x11/lightdm/slick; @: +vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep; @: vm/regular-lxde: vm/.regular-gtk mixin/regular-lxde mixin/vm-archdep; @: