diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix
index 26cc454..35dc692 100644
--- a/hosts/nom/default.nix
+++ b/hosts/nom/default.nix
@@ -1,5 +1,4 @@
 {
-  config,
   nixos-hardware,
   pkgs,
   ...
diff --git a/users/myuser/core/default.nix b/users/common/default.nix
similarity index 98%
rename from users/myuser/core/default.nix
rename to users/common/default.nix
index 4029100..6322fa2 100644
--- a/users/myuser/core/default.nix
+++ b/users/common/default.nix
@@ -1,5 +1,7 @@
 {pkgs, ...}: {
   imports = [
+    ./modules/uid.nix
+
     #./atuin.nix
     #./bash.nix
     #./btop.nix
@@ -15,7 +17,6 @@
   ];
 
   home = {
-    username = "myuser";
     stateVersion = "22.11";
     packages = with pkgs; [
       bandwhich
diff --git a/users/myuser/modules/uid.nix b/users/common/modules/uid.nix
similarity index 100%
rename from users/myuser/modules/uid.nix
rename to users/common/modules/uid.nix
diff --git a/users/myuser/default.nix b/users/myuser/default.nix
index 4f70da5..dcea5c0 100644
--- a/users/myuser/default.nix
+++ b/users/myuser/default.nix
@@ -20,9 +20,8 @@ with lib; {
   home-manager.users.myuser = {
     imports = [
       #impermanence.home-manager.impermanence
-      ./core
-      ./dev
-      ./modules
+      ../common
+      ./dev.nix
       #]
       #++ optionals config.programs.sway.enable [
       #  ./graphical
diff --git a/users/myuser/dev/default.nix b/users/myuser/dev.nix
similarity index 100%
rename from users/myuser/dev/default.nix
rename to users/myuser/dev.nix
diff --git a/users/myuser/modules/default.nix b/users/myuser/modules/default.nix
deleted file mode 100644
index db4ab03..0000000
--- a/users/myuser/modules/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./uid.nix
-  ];
-}