summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2024-11-11 10:26:39 -0500
committerBen Sima <ben@bsima.me>2024-11-11 10:26:39 -0500
commite10e53f079f05ad9f7513df650385555c69b4ba2 (patch)
tree0368ec6e324abddd55a07d53a742b1da3b652bb8 /lib
parent49aa045393edbd273420b4d1ba4c490effd59496 (diff)
updates for nixos-24HEADmaster
Diffstat (limited to 'lib')
-rw-r--r--lib/common.nix1
-rw-r--r--lib/linux.nix4
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/common.nix b/lib/common.nix
index 1c61c59..7177359 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -268,7 +268,6 @@ in {
programs.jujutsu = {
enable = true;
- enableBashIntegration = true;
};
programs.tmux = {
diff --git a/lib/linux.nix b/lib/linux.nix
index aedb46f..a86929e 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -85,7 +85,7 @@ in
xsel
#xterm
yank
- youtube-dl
+ yt-dlp
zathura
];
};
@@ -186,7 +186,7 @@ in
enableScDaemon = true; # smart card support
enableSshSupport = true;
maxCacheTtl = 86400; # 24 hours
- pinentryFlavor = "curses";
+ #pinentryPackage = pkgs.pinentry-all;
verbose = true;
extraConfig = ''
allow-emacs-pinentry