1 files changed, 12 insertions, 50 deletions
diff --git a/modules/conf/manifests/init.pp b/modules/conf/manifests/init.pp
index 5a52b5d..36e5f22 100644
--- a/modules/conf/manifests/init.pp
+++ b/modules/conf/manifests/init.pp
@@ -1,53 +1,15 @@
-define conf($user=$name, $home=undef) {
-  $_home = $home ? {
-    undef => $user ? {
-      'root' => '/root',
-      default => "/home/$user",
-    },
-    default => $home,
-  }
-
-  include conf::deps
-
-  package::cargo { "fancy-prompt for $user":
-    package => 'fancy-prompt',
-    user => $user,
+class conf {
+  include c_toolchain
+  include cron
+  include git
+
+  package {
+    [
+      "cmake",
+      "fortune-mod",
+      "less",
+      "vim",
+    ]:
     ensure => installed,
-    require => Package["cmake"],
-  }
-
-  exec { "git clone doy/conf for $user":
-    command => "/usr/bin/git clone git://github.com/doy/conf",
-    user => $user,
-    cwd => $_home,
-    creates => "$_home/conf",
-    require => [
-      User[$user],
-      File[$_home],
-      Class['git'],
-    ];
-  }
-
-  exec { "conf make install for $user":
-    command => "/usr/bin/make install",
-    user => $user,
-    cwd => "$_home/conf",
-    environment => [
-      "HOME=$_home",
-      "PWD=$_home/conf",
-    ],
-    creates => "$_home/.vimrc",
-    require => [
-      Class['cron'],
-      Class['c_toolchain'],
-      User[$user],
-      Exec["git clone doy/conf for $user"],
-      Package["vim"],
-      Package["fortune-mod"],
-      Package["less"],
-      Package::Cargo["fancy-prompt for $user"],
-    ];
   }
-
-  # XXX use the right branch
 }