diff --git a/home/breakerbox.nix b/home/breakerbox.nix
index 8b86458..81989c0 100644
--- a/home/breakerbox.nix
+++ b/home/breakerbox.nix
@@ -78,9 +78,7 @@ in
     ./services/psd.nix
     ./services/pueue.nix
     ./services/tumblerd.nix
-  ] ++ (optionals graphics [
-    ./services/keybase.nix
-  ]) ++ (optionals (!machineVars.wayland) [
+  ] ++ (optionals (!machineVars.wayland) [
     ./programs/xmonad
     # ./programs/xmobar
 
@@ -155,6 +153,8 @@ in
   services.copyq.enable = graphics;
   services.dunst.enable = graphics;
   services.gnome-keyring.enable = graphics;
+  services.kbfs.enable = graphics;
+  services.keybase.enable = graphics;
   services.mpd.enable = graphics;
   services.mpris-proxy.enable = graphics;
   services.network-manager-applet.enable = graphics;
diff --git a/home/services/keybase.nix b/home/services/keybase.nix
deleted file mode 100644
index a22f883..0000000
--- a/home/services/keybase.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-{
-  services.keybase.enable = true;
-  services.kbfs.enable = true;
-}