systems/x86_64-linux/yerukall/default.nix

@@ -66,7 +66,7 @@ in {
   # Configure keymap
   services.xserver.xkb = {
     variant = "caps:swapescape";
-    layout = "de,us,dv2";
+    layout = "dv2,de,us";
     extraLayouts.dv2 = {
       description = "German Dvorak Type 2";
       languages = [ "de" ];
@@ -127,12 +127,6 @@ in {
     configDir = "/home/kb-work/.config/syncthing";
   };
 
-  services.pcscd.enable = true;
-  programs.gnupg.agent = {
-#    enable = true;
-    pinentryPackage = pkgs.lib.mkForce pkgs.pinentry-qt;
-  };
-
   programs.firefox = {
     enable = true;
     nativeMessagingHosts.packages = [ pkgs.firefoxpwa ];
@@ -291,8 +285,6 @@ in {
     starship
     openconnect
     firefoxpwa
-    gnupg
-    pinentry-qt
   ];
 
   # Some programs need SUID wrappers, can be configured further or are