diff --git a/nixos/common-services.nix b/nixos/common-services.nix
index 9c428105..24640ee7 100644
--- a/nixos/common-services.nix
+++ b/nixos/common-services.nix
@@ -31,18 +31,7 @@
     fstrim.enable = true;
     clipmenu.enable = true;
     lorri.enable = true;
-    i2pd = {
-      enable = true;
-      bandwidth = 2500; # kb/s
-      proto.http.enable = true;
-      proto.httpProxy.enable = true;
-      addressbook.subscriptions = [
-        "http://inr.i2p/export/alive-hosts.txt"
-        "http://i2p-projekt.i2p/hosts.txt"
-        "http://stats.i2p/cgi-bin/newhosts.txt"
-        "http://identiguy.i2p/hosts.txt"
-      ];
-    };
+    keybase.enable=true;
 
     avahi = {
       enable = true;
diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix
index 3b242c4d..e08bf519 100644
--- a/nixos/gui/default.nix
+++ b/nixos/gui/default.nix
@@ -19,6 +19,7 @@
     ];
 
     home.packages = with pkgs; [
+      keybase-gui
       unstable.electrum
       mindforger trilium-desktop typora
       digikam anarchism
diff --git a/nixos/home-manager/cli.nix b/nixos/home-manager/cli.nix
index edd0ddd8..68a5d8e2 100644
--- a/nixos/home-manager/cli.nix
+++ b/nixos/home-manager/cli.nix
@@ -15,12 +15,12 @@
     fd
     file
     fontconfig
-    unstable.genpass
     git
     hsetroot
     htop
     imagemagick
     jq
+    keybase
     lm_sensors
     mercurial
     nixops
@@ -32,6 +32,7 @@
     rustup
     terraform
     tmux
+    unstable.genpass
     unzip
     veracrypt
     wget
diff --git a/nixos/home-manager/default.nix b/nixos/home-manager/default.nix
index 2e2fe5bf..bd386fcb 100644
--- a/nixos/home-manager/default.nix
+++ b/nixos/home-manager/default.nix
@@ -19,6 +19,8 @@
     pinentryFlavor = "curses";
   };
 
+  services.kbfs.enable = true;
+
   imports = [
     ./programs/tmux.nix
     ./programs/zsh.nix