diff --git a/configs/manager.nix b/configs/manager.nix
index ccaab25..674e822 100644
--- a/configs/manager.nix
+++ b/configs/manager.nix
@@ -5,6 +5,7 @@
 , ...
 }:
 let
+  cfg = config.nixManager;
   microcaBin = "${pkgs.microca}/bin/microca";
   microca = pkgs.writeScriptBin "microca" ''
     #!/usr/bin/env sh
@@ -17,7 +18,7 @@ with lib; {
       enable = mkEnableOption "Configure host as nix-conf manager.";
       user = mkOption {
         type = types.str;
-        default = "root";
+        default = "mgr";
         description = ''
           User who will own the private key.
         '';
@@ -27,16 +28,23 @@ with lib; {
 
   #imports = [ ./tailnet.nix ];
 
-  config = mkIf config.nixManager.enable {
+  config = mkIf cfg.enable {
+    users.users.mgr = {
+      isNormalUser = true;
+      description = "Nix Manager";
+      home = "/home/mgr";
+      extraGroups = [ "wheel" ];
+      shell = pkgs.zsh;
+    };
     sops.defaultSopsFile = config.xin-secrets.manager;
     sops.secrets = {
-      xin_status_key = { owner = config.nixManager.user; };
-      xin_status_pubkey = { owner = config.nixManager.user; };
-      manager_key = { owner = config.nixManager.user; };
-      manager_pubkey = { owner = config.nixManager.user; };
-      ca_key = { owner = config.nixManager.user; };
-      ca_cert = { owner = config.nixManager.user; };
-      po_env = { owner = config.nixManager.user; };
+      xin_status_key = { owner = cfg.user; };
+      xin_status_pubkey = { owner = cfg.user; };
+      manager_key = { owner = cfg.user; };
+      manager_pubkey = { owner = cfg.user; };
+      ca_key = { owner = cfg.user; };
+      ca_cert = { owner = cfg.user; };
+      po_env = { owner = cfg.user; };
     };
 
     environment.systemPackages = [
diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix
index 6ec309e..516aa72 100644
--- a/hosts/europa/default.nix
+++ b/hosts/europa/default.nix
@@ -122,7 +122,7 @@ in
 
   nixManager = {
     enable = lib.mkDefault true;
-    user = "qbit";
+    user = "mgr";
   };
 
   kde.enable = lib.mkDefault true;
diff --git a/users/default.nix b/users/default.nix
index a2031c8..04f3346 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -1,7 +1,6 @@
 { config
 , lib
 , pkgs
-, isUnstable
 , ...
 }:
 with lib; let
@@ -24,20 +23,16 @@ in
     };
   };
 
-  config = mkIf config.defaultUsers.enable {
-    users.users.root = userBase;
-    users.users.qbit =
-      userBase
-      // {
-        isNormalUser = true;
-        description = "Aaron Bieber";
-        home = "/home/qbit";
-        extraGroups = [ "wheel" ];
+  config = mkIf config.defaultUsers.enable
+    {
+      users.users = {
+        root = userBase;
+        qbit = userBase // {
+          isNormalUser = true;
+          description = "Aaron Bieber";
+          home = "/home/qbit";
+          extraGroups = [ "wheel" ];
+        };
       };
-
-    environment.systemPackages =
-      if isUnstable
-      then [ pkgs.yash pkgs.go ]
-      else [ pkgs.go ];
-  };
+    };
 }