diff --git a/modules/core/default.nix b/modules/core/default.nix
index e214ebe..9977a04 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -4,7 +4,6 @@
        [(import ./bootloader.nix)]
     ++ [(import ./docker.nix)]
     ++ [(import ./hardware.nix)]
-    ++ [(import ../../roles)]
     ++ [(import ./xserver.nix)]
     ++ [(import ./network.nix)]
     ++ [(import ./pipewire.nix)]
diff --git a/modules/core/user.nix b/modules/core/user.nix
index fb4a42f..2d18c94 100644
--- a/modules/core/user.nix
+++ b/modules/core/user.nix
@@ -1,6 +1,6 @@
 { pkgs, inputs, config, username, host, ...}:
 {
-  imports = [ inputs.home-manager.nixosModules.home-manager ];
+  imports = [ inputs.home-manager.nixosModules.home-manager ] ++ [ ./../../roles ];
   home-manager = {
     useUserPackages = true;
     useGlobalPkgs = true;
@@ -22,12 +22,6 @@
   };
 
   users.users.${username} = {
-    # extraGroups = if (config.virtualisation.docker.enable == true) then
-      # [ "networkmanager" "wheel" "docker" ]
-    # else
-      # [ "networkmanager" "wheel" ];
-    # if (config.virtualisation.docker.enable = true) then
-      # extraGroups = [ "docker" ];
     isNormalUser = true;
     description = "${username}";
     extraGroups = [ "networkmanager" "wheel" "docker" ];