steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fix(*): adapt to nixos-24.05 changes

Browse source
This commit is contained in:
steveej 2024-06-01 21:46:09 +02:00
parent ae86a8b860
commit 4c18f0a7ab
12 changed files with 56 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/home-manager/profiles/gnome-desktop.nix
View file

@ -23,7 +23,7 @@ in {
# Hidden=true
# '';
services.gpg-agent.pinentryFlavor = "gnome3";
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
dconf.settings = let
manualKeybindings = [

2
nix/home-manager/profiles/sway-desktop.nix
View file

@ -36,7 +36,7 @@ in {
enable = true;
};
services.gpg-agent.pinentryFlavor = "gnome3";
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
home.packages = [
pkgs.swayidle

16
nix/home-manager/programs/gpg-agent.nix
View file

@ -4,17 +4,9 @@
config,
...
}: {
home.packages =
[
pkgs.gcr
]
++ (
if config.services.gpg-agent.pinentryFlavor == "gtk2"
then [pkgs.pinentry-gtk2]
else if config.services.gpg-agent.pinentryFlavor == "gnome3"
then [pkgs.pinentry-gnome]
else []
);
home.packages = [
pkgs.gcr
];
programs.gpg.enable = true;
services.gpg-agent = {
@ -22,7 +14,7 @@
enableScDaemon = true;
enableSshSupport = true;
grabKeyboardAndMouse = true;
pinentryFlavor = lib.mkDefault "gtk2";
pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2;
extraConfig = ''
no-allow-external-cache
'';