diff --git a/modules/nixos/gui/default.nix b/modules/nixos/gui/default.nix
index 6af2ebf..e59338e 100644
--- a/modules/nixos/gui/default.nix
+++ b/modules/nixos/gui/default.nix
@@ -11,15 +11,14 @@ in
 
   config = mkIf cfg.enable {
     services = {
-      dbus.implementation = "broker";
-      dbus.packages = [ pkgs.gcr ];
-
       gnome.tracker-miners.enable = lib.mkForce false;
-
       flatpak.enable = true;
-
-      pcscd.enable = true;
-
+      xserver = {
+        layout = "de+us";
+        enable = true;
+        displayManager.gdm.enable = true;
+        desktopManager.gnome.enable = true;
+      };
       # Enable CUPS to print documents.
       printing.enable = true;
 
@@ -36,17 +35,16 @@ in
         #media-session.enable = true;
       };
 
+      dbus.packages = [ pkgs.gcr ];
+
       udev.packages = [
         pkgs.libu2f-host
         pkgs.yubikey-personalization
       ];
 
-      xserver = {
-        layout = "de+us";
-        enable = true;
-        displayManager.gdm.enable = true;
-        desktopManager.gnome.enable = true;
-      };
+      dbus.implementation = "broker";
+      keybase.enable = true;
+      kbfs.enable = false;
     };
     #security.pam.p11.control = "sufficient";
     #security.pam.p11.control = "required";
@@ -56,6 +54,7 @@ in
     #security.pam.yubico.control = "sufficient";
     #security.pam.yubico.mode = "challenge-response";
 
+    #services.pcscd.enable = true;
     #security.tpm2.pkcs11.enable = true;
 
     # Enable sound with pipewire.
@@ -91,6 +90,8 @@ in
       jetbrains-toolbox
       jq
       kbfs
+      keybase
+      keybase-gui
       libu2f-host
       mosh
       mosh
diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix
index 93836bd..25e0f29 100644
--- a/systems/x86_64-linux/x1/default.nix
+++ b/systems/x86_64-linux/x1/default.nix
@@ -13,7 +13,7 @@ with lib.plusultra;
     operation = "boot";
     allowReboot = false;
     flags = [ "--update-input" "nixpkgs" ];
-    flake = "git+https://git.hoyer.xyz/harald/nixcfg#x1";
+    flake = "git+https://git.hoyer.xyz/harald/nixcfg#${networking.hostName}";
   };
 
   plusultra.gui.enable = true;