From aded33b30e09636e7db39ee414b7f8f231821489 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Wed, 12 Feb 2020 21:32:59 -0500
Subject: bunchafixes

---
 config/desktop.nix | 12 ++++++++----
 config/yubikey.nix | 16 ++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'config')

diff --git a/config/desktop.nix b/config/desktop.nix
index 92fb93d..3c0bc87 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -69,6 +69,10 @@
       layout = "us";
       xkbVariant = "dvorak";
 
+      desktopManager.mate = {
+        enable = true;
+      };
+
       windowManager.xmonad = {
         enable = true;
         enableContribAndExtras = true;
@@ -77,10 +81,10 @@
 
       displayManager.gdm = {
         enable = true;
-        autoLogin = {
-          enable = true;
-	  user = "orbekk";
-	};
+        # autoLogin = {
+        #   enable = true;
+	#   user = "orbekk";
+	# };
       };
 
       synaptics = {
diff --git a/config/yubikey.nix b/config/yubikey.nix
index 4565306..5ff9e79 100644
--- a/config/yubikey.nix
+++ b/config/yubikey.nix
@@ -9,15 +9,15 @@ let
     yubikey-personalization
     gnupg
     pinentry
-    libu2f-host
   ];
 in
 {
-  services.pcscd.enable = true;
+  services.pcscd.enable = lib.mkForce false;
   services.udev.packages = with pkgs; [
-    # libu2f-host
+    libu2f-host
     yubikey-personalization
   ];
+  systemd.services.pcscd.after = ["multi-user.target"];
 
   programs.gnupg.agent = {
     enable = true;
@@ -45,11 +45,11 @@ in
   environment = {
     systemPackages = yubikey-pkgs;
 
-    shellInit = ''
-      export GPG_TTY="$(tty)"
-      gpg-connect-agent /bye
-      export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
-    '';
+    # shellInit = ''
+    #   export GPG_TTY="$(tty)"
+    #   gpg-connect-agent /bye
+    #   export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
+    # '';
 
     # Without this, the gpg-agent has no way to ask the user for a password
     # when invoked from ssh.
-- 
cgit v1.2.3