diff --git a/flake.lock b/flake.lock
index 3c16408..acadf27 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1296,11 +1296,11 @@
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1702824777,
-        "narHash": "sha256-Lsa6g03o8Qd35C9I48WZ7GFB3c8nQyHgrI7oGseMV98=",
+        "lastModified": 1703323989,
+        "narHash": "sha256-YC2itrHIVrg1TazWnsuZ51BBYD3HJMFKONgh9RWn5Qk=",
         "ref": "main",
-        "rev": "fbe67abe5b5586d71f108a5214be28aeff49f4a3",
-        "revCount": 60,
+        "rev": "23c91088d677f3f1e7d21bb1a8afd4f729d1e030",
+        "revCount": 61,
         "type": "git",
         "url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git"
       },
diff --git a/flake.nix b/flake.nix
index 3b6f337..c8c718b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -331,6 +331,7 @@
               # { home-manager.users.root = import ./nixos/homes/root; }
               { home-manager.users.mainUser = import ./nixos/homes/palo; }
               { home-manager.users.mainUser.gui.enable = true; }
+              { home-manager.users.root = import ./nixos/homes/root; }
             ];
           };
           cherry = nixosConfigurationSetup {
@@ -338,9 +339,9 @@
             modules = [
               nixos-hardware.nixosModules.framework-13th-gen-intel
               homeManagerModules
-              # { home-manager.users.root = import ./nixos/homes/root; }
               { home-manager.users.mainUser = import ./nixos/homes/palo; }
               { home-manager.users.mainUser.gui.enable = true; }
+              { home-manager.users.root = import ./nixos/homes/root; }
             ];
           };
           chungus = nixosConfigurationSetup {
@@ -349,12 +350,17 @@
               homeManagerModules
               retiolum.nixosModules.retiolum
               { home-manager.users.mainUser = import ./nixos/homes/palo; }
+              { home-manager.users.mainUser.gui.enable = false; }
+              { home-manager.users.root = import ./nixos/homes/root; }
             ];
           };
           robi = nixosConfigurationSetup {
             name = "robi";
             modules = [
               homeManagerModules
+              { home-manager.users.mainUser = import ./nixos/homes/palo; }
+              { home-manager.users.mainUser.gui.enable = false; }
+              { home-manager.users.root = import ./nixos/homes/root; }
             ];
           };
         };
diff --git a/nixos/homes/palo/packages/0001-make-atuin-on-zfs-fast-again.patch b/nixos/homes/common/0001-make-atuin-on-zfs-fast-again.patch
similarity index 100%
rename from nixos/homes/palo/packages/0001-make-atuin-on-zfs-fast-again.patch
rename to nixos/homes/common/0001-make-atuin-on-zfs-fast-again.patch
diff --git a/nixos/homes/common/default.nix b/nixos/homes/common/default.nix
index 66d987b..6430844 100644
--- a/nixos/homes/common/default.nix
+++ b/nixos/homes/common/default.nix
@@ -1,5 +1,8 @@
 { lib, ... }:
 {
-  imports = [ ./packages.nix ];
+  imports = [
+    ./packages.nix
+    ./terminal.nix
+  ];
   options.gui.enable = lib.mkEnableOption "should GUI packages be anabled?";
 }
diff --git a/nixos/homes/palo/packages/terminal.nix b/nixos/homes/common/terminal.nix
similarity index 91%
rename from nixos/homes/palo/packages/terminal.nix
rename to nixos/homes/common/terminal.nix
index 07a385f..9fa82b9 100644
--- a/nixos/homes/palo/packages/terminal.nix
+++ b/nixos/homes/common/terminal.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 {
 
   programs.zsh = {
     enable = true;
-    defaultKeymap = "viins";
+    defaultKeymap = lib.mkDefault "viins";
   };
 
   programs.bash = {
@@ -50,7 +50,7 @@
     settings = {
       auto_sync = true;
       sync_frequency = "5m";
-      sync_address = "http://chungus.private";
+      sync_address = "http://chungus.private:8888";
       #search_mode = "prefix";
     };
   };
diff --git a/nixos/homes/palo/packages/default.nix b/nixos/homes/palo/packages/default.nix
index 9356f7e..a5fa0a0 100644
--- a/nixos/homes/palo/packages/default.nix
+++ b/nixos/homes/palo/packages/default.nix
@@ -5,6 +5,5 @@
     ./nextcloud.nix
     ./social.nix
     ./packages.nix
-    ./terminal.nix
   ];
 }
diff --git a/nixos/homes/root/default.nix b/nixos/homes/root/default.nix
new file mode 100644
index 0000000..3637255
--- /dev/null
+++ b/nixos/homes/root/default.nix
@@ -0,0 +1,4 @@
+{
+  imports = [ ../common ];
+  gui.enable = false;
+}
diff --git a/nixos/machines/chungus/atuin.nix b/nixos/machines/chungus/atuin.nix
index cc17438..fbe740c 100644
--- a/nixos/machines/chungus/atuin.nix
+++ b/nixos/machines/chungus/atuin.nix
@@ -3,6 +3,6 @@
     enable = true;
     host = "${config.networking.hostName}.private";
     maxHistoryLength = 999999;
-    openRegistration = true;
+    openRegistration = false;
   };
 }