From 028c15e04032dc3747793083d8417e3e2ed6d201 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 11 Jan 2025 12:02:47 +0800 Subject: [PATCH] update flake inputs, and install all gpg pinentry --- flake.lock | 112 ++++++++++++++--------------------- home/modules/gpg/default.nix | 8 ++- 2 files changed, 52 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index b0f6095..fda5c70 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "flake": false, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1736222615, - "narHash": "sha256-fyc7nHAOQ5SWEeYEFyv/DO2/h1np0E9ZB3FR4JgTm+o=", + "lastModified": 1736510876, + "narHash": "sha256-gQtPuV+VH1ZZUAZrwxo6WNMdZao+5zIlMLUBBD+UatE=", "ref": "master", - "rev": "6a50ba16d8c33e0ceb2682f4d0481eaf43cddd9a", - "revCount": 4023, + "rev": "da021d3646bf8fc6c7a74ad6edbab6fd7e59b828", + "revCount": 4034, "type": "git", "url": "https://gitlab.com/rycee/nur-expressions.git?dir=pkgs/firefox-addons" }, @@ -251,11 +251,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736210320, - "narHash": "sha256-QnDkQ/s1OWmPj1f+7MFNxQiAPJdHbI1Aft7yM5I+8gQ=", + "lastModified": 1736559084, + "narHash": "sha256-DN4SHSc3ZvWBGlmM4760s7NWP6Sm9j72QWGdZmeMk94=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "a3837a1e4ee06a183f32d4a622c2cdcd51f73fb8", + "rev": "5a4aac7e091bbccb1396e5d4b4858318a8ff323c", "type": "github" }, "original": { @@ -274,11 +274,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1736361400, - "narHash": "sha256-QR87WqLvYAUy288N0rvQCwLLw5f7JbB/kDk8PzEFgN0=", + "lastModified": 1736521384, + "narHash": "sha256-9chSfi9SRfrq757BGmzgm7DgPD3T3CPHNV3QG2otkdg=", "owner": "helix-editor", "repo": "helix", - "rev": "a83c23bb037a2db26f3e2fe519de22425e95a7d8", + "rev": "9721144e03a6c4e221c86408d34ce929972a36a5", "type": "github" }, "original": { @@ -295,11 +295,11 @@ ] }, "locked": { - "lastModified": 1736421950, - "narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "d4aebb947a301b8da8654a804979a738c5c5da50", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { @@ -340,11 +340,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1736494763, - "narHash": "sha256-5Aeh8Hhe0APuCy1T3X/qJ/sNtku+VvX4Xzri4IOTu7k=", + "lastModified": 1736520719, + "narHash": "sha256-3hL4U5aqfelsX2QoDa0JVavRzuTKJE2M1I3tXZXsAVQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "faaa44390c8a4dd1c33c81aafb5925a9cfccec3b", + "rev": "dfba1ea03856f26db6936c9999951719de56e367", "type": "github" }, "original": { @@ -373,11 +373,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1736489491, - "narHash": "sha256-mflNlJT+exrr/ealJUtvTY580vG2xS6L7m+D/bvzwlY=", + "lastModified": 1736518221, + "narHash": "sha256-c+3Qa0ft19mOUAs7fXZRxNECFHEJgXCa5edgljcuVMc=", "owner": "YaLTeR", "repo": "niri", - "rev": "7dee2f6995533d08c3ea1818dd8e1a114872a22e", + "rev": "279c8b6aa29e8e5692aa6f56f0721a11134ca42b", "type": "github" }, "original": { @@ -486,15 +486,14 @@ "inputs": { "flake-compat": "flake-compat_2", "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable_3", - "rust-overlay": "rust-overlay_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1736214624, - "narHash": "sha256-Pi70vbASZ1O9cR8RO5d2hBiNjIJBKKLoABl4sxWyOgg=", + "lastModified": 1736513564, + "narHash": "sha256-eAKwqMdGWambTbuZvAp3YYhAoWjaIFWGvxDAxxyh/Tg=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "0830abeebf3b2d1bae44652ffb2c89cf0d56ddaa", + "rev": "0855bf33427209e4f5e3d2d0968a14784525e929", "type": "github" }, "original": { @@ -505,11 +504,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736237814, - "narHash": "sha256-uTdscVaKjnRnBIMuu/oWwdiGhYd/JOQ4YZGHeCoroqs=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ca30f8501ab452ca687a7fdcb2d43e1fb1732317", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -633,11 +632,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1736061677, - "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -713,11 +712,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -729,11 +728,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -762,11 +761,11 @@ "flake": false, "locked": { "dir": "/pkgs/uncategorized", - "lastModified": 1736240807, - "narHash": "sha256-BT517AKtTJX6VVun6sS7hdWAUAnYfONYkW/6Y7YjZLo=", + "lastModified": 1736320698, + "narHash": "sha256-YQnHnEA0NtxztpovL8qrG/xQ/+Ym+o3ryq+63tjFPWg=", "owner": "xddxdd", "repo": "nur-packages", - "rev": "31d037a5792423669a9345f7e3c32c850f81a878", + "rev": "6d6d8ee9eac8fc993d5925088b9129d9284ca74b", "type": "github" }, "original": { @@ -790,15 +789,15 @@ "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-unstable": "nixpkgs-unstable_2", "nur": "nur", - "rust-overlay": "rust-overlay_3", + "rust-overlay": "rust-overlay_2", "winapps": "winapps" }, "locked": { - "lastModified": 1736243414, - "narHash": "sha256-BrUkHxJnAY9YyPfzKvThu1tYFreHHQHjP6rCiNwKb4c=", + "lastModified": 1736534254, + "narHash": "sha256-l+vqwraGjPfvRd5bEOsF9x/y5zy0ITmpZH63z94aQiU=", "owner": "oskardotglobal", "repo": ".dotfiles", - "rev": "80fe187d7437a52e485170aef463de5bde702818", + "rev": "7dc008853645606d0e2f9607c0ea62b5ee2d3ac0", "type": "github" }, "original": { @@ -848,27 +847,6 @@ } }, "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736130662, - "narHash": "sha256-z+WGez9oTR2OsiUWE5ZhIpETqM1ogrv6Xcd24WFi6KQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "2f5d4d9cd31cc02c36e51cb2e21c4b25c4f78c52", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "oskars-dotfiles", @@ -896,11 +874,11 @@ ] }, "locked": { - "lastModified": 1736203741, - "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", + "lastModified": 1736515725, + "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", + "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", "type": "github" }, "original": { diff --git a/home/modules/gpg/default.nix b/home/modules/gpg/default.nix index 25a0989..39391eb 100644 --- a/home/modules/gpg/default.nix +++ b/home/modules/gpg/default.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + pkgs, + config, + lib, + ... +}: { options = { youthlic.programs.gpg = { @@ -20,6 +25,7 @@ services.gpg-agent = { enable = true; enableSshSupport = true; + pinentryPackage = pkgs.pinentry-all; }; programs.gpg = { enable = true;