move a couple things into globals

instead of threading them through to everywhere individually

3 files changed, 5 insertions, 11 deletions

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 |>;
   }
 }