Do main stuff after package install

deploy.sh

@@ -2,12 +2,10 @@
 
 set -e
 
-puppet apply manifests/main.pp --modulepath=modules/ --verbose
+puppet apply manifests/pre-packages.pp --modulepath=modules/ --verbose
 
 patch /usr/bin/makepkg -N < makepkg.patch
-
 puppet apply manifests/packages.pp --verbose
-
 patch /usr/bin/makepkg -NR < makepkg.patch
 
-puppet apply manifests/post-packages.pp --verbose
+puppet apply manifests/main.pp --modulepath=modules/ --verbose

manifests/main.pp

@@ -6,7 +6,6 @@ node default {
   include stdlib
 
   include common
-  include yaourt
   include gnome
   include config
   include shell

manifests/post-packages.pp

@@ -1,18 +0,0 @@
-node default {
-  Exec {
-    path => ['/usr/bin', '/usr/sbin', '/usr/local/bin', '/usr/local/sbin']
-  }
-
-  file {'Autostart Compton':
-    ensure => link,
-    path => '/home/jake/.config/autostart/compton.desktop',
-    mode => '0644',
-    owner => 'jake',
-    source => '/usr/share/applications/compton.desktop'
-  }
-
-  exec {'Set Java version':
-    command => 'archlinux-java set intellij-jdk',
-    unless => 'archlinux-java get | grep intellij-jdk'
-  }
-}

manifests/pre-package.pp

@@ -0,0 +1,5 @@
+node default {
+  include stdlib
+
+  include yaourt
+}

modules/common/manifests/init.pp

@@ -12,4 +12,9 @@ class common {
     path => '/home/jake',
     owner => 'jake'
   }
+
+  exec {'Set Java version':
+    command => 'archlinux-java set intellij-jdk',
+    unless => 'archlinux-java get | grep intellij-jdk'
+  }
 }

modules/i3/manifests/autostart.pp

@@ -25,4 +25,12 @@ class i3::autostart {
       source => "/etc/xdg/autostart/$program.desktop"
     }
   }
+
+  file {'Autostart Compton':
+    ensure => link,
+    path => '/home/jake/.config/autostart/compton.desktop',
+    mode => '0644',
+    owner => 'jake',
+    source => '/usr/share/applications/compton.desktop'
+  }
 }