Unverified Commit 62748bdf authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #295891 from Stzx/pinentry-conflict 

pinentry: fix DM option and user conflict
parents 8a47d06c 8bf5cc26

nixos/modules/services/desktop-managers/plasma6.nix

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ in { 
      serif = ["Noto Serif"];

    };



    programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;

    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;

    programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass";



    # Enable helpful DBus services.

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ in 
      services.upower.enable = mkDefault config.powerManagement.enable;

      networking.networkmanager.enable = mkDefault true;

      programs.dconf.enable = mkDefault true;

      programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;

      programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;



      fonts.packages = with pkgs; [ noto-fonts ];

      xdg.mime.enable = true;

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ in 
    # Link some extra directories in /run/current-system/software/share

    environment.pathsToLink = [ "/share" ];



    programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;

    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;



    # virtual file systems support for PCManFM-QT

    services.gvfs.enable = true;

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

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ in 
        serif = [ "Noto Serif" ];

      };



      programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;

      programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;

      programs.ssh.askPassword = mkDefault "${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass";



      # Enable helpful DBus services.

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

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ in 
        xfdesktop

      ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;



    programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2;

    programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;

    programs.xfconf.enable = true;

    programs.thunar.enable = true;