some fixes

3 files changed, 9 insertions, 37 deletions

diff --git a/config/desktop.nix b/config/desktop.nix
index 3c0bc87..f06ec4f 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -79,7 +79,7 @@
         extraPackages = hpkgs: [ hpkgs.xmobar hpkgs.split ];
       };
 
-      displayManager.gdm = {
+      displayManager.lightdm = {
         enable = true;
         # autoLogin = {
         #   enable = true;
diff --git a/config/users.nix b/config/users.nix
index 8b06462..fdc20cc 100644
--- a/config/users.nix
+++ b/config/users.nix
@@ -15,6 +15,13 @@ in {
           ../data/yubikey_rsa.pub
         ];
       };
+      guest = {
+	isNormalUser = true;
+	home = "/home/guest";
+	uid = 1500;
+	description = "Guest";
+	extraGroups = ["networkmanager" "audio" "input"];
+      };
       fcgi = {
         group = "fcgi";
 	      extraGroups = ["readonly"];
diff --git a/config/yubikey.nix b/config/yubikey.nix
index 5ff9e79..3029d90 100644
--- a/config/yubikey.nix
+++ b/config/yubikey.nix
@@ -12,12 +12,11 @@ let
   ];
 in
 {
-  services.pcscd.enable = lib.mkForce false;
+  services.pcscd.enable = true;
   services.udev.packages = with pkgs; [
     libu2f-host
     yubikey-personalization
   ];
-  systemd.services.pcscd.after = ["multi-user.target"];
 
   programs.gnupg.agent = {
     enable = true;
@@ -26,41 +25,7 @@ in
   # Use GPG agent instead.
   programs.ssh.startAgent = lib.mkDefault false;
 
-  # systemd.user.services.gpg-agent = {
-  #   path = [ pkgs.gnupg ];
-  #   description = "SSH Agent";
-  #   wantedBy = [ "default.target" ];
-  #   serviceConfig = {
-  #     ExecStartPre = ''
-  #       ${pkgs.gnupg}/bin/gpgconf --create-socketdir
-  #       ${pkgs.coreutils}/bin/rm -f %t/gnupg/S.gpg-agent.ssh
-  #     '';
-  #     ExecStart =
-  #         "${pkgs.gnupg}/bin/gpg-agent --enable-ssh-support --daemon";
-  #     Type = "forking";
-  #     Restart = "on-failure";
-  #   };
-  # };
-
   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"
-    # '';
-
-    # Without this, the gpg-agent has no way to ask the user for a password
-    # when invoked from ssh.
-    # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=851440
-    # extraInit = ''
-    #   gpg-connect-agent updatestartuptty /bye
-    # '';
-
-    # variables = {
-    #   SSH_AUTH_SOCK =
-    #       ''''${XDG_RUNTIME_DIR:-"/run/user/\$(id -u)"}/gnupg/S.gpg-agent.ssh'';
-    # };
   };
 }