diff --git a/system/btrbk.nix b/system/btrbk.nix
index 5c35ac5..186f8aa 100644
--- a/system/btrbk.nix
+++ b/system/btrbk.nix
@@ -2,7 +2,6 @@
 
 {
   services.btrbk = {
-    extraPackages = [ pkgs.mbuffer ];
     instances.btrbk = {
       onCalendar = "hourly";
       settings = {
diff --git a/system/default.nix b/system/default.nix
index a1a0e5f..3ff41b1 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -61,7 +61,7 @@
 
   programs.gnupg.agent = {
     enable = true;
-    pinentryFlavor = "curses";
+    pinentryPackage = pkgs.pinentry-curses;
     # enableSSHSupport = true;
   };
 
@@ -94,6 +94,7 @@
     openssh.enable = true;
     printing.enable = true;
     mullvad-vpn.enable = true;
+    mullvad-vpn.package = pkgs.mullvad-vpn;
   };
 
   virtualisation.libvirtd.enable = true;
diff --git a/system/gnome.nix b/system/gnome.nix
index 0ab8e3b..8a26101 100644
--- a/system/gnome.nix
+++ b/system/gnome.nix
@@ -16,7 +16,6 @@
    environment.systemPackages = with pkgs.gnome; [
      gnome-sound-recorder
      gnome-tweaks
-     gedit
      gnome-boxes
    ];
 }