update flake inputs, and install all gpg pinentry

This commit is contained in:
ulic-youthlic 2025-01-11 12:02:47 +08:00
parent 4f386934fe
commit 028c15e040
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
2 changed files with 52 additions and 68 deletions

112
flake.lock generated
View file

@ -38,11 +38,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1736222615, "lastModified": 1736510876,
"narHash": "sha256-fyc7nHAOQ5SWEeYEFyv/DO2/h1np0E9ZB3FR4JgTm+o=", "narHash": "sha256-gQtPuV+VH1ZZUAZrwxo6WNMdZao+5zIlMLUBBD+UatE=",
"ref": "master", "ref": "master",
"rev": "6a50ba16d8c33e0ceb2682f4d0481eaf43cddd9a", "rev": "da021d3646bf8fc6c7a74ad6edbab6fd7e59b828",
"revCount": 4023, "revCount": 4034,
"type": "git", "type": "git",
"url": "https://gitlab.com/rycee/nur-expressions.git?dir=pkgs/firefox-addons" "url": "https://gitlab.com/rycee/nur-expressions.git?dir=pkgs/firefox-addons"
}, },
@ -251,11 +251,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1736210320, "lastModified": 1736559084,
"narHash": "sha256-QnDkQ/s1OWmPj1f+7MFNxQiAPJdHbI1Aft7yM5I+8gQ=", "narHash": "sha256-DN4SHSc3ZvWBGlmM4760s7NWP6Sm9j72QWGdZmeMk94=",
"owner": "ghostty-org", "owner": "ghostty-org",
"repo": "ghostty", "repo": "ghostty",
"rev": "a3837a1e4ee06a183f32d4a622c2cdcd51f73fb8", "rev": "5a4aac7e091bbccb1396e5d4b4858318a8ff323c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -274,11 +274,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1736361400, "lastModified": 1736521384,
"narHash": "sha256-QR87WqLvYAUy288N0rvQCwLLw5f7JbB/kDk8PzEFgN0=", "narHash": "sha256-9chSfi9SRfrq757BGmzgm7DgPD3T3CPHNV3QG2otkdg=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "a83c23bb037a2db26f3e2fe519de22425e95a7d8", "rev": "9721144e03a6c4e221c86408d34ce929972a36a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,11 +295,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736421950, "lastModified": 1736508663,
"narHash": "sha256-RyrX0WFXxFrYvzHNLTIyuk3NcNl3UBykuYru/P0zW5E=", "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d4aebb947a301b8da8654a804979a738c5c5da50", "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -340,11 +340,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1736494763, "lastModified": 1736520719,
"narHash": "sha256-5Aeh8Hhe0APuCy1T3X/qJ/sNtku+VvX4Xzri4IOTu7k=", "narHash": "sha256-3hL4U5aqfelsX2QoDa0JVavRzuTKJE2M1I3tXZXsAVQ=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "faaa44390c8a4dd1c33c81aafb5925a9cfccec3b", "rev": "dfba1ea03856f26db6936c9999951719de56e367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +373,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736489491, "lastModified": 1736518221,
"narHash": "sha256-mflNlJT+exrr/ealJUtvTY580vG2xS6L7m+D/bvzwlY=", "narHash": "sha256-c+3Qa0ft19mOUAs7fXZRxNECFHEJgXCa5edgljcuVMc=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "7dee2f6995533d08c3ea1818dd8e1a114872a22e", "rev": "279c8b6aa29e8e5692aa6f56f0721a11134ca42b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -486,15 +486,14 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-stable": "nixpkgs-stable_3"
"rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1736214624, "lastModified": 1736513564,
"narHash": "sha256-Pi70vbASZ1O9cR8RO5d2hBiNjIJBKKLoABl4sxWyOgg=", "narHash": "sha256-eAKwqMdGWambTbuZvAp3YYhAoWjaIFWGvxDAxxyh/Tg=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "0830abeebf3b2d1bae44652ffb2c89cf0d56ddaa", "rev": "0855bf33427209e4f5e3d2d0968a14784525e929",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -505,11 +504,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1736237814, "lastModified": 1736441705,
"narHash": "sha256-uTdscVaKjnRnBIMuu/oWwdiGhYd/JOQ4YZGHeCoroqs=", "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ca30f8501ab452ca687a7fdcb2d43e1fb1732317", "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -633,11 +632,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1736061677, "lastModified": 1736200483,
"narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -713,11 +712,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1736344531,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -729,11 +728,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1736344531,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +761,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"dir": "/pkgs/uncategorized", "dir": "/pkgs/uncategorized",
"lastModified": 1736240807, "lastModified": 1736320698,
"narHash": "sha256-BT517AKtTJX6VVun6sS7hdWAUAnYfONYkW/6Y7YjZLo=", "narHash": "sha256-YQnHnEA0NtxztpovL8qrG/xQ/+Ym+o3ryq+63tjFPWg=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nur-packages", "repo": "nur-packages",
"rev": "31d037a5792423669a9345f7e3c32c850f81a878", "rev": "6d6d8ee9eac8fc993d5925088b9129d9284ca74b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -790,15 +789,15 @@
"nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-darwin": "nixpkgs-darwin",
"nixpkgs-unstable": "nixpkgs-unstable_2", "nixpkgs-unstable": "nixpkgs-unstable_2",
"nur": "nur", "nur": "nur",
"rust-overlay": "rust-overlay_3", "rust-overlay": "rust-overlay_2",
"winapps": "winapps" "winapps": "winapps"
}, },
"locked": { "locked": {
"lastModified": 1736243414, "lastModified": 1736534254,
"narHash": "sha256-BrUkHxJnAY9YyPfzKvThu1tYFreHHQHjP6rCiNwKb4c=", "narHash": "sha256-l+vqwraGjPfvRd5bEOsF9x/y5zy0ITmpZH63z94aQiU=",
"owner": "oskardotglobal", "owner": "oskardotglobal",
"repo": ".dotfiles", "repo": ".dotfiles",
"rev": "80fe187d7437a52e485170aef463de5bde702818", "rev": "7dc008853645606d0e2f9607c0ea62b5ee2d3ac0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -848,27 +847,6 @@
} }
}, },
"rust-overlay_2": { "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": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"oskars-dotfiles", "oskars-dotfiles",
@ -896,11 +874,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736203741, "lastModified": 1736515725,
"narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,4 +1,9 @@
{ config, lib, ... }: {
pkgs,
config,
lib,
...
}:
{ {
options = { options = {
youthlic.programs.gpg = { youthlic.programs.gpg = {
@ -20,6 +25,7 @@
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
enableSshSupport = true; enableSshSupport = true;
pinentryPackage = pkgs.pinentry-all;
}; };
programs.gpg = { programs.gpg = {
enable = true; enable = true;