diff --git a/homes/x86_64-linux/rafiq/programs/zsh.nix b/homes/x86_64-linux/rafiq/programs/zsh.nix
index e61cfb4..d3542cc 100644
--- a/homes/x86_64-linux/rafiq/programs/zsh.nix
+++ b/homes/x86_64-linux/rafiq/programs/zsh.nix
@@ -2,8 +2,6 @@
 {
   programs.zsh = {
     enable = true;
-    enableCompletions = true;
-    autosuggestion = true;
     enableVteIntegration = true;
     syntaxHighlighting.enable = true;
     history.share = true;
diff --git a/modules/nixos/cli/default.nix b/modules/nixos/cli/default.nix
index 5839572..4bd1711 100644
--- a/modules/nixos/cli/default.nix
+++ b/modules/nixos/cli/default.nix
@@ -1,4 +1,4 @@
-{config, lib,...}:
+{config, lib, pkgs, ...}:
 {
 imports = [];
 
diff --git a/modules/nixos/system/users.nix b/modules/nixos/system/users.nix
index de2acf2..689ee0c 100644
--- a/modules/nixos/system/users.nix
+++ b/modules/nixos/system/users.nix
@@ -2,11 +2,20 @@
 {
   config = lib.mkMerge [
     {
-      users.defaultUserShell = pkgs.zsh;
+    users.mutableUsers = false;
+    users.groups.users = {
+	gid = 100;
+      members = [ "${config.system.mainUser}" ];
+    };
       users.users."${config.system.mainUser}" = {
+      linger = true;
+      uid = 1000;
         isNormalUser = true;
         initialPassword = "1";
         extraGroups = [ "wheel" ];
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdsZyY3gu8IGB8MzMnLdh+ClDxQQ2RYG9rkeetIKq8n"
+      ];
       };
       services.getty.autologinUser = config.system.mainUser;
     }