about summary refs log tree commit diff
path: root/users/aspen
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@tvl.su>2024-03-17T10·45+0300
committerclbot <clbot@tvl.fyi>2024-03-18T16·28+0000
commit3633d846f88d8306dabd5e820d0f3cd999404050 (patch)
treedc66d7f3d88ed07b9229fed5e5d0241d6beb5026 /users/aspen
parent3dd708690f88d48085a00f085125a3371a5fa01b (diff)
chore(3p/sources): bump channels & overlays (2024-03-17) r/7734
In hope that iwlwifi works again on this commit, and I don't actually
have to debug it.

Includes following changes:

* users/aspen: home-manager is shuffling around pinentry options again
* users/flokli: rebase ipu6-softisp patches to Linux 6.8
                make cl/11097 a separate patch
* ops/modules: remove unused (and now broken) v4l2loopback module

Co-Authored-By: Florian Klink <flokli@flokli.de>
Change-Id: I763f1f075778f2ed8db7803f87248c9dabde4213
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11174
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: aspen <root@gws.fyi>
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Diffstat (limited to 'users/aspen')
-rw-r--r--users/aspen/system/home/platforms/linux.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/users/aspen/system/home/platforms/linux.nix b/users/aspen/system/home/platforms/linux.nix
index 6ad0d13d248e..1bcfa08e0dae 100644
--- a/users/aspen/system/home/platforms/linux.nix
+++ b/users/aspen/system/home/platforms/linux.nix
@@ -72,8 +72,7 @@ in
 
   services.gpg-agent = {
     enable = true;
-    # previous default has been removed from nixpkgs
-    pinentryFlavor = "qt";
+    pinentryPackage = pkgs.pinentry-qt;
   };
 
   services.lorri.enable = true;