diff --git a/system-config/configuration/laptop/default.nix b/system-config/configuration/laptop/default.nix
index 6f29a2a..b6b1f14 100644
--- a/system-config/configuration/laptop/default.nix
+++ b/system-config/configuration/laptop/default.nix
@@ -73,6 +73,7 @@
                 shell = pkgs.zsh;
                 home-manager = {
                     enable = true;
+                    standalone = false;
                     extraModules = [
                     {
                         homeconfig = {
@@ -89,10 +90,6 @@
                             git.enable = true;
                             nh.enable = true;
                         };
-
-                        home.packages = [
-                            pkgs.wayvnc
-                        ];
                     } 
                     ];
                 };
diff --git a/system-config/users/default.nix b/system-config/users/default.nix
index 88dfffc..8c4c18f 100644
--- a/system-config/users/default.nix
+++ b/system-config/users/default.nix
@@ -63,14 +63,14 @@
 
 
     config = {
-        users.users = builtins.mapAttrs (name: user: {
-            name = user.name;
+        users.users = builtins.mapAttrs (x: y: {
+            name = y.name;
             isNormalUser = true;
-            uid = user.uid;
-            hashedPasswordFile = lib.mkIf (user.hashedPasswordFile != null) user.hashedPasswordFile;
-            shell = user.shell;
-            extraGroups = user.extraGroups;
-            openssh.authorizedKeys.keys = lib.mkIf config.sysconfig.services.openssh.enable user.sshKeys;
+            uid = y.uid;
+            hashedPasswordFile = lib.mkIf (y.hashedPasswordFile != null) y.hashedPasswordFile;
+            shell = y.shell;
+            extraGroups = y.extraGroups;
+            openssh.authorizedKeys.keys = lib.mkIf config.sysconfig.services.openssh.enable y.sshKeys;
             packages =  with pkgs; lib.mkIf (user.home-manager.enable && user.home-manager.standalone) [ home-manager ];
         }) config.sysconfig.users;