commit 29cb1c877c4b03ec4375d64aac019e5fc35c8c77 · pyrox.dev/nixpkgs

maintainers/maintainer-list.nix

···

       13893
       13893
        
           github = "wamserma";

     

       13894
       13894
        
           githubId = 60148;

     

       13895
       13895
        
         };

     

       13896
       13896
       +
         water-sucks = {

     

       13897
       13897
       +
           email = "varun@cvte.org";

     

       13898
       13898
       +
           name = "Varun Narravula";

     

       13899
       13899
       +
           github = "water-sucks";

     

       13900
       13900
       +
           githubId = 68445574;

     

       13901
       13901
       +
         };

     

       13896
       13902
        
         waynr = {

     

       13897
       13903
        
           name = "Wayne Warren";

     

       13898
       13904
        
           email = "wayne.warren.s@gmail.com";

+3 -1

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

···

       125
       125
        
             </listitem>

     

       126
       126
        
             <listitem>

     

       127
       127
        
               <para>

     

       128
       128
       -
                 Cinnamon has been updated to 5.4.

     

       128
       128
       +
                 Cinnamon has been updated to 5.4. While at it, the cinnamon

     

       129
       129
       +
                 module now defaults to blueman as bluetooth manager and

     

       130
       130
       +
                 slick-greeter as lightdm greeter to match upstream.

     

       129
       131
        
               </para>

     

       130
       132
        
             </listitem>

     

       131
       133
        
             <listitem>

+2 -1

nixos/doc/manual/release-notes/rl-2211.section.md

···

       50
       50
        
       

     

       51
       51
        
       - PHP now defaults to PHP 8.1, updated from 8.0.

     

       52
       52
        
       

     

       53
       53
       -
       - Cinnamon has been updated to 5.4.

     

       53
       53
       +
       - Cinnamon has been updated to 5.4. While at it, the cinnamon module now defaults to

     

       54
       54
       +
         blueman as bluetooth manager and slick-greeter as lightdm greeter to match upstream.

     

       54
       55
        
       

     

       55
       56
        
       - `hardware.nvidia` has a new option `open` that can be used to opt in the opensource version of NVIDIA kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [NVIDIA Releases Open-Source GPU Kernel Modules](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for the official announcement.

     

       56
       57

+9 -4

nixos/modules/services/x11/desktop-managers/cinnamon.nix

···

       58
       58
        
         };

     

       59
       59
        
       

     

       60
       60
        
         config = mkMerge [

     

       61
       61
       -
           (mkIf (cfg.enable && config.services.xserver.displayManager.lightdm.enable && config.services.xserver.displayManager.lightdm.greeters.gtk.enable) {

     

       62
       62
       -
             services.xserver.displayManager.lightdm.greeters.gtk.extraConfig = mkDefault (builtins.readFile "${pkgs.cinnamon.mint-artwork}/etc/lightdm/lightdm-gtk-greeter.conf.d/99_linuxmint.conf");

     

       63
       63
       -
             })

     

       64
       64
       -
       

     

       65
       61
        
           (mkIf cfg.enable {

     

       66
       62
        
             services.xserver.displayManager.sessionPackages = [ pkgs.cinnamon.cinnamon-common ];

     

       67
       63
        
       

     

       64
       64
       +
             services.xserver.displayManager.lightdm.greeters.slick = {

     

       65
       65
       +
               enable = mkDefault true;

     

       66
       66
       +
       

     

       67
       67
       +
               # Taken from mint-artwork.gschema.override

     

       68
       68
       +
               theme.name = mkDefault "Mint-X";

     

       69
       69
       +
               theme.package = mkDefault pkgs.cinnamon.mint-themes;

     

       70
       70
       +
               iconTheme.name = mkDefault "Mint-X-Dark";

     

       71
       71
       +
               iconTheme.package = mkDefault pkgs.cinnamon.mint-x-icons;

     

       72
       72
       +
             };

     

       68
       73
        
             services.xserver.displayManager.sessionCommands = ''

     

       69
       74
        
               if test "$XDG_CURRENT_DESKTOP" = "Cinnamon"; then

     

       70
       75
        
                   true

+124

nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         ldmcfg = config.services.xserver.displayManager.lightdm;

     

       7
       7
       +
         cfg = ldmcfg.greeters.slick;

     

       8
       8
       +
       

     

       9
       9
       +
         inherit (pkgs) writeText;

     

       10
       10
       +
       

     

       11
       11
       +
         theme = cfg.theme.package;

     

       12
       12
       +
         icons = cfg.iconTheme.package;

     

       13
       13
       +
         font = cfg.font.package;

     

       14
       14
       +
       

     

       15
       15
       +
         slickGreeterConf = writeText "slick-greeter.conf" ''

     

       16
       16
       +
           [Greeter]

     

       17
       17
       +
           background=${ldmcfg.background}

     

       18
       18
       +
           theme-name=${cfg.theme.name}

     

       19
       19
       +
           icon-theme-name=${cfg.iconTheme.name}

     

       20
       20
       +
           font-name=${cfg.font.name}

     

       21
       21
       +
           draw-user-backgrounds=${boolToString cfg.draw-user-backgrounds}

     

       22
       22
       +
           ${cfg.extraConfig}

     

       23
       23
       +
         '';

     

       24
       24
       +
       in

     

       25
       25
       +
       {

     

       26
       26
       +
         options = {

     

       27
       27
       +
           services.xserver.displayManager.lightdm.greeters.slick = {

     

       28
       28
       +
             enable = mkOption {

     

       29
       29
       +
               type = types.bool;

     

       30
       30
       +
               default = true;

     

       31
       31
       +
               description = lib.mdDoc ''

     

       32
       32
       +
                 Whether to enable lightdm-slick-greeter as the lightdm greeter.

     

       33
       33
       +
               '';

     

       34
       34
       +
             };

     

       35
       35
       +
       

     

       36
       36
       +
             theme = {

     

       37
       37
       +
               package = mkOption {

     

       38
       38
       +
                 type = types.package;

     

       39
       39
       +
                 default = pkgs.gnome.gnome-themes-extra;

     

       40
       40
       +
                 defaultText = literalExpression "pkgs.gnome.gnome-themes-extra";

     

       41
       41
       +
                 description = lib.mdDoc ''

     

       42
       42
       +
                   The package path that contains the theme given in the name option.

     

       43
       43
       +
                 '';

     

       44
       44
       +
               };

     

       45
       45
       +
       

     

       46
       46
       +
               name = mkOption {

     

       47
       47
       +
                 type = types.str;

     

       48
       48
       +
                 default = "Adwaita";

     

       49
       49
       +
                 description = lib.mdDoc ''

     

       50
       50
       +
                   Name of the theme to use for the lightdm-slick-greeter.

     

       51
       51
       +
                 '';

     

       52
       52
       +
               };

     

       53
       53
       +
             };

     

       54
       54
       +
       

     

       55
       55
       +
             iconTheme = {

     

       56
       56
       +
               package = mkOption {

     

       57
       57
       +
                 type = types.package;

     

       58
       58
       +
                 default = pkgs.gnome.adwaita-icon-theme;

     

       59
       59
       +
                 defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme";

     

       60
       60
       +
                 description = lib.mdDoc ''

     

       61
       61
       +
                   The package path that contains the icon theme given in the name option.

     

       62
       62
       +
                 '';

     

       63
       63
       +
               };

     

       64
       64
       +
       

     

       65
       65
       +
               name = mkOption {

     

       66
       66
       +
                 type = types.str;

     

       67
       67
       +
                 default = "Adwaita";

     

       68
       68
       +
                 description = lib.mdDoc ''

     

       69
       69
       +
                   Name of the icon theme to use for the lightdm-slick-greeter.

     

       70
       70
       +
                 '';

     

       71
       71
       +
               };

     

       72
       72
       +
             };

     

       73
       73
       +
       

     

       74
       74
       +
             font = {

     

       75
       75
       +
               package = mkOption {

     

       76
       76
       +
                 type = types.package;

     

       77
       77
       +
                 default = pkgs.ubuntu_font_family;

     

       78
       78
       +
                 defaultText = literalExpression "pkgs.ubuntu_font_family";

     

       79
       79
       +
                 description = lib.mdDoc ''

     

       80
       80
       +
                   The package path that contains the font given in the name option.

     

       81
       81
       +
                 '';

     

       82
       82
       +
               };

     

       83
       83
       +
       

     

       84
       84
       +
               name = mkOption {

     

       85
       85
       +
                 type = types.str;

     

       86
       86
       +
                 default = "Ubuntu 11";

     

       87
       87
       +
                 description = lib.mdDoc ''

     

       88
       88
       +
                   Name of the font to use.

     

       89
       89
       +
                 '';

     

       90
       90
       +
               };

     

       91
       91
       +
             };

     

       92
       92
       +
       

     

       93
       93
       +
             draw-user-backgrounds = mkEnableOption "draw user backgrounds";

     

       94
       94
       +
       

     

       95
       95
       +
             extraConfig = mkOption {

     

       96
       96
       +
               type = types.lines;

     

       97
       97
       +
               default = "";

     

       98
       98
       +
               description = lib.mdDoc ''

     

       99
       99
       +
                 Extra configuration that should be put in the lightdm-slick-greeter.conf

     

       100
       100
       +
                 configuration file.

     

       101
       101
       +
               '';

     

       102
       102
       +
             };

     

       103
       103
       +
           };

     

       104
       104
       +
         };

     

       105
       105
       +
       

     

       106
       106
       +
         config = mkIf (ldmcfg.enable && cfg.enable) {

     

       107
       107
       +
           services.xserver.displayManager.lightdm = {

     

       108
       108
       +
             greeters.gtk.enable = false;

     

       109
       109
       +
             greeter = mkDefault {

     

       110
       110
       +
               package = pkgs.lightdm-slick-greeter.xgreeters;

     

       111
       111
       +
               name = "lightdm-slick-greeter";

     

       112
       112
       +
             };

     

       113
       113
       +
           };

     

       114
       114
       +
       

     

       115
       115
       +
           environment.systemPackages = [

     

       116
       116
       +
             icons

     

       117
       117
       +
             theme

     

       118
       118
       +
           ];

     

       119
       119
       +
       

     

       120
       120
       +
           fonts.fonts = [ font ];

     

       121
       121
       +
       

     

       122
       122
       +
           environment.etc."lightdm/slick-greeter.conf".source = slickGreeterConf;

     

       123
       123
       +
         };

     

       124
       124
       +
       }

nixos/modules/services/x11/display-managers/lightdm.nix

···

       82
       82
        
           ./lightdm-greeters/enso-os.nix

     

       83
       83
        
           ./lightdm-greeters/pantheon.nix

     

       84
       84
        
           ./lightdm-greeters/tiny.nix

     

       85
       85
       +
           ./lightdm-greeters/slick.nix

     

       85
       86
        
           (mkRenamedOptionModule [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "enable" ] [

     

       86
       87
        
             "services"

     

       87
       88
        
             "xserver"

+110

pkgs/applications/display-managers/lightdm-slick-greeter/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pkg-config

     

       5
       5
       +
       , python3

     

       6
       6
       +
       , vala

     

       7
       7
       +
       , intltool

     

       8
       8
       +
       , autoreconfHook

     

       9
       9
       +
       , wrapGAppsHook

     

       10
       10
       +
       , lightdm

     

       11
       11
       +
       , gtk3

     

       12
       12
       +
       , pixman

     

       13
       13
       +
       , libcanberra

     

       14
       14
       +
       , libX11

     

       15
       15
       +
       , libXext

     

       16
       16
       +
       , linkFarm

     

       17
       17
       +
       , lightdm-slick-greeter

     

       18
       18
       +
       , numlockx

     

       19
       19
       +
       }:

     

       20
       20
       +
       

     

       21
       21
       +
       stdenv.mkDerivation rec {

     

       22
       22
       +
         pname = "lightdm-slick-greeter";

     

       23
       23
       +
         version = "1.5.9";

     

       24
       24
       +
       

     

       25
       25
       +
         src = fetchFromGitHub {

     

       26
       26
       +
           owner = "linuxmint";

     

       27
       27
       +
           repo = "slick-greeter";

     

       28
       28
       +
           rev = version;

     

       29
       29
       +
           sha256 = "sha256-UEzidH4ZWggcOWHHuAclHbbgATDBdogL99Ze0PlwRoc=";

     

       30
       30
       +
         };

     

       31
       31
       +
       

     

       32
       32
       +
         nativeBuildInputs = [

     

       33
       33
       +
           pkg-config

     

       34
       34
       +
           vala

     

       35
       35
       +
           intltool

     

       36
       36
       +
           autoreconfHook

     

       37
       37
       +
           wrapGAppsHook

     

       38
       38
       +
           python3

     

       39
       39
       +
           python3.pkgs.wrapPython

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         buildInputs = [

     

       43
       43
       +
           lightdm

     

       44
       44
       +
           gtk3

     

       45
       45
       +
           pixman

     

       46
       46
       +
           libcanberra

     

       47
       47
       +
           libX11

     

       48
       48
       +
           libXext

     

       49
       49
       +
         ];

     

       50
       50
       +
       

     

       51
       51
       +
         pythonPath = [

     

       52
       52
       +
           python3.pkgs.pygobject3 # for slick-greeter-check-hidpi

     

       53
       53
       +
         ];

     

       54
       54
       +
       

     

       55
       55
       +
         postPatch = ''

     

       56
       56
       +
           substituteInPlace src/slick-greeter.vala \

     

       57
       57
       +
             --replace "/usr/bin/numlockx" "${numlockx}/bin/numlockx" \

     

       58
       58
       +
             --replace "/usr/share/xsessions/" "/run/current-system/sw/share/xsessions/" \

     

       59
       59
       +
             --replace "/usr/bin/slick-greeter" "${placeholder "out"}/bin/slick-greeter"

     

       60
       60
       +
       

     

       61
       61
       +
           substituteInPlace src/session-list.vala \

     

       62
       62
       +
             --replace "/usr/share" "${placeholder "out"}/share"

     

       63
       63
       +
       

     

       64
       64
       +
           patchShebangs files/usr/bin/*

     

       65
       65
       +
         '';

     

       66
       66
       +
       

     

       67
       67
       +
         preAutoreconf = ''

     

       68
       68
       +
           # intltoolize fails during autoreconfPhase unless this

     

       69
       69
       +
           # directory is created manually.

     

       70
       70
       +
           mkdir m4

     

       71
       71
       +
         '';

     

       72
       72
       +
       

     

       73
       73
       +
         configureFlags = [

     

       74
       74
       +
           "--localstatedir=/var"

     

       75
       75
       +
           "--sysconfdir=/etc"

     

       76
       76
       +
           "--sbindir=${placeholder "out"}/bin"

     

       77
       77
       +
         ];

     

       78
       78
       +
       

     

       79
       79
       +
         installFlags = [

     

       80
       80
       +
           "localstatedir=\${TMPDIR}"

     

       81
       81
       +
           "sysconfdir=${placeholder "out"}/etc"

     

       82
       82
       +
         ];

     

       83
       83
       +
       

     

       84
       84
       +
         postInstall = ''

     

       85
       85
       +
           substituteInPlace "$out/share/xgreeters/slick-greeter.desktop" \

     

       86
       86
       +
             --replace "Exec=slick-greeter" "Exec=$out/bin/slick-greeter"

     

       87
       87
       +
       

     

       88
       88
       +
           cp -r files/usr/* $out

     

       89
       89
       +
         '';

     

       90
       90
       +
       

     

       91
       91
       +
         preFixup = ''

     

       92
       92
       +
           buildPythonPath "$out $pythonPath"

     

       93
       93
       +
           gappsWrapperArgs+=(

     

       94
       94
       +
             --prefix PYTHONPATH : "$program_PYTHONPATH"

     

       95
       95
       +
           )

     

       96
       96
       +
         '';

     

       97
       97
       +
       

     

       98
       98
       +
         passthru.xgreeters = linkFarm "lightdm-slick-greeter-xgreeters" [{

     

       99
       99
       +
           path = "${lightdm-slick-greeter}/share/xgreeters/slick-greeter.desktop";

     

       100
       100
       +
           name = "lightdm-slick-greeter.desktop";

     

       101
       101
       +
         }];

     

       102
       102
       +
       

     

       103
       103
       +
         meta = with lib; {

     

       104
       104
       +
           description = "A slick-looking LightDM greeter";

     

       105
       105
       +
           homepage = "https://github.com/linuxmint/slick-greeter";

     

       106
       106
       +
           license = licenses.gpl3Only;

     

       107
       107
       +
           maintainers = with maintainers; [ water-sucks ];

     

       108
       108
       +
           platforms = platforms.linux;

     

       109
       109
       +
         };

     

       110
       110
       +
       }

-1

pkgs/desktops/cinnamon/mint-artwork/default.nix

···

       28
       28
        
             -e s,DMZ-White,Vanilla-DMZ,g \

     

       29
       29
        
             -e s,DMZ-Black,Vanilla-DMZ-AA,g \

     

       30
       30
        
             -e s,linuxmint-logo-5,cinnamon-symbolic,g \

     

       31
       31
       -
             -e s,^theme-name=Mint-X$,theme-name=Mint-X-Dark,g \

     

       32
       31
        
             {} +

     

       33
       32
        
       

     

       34
       33
        
           # fixup broken symlink

pkgs/top-level/all-packages.nix

···

       30619
       30619
        
           inherit (xfce) xfce4-dev-tools;

     

       30620
       30620
        
         };

     

       30621
       30621
        
       

     

       30622
       30622
       +
         lightdm-slick-greeter = callPackage ../applications/display-managers/lightdm-slick-greeter { };

     

       30623
       30623
       +
       

     

       30622
       30624
        
         lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { };

     

       30623
       30625
        
       

     

       30624
       30626
        
         lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter {