diff --git a/hosts/nixos-vm2/configuration.nix b/hosts/nixos-vm2/configuration.nix
index 07ddc09..1fb56d8 100644
--- a/hosts/nixos-vm2/configuration.nix
+++ b/hosts/nixos-vm2/configuration.nix
@@ -4,7 +4,7 @@
   imports =
     [
       ./hardware-configuration.nix
-      ../../modules/core
+      ../../modules
     ];
   
   programs.hyprland.enable =  true;
diff --git a/modules/core/hjem.nix b/modules/core/hjem.nix
index 2c19c9b..dedbb76 100644
--- a/modules/core/hjem.nix
+++ b/modules/core/hjem.nix
@@ -5,7 +5,7 @@
 }:
 
 {
-  imports = [ inputs.hjem.nixosModules.default ];
+  imports = [inputs.hjem.nixosModules.default];
 
   config.hjem = {
     extraModules = [inputs.hjem-rum.hjemModules.default];
diff --git a/modules/core/user.nix b/modules/core/user.nix
index b6c137c..c4ae958 100644
--- a/modules/core/user.nix
+++ b/modules/core/user.nix
@@ -8,10 +8,11 @@
   users.users.${username} = {
     isNormalUser = true;
     description = "${username}";
+    #group = "${username}";
     extraGroups = [
       "wheel"
     ];
     shell = pkgs.zsh;
   };
-  nix.settings.allowed-users = [ "${username}" ];
+  nix.settings.allowed-users = [ "@wheel" ];
 }
diff --git a/modules/home/git.nix b/modules/home/git.nix
index c3736fa..4ec5568 100644
--- a/modules/home/git.nix
+++ b/modules/home/git.nix
@@ -1,8 +1,12 @@
-{ config, pkgs, ... }:
+{ config, pkgs, username, ... }:
 {
-    programs.git = {
+    config.hjem.users.username.rum.programs.git = {
     enable = true;
-    userName = "poslop";
-    userEmail = "poslop@archfox.org";
+    settings = {
+      user = {
+        name = "poslop";
+        email = "poslop@archfox.org";
+      };
+    };
   };
 }
diff --git a/modules/home/packages.nix b/modules/home/packages.nix
index 7ff41b3..c3cfc8a 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, pkgs, username, ... }:
 
 {
-  home.packages = with pkgs; [
+  hjem.users.username.packages = with pkgs; [
     git
     zsh
     neofetch
@@ -11,5 +11,6 @@
     vim
     wget
     curl
+    foot
   ];
 }
diff --git a/modules/home/zsh/zsh.nix b/modules/home/zsh/zsh.nix
index 7fcab1b..213cf0e 100644
--- a/modules/home/zsh/zsh.nix
+++ b/modules/home/zsh/zsh.nix
@@ -1,8 +1,5 @@
 {
-  programs.zsh = {
+  config.hjem.users.username.rum.programs.zsh = {
     enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
   };
 }