diff --git a/justfile b/justfile
index fa2bfc5..4bcd601 100644
--- a/justfile
+++ b/justfile
@@ -1,5 +1,5 @@
 shell server:
-  ssh root@{{server}}
+  ssh crony@{{server}}
 
 forward port server:
   ssh -N -L {{port}}:127.0.0.1:{{port}} root@{{server}}
diff --git a/modules/servers/general/user.nix b/modules/servers/general/user.nix
index 6399bdb..dda9f25 100644
--- a/modules/servers/general/user.nix
+++ b/modules/servers/general/user.nix
@@ -1,4 +1,7 @@
 {config, ...}: {
+  # Not reall that safe but convenient af
+  security.sudo.wheelNeedsPassword = false;
+
   users.users.crony = {
     hashedPasswordFile = "${config.age.secrets.crony-passwd.path}";
     isNormalUser = true;
diff --git a/modules/servers/home-manager/home.nix b/modules/servers/home-manager/home.nix
index e6ff8e2..0996161 100644
--- a/modules/servers/home-manager/home.nix
+++ b/modules/servers/home-manager/home.nix
@@ -24,6 +24,7 @@
 
     antidote = {
       enable = true;
+      useFriendlyNames = true;
       plugins = [
         "zap-zsh/supercharge"
         "zap-zsh/completions"
@@ -100,6 +101,20 @@
   # Let home manager install and manage itself
   programs.home-manager.enable = true;
 
+  # Install and setup atuin
+  programs.atuin = {
+    enable = true;
+    daemon.enable = true;
+    enableZshIntegration = true;
+    settings = {
+      auto_sync = true;
+      sync_frequency = "5m";
+      sync_address = "https://atuin.cronyakatsuki.xyz";
+      style = "compact";
+      workspaces = true;
+      keymap_mode = "vim-normal";
+    };
+  };
   # DO NOT CHANGE
   home.stateVersion = "24.11"; # Please read the comment before changing.
 }