diff --git a/flake.nix b/flake.nix
index 825b500..51ac044 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,14 +13,15 @@
   outputs = { self, nixpkgs, nixpkgs-stable, home-manager, jovian, plasma-manager,  ...}:
    let
     lib = nixpkgs.lib;
-    host = ["computer-mo" "server" "steamdeck" "konsole"];
+    host = "computer-mo";
+    user = "mo";
     system = "x86_64-linux";
     pkgs = import nixpkgs {inherit system; config.allowUnfree = true; };
     pkgs-stable = import nixpkgs-stable {inherit system; config.allowUnfree = true; };
     in {
     nixosConfigurations = {
       ${host} = lib.nixosSystem {
-       inherit system;
+       inherit system host;
        specialArgs = { inherit pkgs-stable; };
        modules = [
           ./hosts/${host}/system-imports.nix
@@ -31,7 +32,7 @@
             home-manager.useUserPackages = true;
             home-manager.backupFileExtension = "backup";
             home-manager.extraSpecialArgs = {inherit pkgs;};
-            home-manager.users.mo.imports = [./hosts/${host}/user-imports.nix];
+            home-manager.users.${user}.imports = [./hosts/${host}/user-imports.nix];
             home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager];
           }
        ];
diff --git a/hosts/computer-mo/system-settings/sys.set-desktop.nix b/hosts/computer-mo/system-settings/sys.set-desktop.nix
index f9cc6e7..0815327 100644
--- a/hosts/computer-mo/system-settings/sys.set-desktop.nix
+++ b/hosts/computer-mo/system-settings/sys.set-desktop.nix
@@ -1,5 +1,5 @@
-{ ... }:
+{ user, ... }:
 {
   services.displayManager.autoLogin.enable = true;
-  services.displayManager.autoLogin.user = "mo";
+  services.displayManager.autoLogin.user = user;
 }
diff --git a/hosts/computer-mo/system-settings/sys.set-dev.nix b/hosts/computer-mo/system-settings/sys.set-dev.nix
index 59b4ac3..b7f19c1 100644
--- a/hosts/computer-mo/system-settings/sys.set-dev.nix
+++ b/hosts/computer-mo/system-settings/sys.set-dev.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }
-:{
+{ pkgs, user,  ... }:
+{
   users.defaultUserShell = pkgs.zsh;
-  users.users.mo.shell = pkgs.zsh;
+  users.users.${user}.shell = pkgs.zsh;
   programs.zsh.enableCompletion = true;
   programs.zsh.ohMyZsh.enable = true;
   programs.zsh.ohMyZsh.theme = "agnoster";
diff --git a/hosts/computer-mo/system-settings/sys.set-steam.nix b/hosts/computer-mo/system-settings/sys.set-steam.nix
index b4e26ad..86d6b2f 100644
--- a/hosts/computer-mo/system-settings/sys.set-steam.nix
+++ b/hosts/computer-mo/system-settings/sys.set-steam.nix
@@ -1,8 +1,8 @@
-{ ... }:
+{ user, ... }:
 {
   jovian.steam = {
     autoStart = false;
-    user = "mo";
+    user = user;
     desktopSession = "plasma";
   };
 
diff --git a/hosts/computer-mo/system-settings/sys.set-users.nix b/hosts/computer-mo/system-settings/sys.set-users.nix
index 4994b4a..71da534 100644
--- a/hosts/computer-mo/system-settings/sys.set-users.nix
+++ b/hosts/computer-mo/system-settings/sys.set-users.nix
@@ -1,6 +1,6 @@
-{ ... }:
+{ user, ... }:
 {
-  users.users.mo = {
+  users.users.${user} = {
     isNormalUser = true;
     description = "Mohamed Chrayed";
     extraGroups = [ "networkmanager" "wheel" ];