Merge branch 'master' into france

defaults.nix

@@ -18,6 +18,7 @@
     autoconf
     automake
     bash
+    boot
     bind
     binutils
     btrfs-progs
@@ -28,8 +29,11 @@
     certbot
     clang
     curl
+    dpkg
     emacs
+    enca
     fail2ban
+    file
     fortune
     gcc
     git
@@ -44,6 +48,7 @@
     jdk
     kerberos
     libisofs
+    libstdcxxHook
     lispPackages.alexandria
     lispPackages.cl-ppcre
     lispPackages.clx
@@ -51,6 +56,8 @@
     lshw
     mkpasswd
     ncurses5
+    nix-index
+    nix-prefetch-git
     nmap
     oidentd
     openldap
@@ -58,6 +65,7 @@
     openssl_1_1
     openssh_gssapi
     pciutils
+    pinentry.curses
     pv
     pwgen
     racket
@@ -73,19 +81,28 @@
     unzip
     vim
     wget
+    yubikey-manager
+    yubikey-personalization
   ];
 
-  system.stateVersion = "19.09";
+  system.stateVersion = "20.03";
 
   system.autoUpgrade.enable = true;
 
   environment.etc.current-nixos-config.source = ./.;
 
   krb5.enable = true;
-  krb5.libdefaults.default_realm = "FUDO.ORG";
   krb5.kerberos = pkgs.heimdalFull;
 
-  console.keyMap = "dvp";
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "dvp";
+    xkbOptions = "ctrl:nocaps";
+  };
+
+  console = {
+    useXkbConfig = true;
+  };
 
   i18n = {
     defaultLocale = "en_US.UTF-8";
@@ -95,6 +112,8 @@
     mosh.enable = true;
 
     ssh = {
+      startAgent = false;
+
       extraConfig = ''
         GSSAPIAuthentication yes
         GSSAPIDelegateCredentials yes
@@ -129,8 +148,21 @@
         GSSAPICleanupCredentials yes
     '';
     };
+
+    pcscd = {
+      enable = true;
+    };
+
+    udev.packages = with pkgs; [
+      yubikey-personalization
+    ];
   };
 
+  environment.shellInit = ''
+    gpg-connect-agent /bye
+    export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+  '';
+
   security.pam = {
     enableSSHAgentAuth = true;
     # TODO: add yubico?
@@ -167,6 +199,9 @@
       group = "users";
       home = "/home/niten";
       hashedPassword = "$6$a1q2Duoe35hd5$IaZGXPfqyGv9uq5DQm7DZq0vIHsUs39sLktBiBBqMiwl/f/Z4jSvNZLJp9DZJYe5u2qGBYh1ca.jsXvQA8FPZ/";
+      openssh.authorizedKeys.keys = [
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDoWkjyeIfgwm0b78weToVYOQSD0RQ0qbNzpsN5NokbIFv2/980kLtnYrQEgIJ/JwMLlT3uJYacbCT5/a6Fb8oLxNpj0AF1EKaWZ3Rrlg72Sq+9SEwJwWWmZizX83sovMwUBMaUp6jWLhAhPpzBW5pfc5YWoc89wxGbELSwzgt5EgHbSJgvDnaHSp3fVaY01wfDXbL/oO160iNe7wv2HLMZu/FkWBkIjz6HmoGJJzYM89bUpHbyYG28lmCHB/8UPog5/BsjOn3/qupgf4zh6mMdMsXLvbR2jVwVjxcEMj9N5nCvc+Y3oi7Mij6VNrWbhkaAJMEzeMhWYrF3/pFQxUqG37aK3d0gw9kp5tMDLIlAPX4y1lfA87pIzoa0+Alql0CJQA1IJvp9SFG7lBmSthWQLmZvwwfoGg/ZjF6rOgsVoZ8TizpQnydWJDr6NboU9LL9Oa64OM5Rs0AU3cR2UbOF4QIcWFJ/7oDe3dOnfZ8QYqx9eXJyxoAUpDanaaTHYBiAKkeOBwQU+MVLKCcONKw9FZclf/1TpDB5b3/JeUFANjHQTv0UXA4YYU7iCx6H7XB4qwwtU9O19CGQYYfCfULX12/fRpYJw6VJaQWyyU4Bn5dk/dcB2nGI36jwbLMfhbUTIApujioAnd/GQIMakHEZ1+syPhMx9BxMkZb99B0A1Q== openpgp:0x4EC95B64"
+      ];
     };
     reaper = {
       isNormalUser = true;