From e2ddd98cc91cc7736e9299d0f560164629ac7a98 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 18 Aug 2022 11:21:39 +0800 Subject: [PATCH] nixos/cinnamon: default to slick-greeter Default in Linux Mint. --- .../services/x11/desktop-managers/cinnamon.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 26a5191761d6..a8e0bf9dddb6 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -58,13 +58,18 @@ in }; config = mkMerge [ - (mkIf (cfg.enable && config.services.xserver.displayManager.lightdm.enable && config.services.xserver.displayManager.lightdm.greeters.gtk.enable) { - services.xserver.displayManager.lightdm.greeters.gtk.extraConfig = mkDefault (builtins.readFile "${pkgs.cinnamon.mint-artwork}/etc/lightdm/lightdm-gtk-greeter.conf.d/99_linuxmint.conf"); - }) - (mkIf cfg.enable { services.xserver.displayManager.sessionPackages = [ pkgs.cinnamon.cinnamon-common ]; + services.xserver.displayManager.lightdm.greeters.slick = { + enable = mkDefault true; + + # Taken from mint-artwork.gschema.override + theme.name = mkDefault "Mint-X"; + theme.package = mkDefault pkgs.cinnamon.mint-themes; + iconTheme.name = mkDefault "Mint-X-Dark"; + iconTheme.package = mkDefault pkgs.cinnamon.mint-x-icons; + }; services.xserver.displayManager.sessionCommands = '' if test "$XDG_CURRENT_DESKTOP" = "Cinnamon"; then true