diff --git a/common/default.nix b/common/default.nix
index 30c254b..9bea625 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -1,4 +1,9 @@
-({ nixpkgs, home-manager, lib, ... }: {
+{ home-manager, lib, nixpkgs, nur, ... }: {
+  imports = [
+    home-manager.nixosModules.default
+    ./overlays/list.nix
+  ];
+
   # Select internationalisation properties.
   i18n.defaultLocale = "en_CA.UTF-8";
   console = {
@@ -27,6 +32,7 @@
   home-manager.users = let
     default = {
       imports = [
+        nur.hmModules.nur
         ./modules/neovim
         ./modules/bash
       ];
@@ -36,8 +42,4 @@
     root = default;
     matt = default;
   };
-
-  imports = [
-    ./overlays/list.nix
-  ];
-})
+}
diff --git a/hosts/wim/home/main.nix b/hosts/wim/home/main.nix
index bc81e77..19aef95 100644
--- a/hosts/wim/home/main.nix
+++ b/hosts/wim/home/main.nix
@@ -1,12 +1,6 @@
-{ home-manager, nur, ... }:
+{ ... }:
 
 {
-## Global config to add home-manager module
-#############################################################################
-  imports = [
-    home-manager.nixosModules.default
-  ];
-
   # Define a user account. Don't forget to set a password with 'passwd'.
   users.users.matt = {
     isNormalUser = true;
@@ -14,14 +8,12 @@
   };
 
   programs.dconf.enable = true;
-#############################################################################
 
   # TODO: use hm for tmux
   home-manager.users = {
     matt = {
 
       imports = [
-        nur.hmModules.nur
         ./dconf.nix
         ./theme.nix
         ./hyprland.nix