summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock56
-rw-r--r--flake.nix2
-rw-r--r--modules/yubikey.nix1
3 files changed, 30 insertions, 29 deletions
diff --git a/flake.lock b/flake.lock
index 6d49f2e..9baf71c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1712079060,
- "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=",
+ "lastModified": 1716561646,
+ "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "1381a759b205dff7a6818733118d02253340fd5e",
+ "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
"type": "github"
},
"original": {
@@ -74,11 +74,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1713978400,
- "narHash": "sha256-Q/sRS7bKVuaqJWtVwQl3DcjNdW8KikSYx/khPvbgFbc=",
+ "lastModified": 1717923950,
+ "narHash": "sha256-k7WYdsUm4oeFlAC2JLKXDIxp1pS7/mrUyN7ztEF5DGM=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "2426b41b8b6be7ccac87159476b109c81894d0bf",
+ "rev": "a5143ff8b6be9201f6b7aabe209a4c2a4a832ae3",
"type": "github"
},
"original": {
@@ -181,11 +181,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1713946567,
- "narHash": "sha256-gbffQxWoGmq9rmSwM2y4a+VGaTTuXSN+yyRoCkMuRjs=",
+ "lastModified": 1717685136,
+ "narHash": "sha256-S+C/DX5HOhlhJAmcGxbB+Tv6oqZOkr3z/WzPuydXI14=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "c3255d642c945847c61a867be15de63b8f81d5dc",
+ "rev": "fd13986ede9b94c50e84aecb2c88863e297bbb52",
"type": "github"
},
"original": {
@@ -242,11 +242,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1713864415,
- "narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=",
+ "lastModified": 1717828156,
+ "narHash": "sha256-YvstO0lobf3JWQuAfZCLYRTROC2ZDEgtWeQtWbO49p4=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc",
+ "rev": "057a7996d012f342a38a26261ee529cebb1755ef",
"type": "github"
},
"original": {
@@ -258,11 +258,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1713714899,
- "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
+ "lastModified": 1717786204,
+ "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
+ "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"type": "github"
},
"original": {
@@ -274,11 +274,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1713828541,
- "narHash": "sha256-KtvQeE12MSkCOhvVmnmcZCjnx7t31zWin2XVSDOwBDE=",
+ "lastModified": 1717530100,
+ "narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b500489fd3cf653eafc075f9362423ad5cdd8676",
+ "rev": "a2e1d0414259a144ebdc048408a807e69e0565af",
"type": "github"
},
"original": {
@@ -290,11 +290,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1713895582,
- "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
+ "lastModified": 1717786204,
+ "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "572af610f6151fd41c212f897c71f7056e3fb518",
+ "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"type": "github"
},
"original": {
@@ -306,11 +306,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1713248628,
- "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
+ "lastModified": 1716330097,
+ "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
+ "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github"
},
"original": {
@@ -338,16 +338,16 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1713828541,
- "narHash": "sha256-KtvQeE12MSkCOhvVmnmcZCjnx7t31zWin2XVSDOwBDE=",
+ "lastModified": 1717696253,
+ "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b500489fd3cf653eafc075f9362423ad5cdd8676",
+ "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-23.11",
+ "ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index 9103c13..7929373 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
extra-trusted-public-keys = "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";
};
- inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+ inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
inputs.emacs-overlay.url = "github:nix-community/emacs-overlay";
diff --git a/modules/yubikey.nix b/modules/yubikey.nix
index b171408..bae980d 100644
--- a/modules/yubikey.nix
+++ b/modules/yubikey.nix
@@ -30,6 +30,7 @@ in
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
+ pinentryPackage = pkgs.pinentry-qt;
};
# Use GPG agent instead.
programs.ssh.startAgent = lib.mkDefault false;