diff --git a/base/defaults.nix b/base/defaults.nix
index d3e7ce7..a3f743d 100644
--- a/base/defaults.nix
+++ b/base/defaults.nix
@@ -6,8 +6,10 @@
         services.xserver.layout = "us-fruchti";
         services.openssh = {
             enable = true;
-            passwordAuthentication = false;
-            kbdInteractiveAuthentication = false;
+            settings = {
+                PasswordAuthentication = false;
+                KbdInteractiveAuthentication = false;
+            };
         };
 
         nix.gc = {
diff --git a/base/users.nix b/base/users.nix
index bcffc2e..298c65c 100644
--- a/base/users.nix
+++ b/base/users.nix
@@ -3,6 +3,8 @@ let
     definedInPersonalDotNix = lib.mkDefault (throw "Configuration option missing from personal.nix");
 in
 {
+    programs.fish.enable = true;
+
     users.users = {
         fruchti = {
             isNormalUser = true;
diff --git a/hosts/gnome.nix b/hosts/gnome.nix
index a97b04d..41ab98f 100644
--- a/hosts/gnome.nix
+++ b/hosts/gnome.nix
@@ -37,6 +37,8 @@
   ];
 
   programs.gnupg.agent.pinentryFlavor = "gnome3";
+  services.pcscd.enable = true;
+  services.dbus.packages = [ pkgs.gcr ];
 
   environment.gnome.excludePackages = (with pkgs; [
       gnome-photos
diff --git a/overlays/burp.nix b/overlays/burp.nix
index 39c99aa..762a2bf 100644
--- a/overlays/burp.nix
+++ b/overlays/burp.nix
@@ -11,7 +11,6 @@
                     hash = "sha256-/vYon0XUIuMAaaaRNehzMspKMHWp0tJm8JubRt1KmZU=";
                 };
                 configureFlags = [ "--sysconfdir=/var/lib/burp" ];
-                buildInputs = with super; [ librsync ncurses openssl_1_1 zlib uthash ];
                 patches = [];
             }));
         })