summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2019-05-21 21:29:30 -0400
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2019-05-21 21:29:37 -0400
commit0e26d90cac07549fea9e0dd08f331b1b50d49f82 (patch)
tree384d100629ea29907ff50593896ac1d50e100757
parent4bc68849096bf8e04d99dea7a528c4a062e1b2a6 (diff)
fix yubikey
-rw-r--r--config/desktop.nix6
-rw-r--r--config/yubikey.nix6
2 files changed, 10 insertions, 2 deletions
diff --git a/config/desktop.nix b/config/desktop.nix
index 1f509a7..28115ca 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -3,7 +3,10 @@
imports = [ ./common.nix ./users.nix ];
hardware = {
- opengl.driSupport32Bit = true;
+ opengl = {
+ enable = true;
+ driSupport32Bit = true;
+ };
bluetooth.enable = true;
pulseaudio = {
@@ -50,6 +53,7 @@
xscreensaver
xsel # used by urxvt clipboard
xss-lock
+ wine
];
services = {
diff --git a/config/yubikey.nix b/config/yubikey.nix
index b7afd66..20ed513 100644
--- a/config/yubikey.nix
+++ b/config/yubikey.nix
@@ -9,11 +9,15 @@ let
yubikey-personalization
gnupg
pinentry
+ libu2f-host
];
in
{
services.pcscd.enable = true;
- services.udev.packages = yubikey-pkgs;
+ services.udev.packages = with pkgs; [
+ libu2f-host
+ yubikey-personalization
+ ];
programs.gnupg.agent = {
enable = true;