commit 68211b354677d26e0e90b0a0cf7b62bd863c3a54 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

Revert "nixos/gnome-keyring: unlock keyring with gdm-password, gdm-autologin"

`gdm-autologin` and `gdm-password` PAM modules are defined using the `text` option, so the option here is a no-op.

Furthermore, `gdm-password` already includes `login` for all module types,
and that invokes `pam_gnome_keyring.so` in the same way Arch’s `gdm-password` module would:
https://gitlab.gnome.org/GNOME/gdm/-/blob/81ee658c11381912131dd4a29e84190f7f9cd039/data/pam-arch/gdm-password.pam

This reverts commit c24c7933ba2e5266d91978f1eaefdd81c760af67.

Jan Tojnar 1 year ago 68211b35 0e83d673

options

unified split

Changed files

+1 -9

nixos

modules

services

desktops

gnome

gnome-keyring.nix

+1 -9

nixos/modules/services/desktops/gnome/gnome-keyring.nix

···

       35
       35
        
       

     

       36
       36
        
           xdg.portal.extraPortals = [ pkgs.gnome-keyring ];

     

       37
       37
        
       

     

       38
       38
       -
           security.pam.services = lib.mkMerge [

     

       39
       39
       -
             {

     

       40
       40
       -
               login.enableGnomeKeyring = true;

     

       41
       41
       -
             }

     

       42
       42
       -
             (lib.mkIf config.services.xserver.displayManager.gdm.enable {

     

       43
       43
       -
               gdm-password.enableGnomeKeyring = true;

     

       44
       44
       -
               gdm-autologin.enableGnomeKeyring = true;

     

       45
       45
       -
             })

     

       46
       46
       -
           ];

     

       38
       38
       +
           security.pam.services.login.enableGnomeKeyring = true;

     

       47
       39
        
       

     

       48
       40
        
           security.wrappers.gnome-keyring-daemon = {

     

       49
       41
        
             owner = "root";