Compare commits

..

No commits in common. "007d0203bcec7e5bb7310021d28a3fd10fe2eb3e" and "7eaf129278e5254e2ed7401e493ca60179cb7afa" have entirely different histories.

3 changed files with 4 additions and 5 deletions

View File

@ -62,11 +62,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1696323343, "lastModified": 1686912178,
"narHash": "sha256-u7WLUrh5eb+6SBYwtkaGL2ryHpLcHzmLml+a+VqKJWE=", "narHash": "sha256-4W6M4ZIJwwvr6nqtmqYPLHSb+gnryVuDoDEqu7Ecy/M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3b79cc4bcd9c09b5aa68ea1957c25e437dc6bc58", "rev": "2decc88392ad88868aba2be221491facd3da6d1f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -2,7 +2,6 @@
home.packages = with pkgs; [ git-open tea ]; home.packages = with pkgs; [ git-open tea ];
programs.git = { programs.git = {
enable = true; enable = true;
lfs.enable = true;
userName = "Sam Willcocks"; userName = "Sam Willcocks";
userEmail = "sam@wlcx.cc"; userEmail = "sam@wlcx.cc";

View File

@ -24,7 +24,7 @@
# Shouldn't have an effect on macos, on linux we need to specify a pinentry # Shouldn't have an effect on macos, on linux we need to specify a pinentry
services.gpg-agent = { services.gpg-agent = {
enable = !pkgs.stdenv.isDarwin; enable = true;
enableSshSupport = true; enableSshSupport = true;
pinentryFlavor = "qt"; # for plasma pinentryFlavor = "qt"; # for plasma
}; };