7 files changed, 16 insertions, 37 deletions
diff --git a/manifests/00global.pp b/manifests/00global.pp
new file mode 100644
index 0000000..032a427
--- /dev/null
+++ b/manifests/00global.pp
@@ -0,0 +1,5 @@
+$default_user = 'doy'
+
+Package::Makepkg {
+  build_user => $default_user,
+}
diff --git a/manifests/partofme.pp b/manifests/partofme.pp
index 0450128..4dcef2b 100644
--- a/manifests/partofme.pp
+++ b/manifests/partofme.pp
@@ -1,17 +1,7 @@
 node 'partofme.localdomain' {
-  $default_user = 'doy'
+  $persistent_data = undef
 
-  Package::Makepkg {
-    build_user => $default_user,
-  }
+  include base
 
-  Base::User[$default_user] -> Package::Makepkg<| build_user == $default_user |>
-
-  class { 'base':
-    default_user => $default_user;
-  }
-
-  class { 'partofme::backups':
-    default_user => $default_user;
-  }
+  include partofme::backups
 }
diff --git a/manifests/tozt.pp b/manifests/tozt.pp
index 40d81a4..3c36818 100644
--- a/manifests/tozt.pp
+++ b/manifests/tozt.pp
@@ -1,20 +1,10 @@
 node 'tozt.localdomain' {
-  $default_user = 'doy'
   $persistent_data = '/media/persistent'
-
-  Package::Makepkg {
-    build_user => $default_user,
-  }
-
-  Base::User[$default_user] -> Package::Makepkg<| build_user == $default_user |>
-
   include tozt::persistent
-  class { 'base':
-    default_user => $default_user,
-    persistent_data => $persistent_data,
-  }
   Class['tozt::persistent'] -> Class['base']
 
+  include base
+
   include tozt::backups
   include tozt::git
   include tozt::pass
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index d476624..3bafa7b 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -1,12 +1,8 @@
-class base($default_user, $persistent_data=undef) {
+class base {
   contain base::bootstrap
   contain base::operatingsystem
   contain base::services
   contain base::tools
+  contain base::users
   contain base::vpn
-
-  class { 'base::users':
-    default_user => $default_user,
-    persistent_data => $persistent_data;
-  }
 }
diff --git a/modules/base/manifests/user.pp b/modules/base/manifests/user.pp
index 807c978..065a677 100644
--- a/modules/base/manifests/user.pp
+++ b/modules/base/manifests/user.pp
@@ -6,7 +6,6 @@ define base::user(
   $extra_groups=[],
   $homedir_mode='0700',
   $shell='/usr/bin/zsh',
-  $persistent_data=undef,
 ) {
   $_home = $home ? {
     undef => $user ? {
diff --git a/modules/base/manifests/users.pp b/modules/base/manifests/users.pp
index 4725959..b2cdbd5 100644
--- a/modules/base/manifests/users.pp
+++ b/modules/base/manifests/users.pp
@@ -1,13 +1,12 @@
-class base::users($default_user, $persistent_data) {
+class base::users {
   base::user { 'root':
-    pwhash => secret::value('passwd/root'),
-    persistent_data => $persistent_data;
+    pwhash => secret::value('passwd/root');
   }
 
   base::user { $default_user:
     pwhash => secret::value("passwd/$default_user"),
     extra_groups => ['wheel'],
     homedir_mode => '0701',
-    persistent_data => $persistent_data;
+    before -> Package::Makepkg<| build_user == $default_user |>;
   }
 }
diff --git a/modules/partofme/manifests/backups.pp b/modules/partofme/manifests/backups.pp
index a497b25..c62013e 100644
--- a/modules/partofme/manifests/backups.pp
+++ b/modules/partofme/manifests/backups.pp
@@ -1,4 +1,4 @@
-class partofme::backups($default_user) {
+class partofme::backups {
   include duplicati
 
   syncthing::user { $default_user: