1 files changed, 4 insertions, 10 deletions
diff --git a/manifests/laptop.pp b/manifests/laptop.pp
index a2420f9..1ed77b7 100644
--- a/manifests/laptop.pp
+++ b/manifests/laptop.pp
@@ -1,17 +1,17 @@
 class nodo::laptop inherits nodo::personal {
-  include utils::laptop
+  include nodo::utils::laptop
+  include nodo::subsystem::dhclient
   include firewall::wifi
   include firewall::openvpn
   include firewall::ppp
-  include dhclient
 
-  class { 'fstab':
+  class { 'nodo::subsystem::fstab':
     type => 'laptop',
   }
 
   $hibernate = hiera('nodo::laptop::hibernate', false)
 
-  class { 'crypttab':
+  class { 'nodo::subsystem::crypttab':
     type => $hibernate ? {
       false   => "laptop",
       default => "laptop.hibernate",
@@ -31,9 +31,3 @@ class nodo::laptop inherits nodo::personal {
     },
   }
 }
-
-class nodo::laptop::webdev inherits nodo::laptop {
-  include websites::dev
-  include database
-  include utils::web
-}