pyrox.dev
Merge pull request #295891 from Stzx/pinentry-conflict
pinentry: fix DM option and user conflict
+1
-1
nixos/modules/services/desktop-managers/plasma6.nix
+1
-1
nixos/modules/services/desktop-managers/plasma6.nix
···
215
215
serif = ["Noto Serif"];
216
216
};
217
217
218
-
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
218
+
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
219
219
programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass";
220
220
221
221
# Enable helpful DBus services.
+1
-1
nixos/modules/services/x11/desktop-managers/deepin.nix
+1
-1
nixos/modules/services/x11/desktop-managers/deepin.nix
···
66
66
services.upower.enable = mkDefault config.powerManagement.enable;
67
67
networking.networkmanager.enable = mkDefault true;
68
68
programs.dconf.enable = mkDefault true;
69
-
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
69
+
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
70
70
71
71
fonts.packages = with pkgs; [ noto-fonts ];
72
72
xdg.mime.enable = true;
+1
-1
nixos/modules/services/x11/desktop-managers/lxqt.nix
+1
-1
nixos/modules/services/x11/desktop-managers/lxqt.nix
···
62
62
# Link some extra directories in /run/current-system/software/share
63
63
environment.pathsToLink = [ "/share" ];
64
64
65
-
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
65
+
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
66
66
67
67
# virtual file systems support for PCManFM-QT
68
68
services.gvfs.enable = true;
+1
-1
nixos/modules/services/x11/desktop-managers/plasma5.nix
+1
-1
nixos/modules/services/x11/desktop-managers/plasma5.nix
···
336
336
serif = [ "Noto Serif" ];
337
337
};
338
338
339
-
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;
339
+
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt;
340
340
programs.ssh.askPassword = mkDefault "${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass";
341
341
342
342
# Enable helpful DBus services.
+1
-1
nixos/modules/services/x11/desktop-managers/xfce.nix
+1
-1
nixos/modules/services/x11/desktop-managers/xfce.nix
···
131
131
xfdesktop
132
132
] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;
133
133
134
-
programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2;
134
+
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
135
135
programs.xfconf.enable = true;
136
136
programs.thunar.enable = true;
137
137