Permalink
Browse files

Merge branch 'master' of github.com:mythmon/puppet

  • Loading branch information...
2 parents ba9d9f8 + 2fddb43 commit b1ea5adb6d9370403167e5c0b0191fbfa9426b08 @mythmon mythmon committed Apr 4, 2012
View
@@ -8,6 +8,7 @@
include bash
# GUI Apps
+ include awesome
include firefox
include sakura
@@ -0,0 +1,12 @@
+class awesome {
+ yumrepo { "awesome":
+ name => "fedora-awesome",
+ baseurl => "http://repos.fedorapeople.org/repos/thm/awesome/fedora-\$releasever/\$basearch/",
+ enabled => 1,
+ gpgcheck => 0,
+ }
+ package { "awesome":
+ ensure => present,
+ require => Yumrepo["awesome"],
+ }
+}
@@ -1,7 +1,7 @@
# $title is the name of the user this config should exist for
define git::user_config (
$home="/home/${title}",
- $template="git/gitconfig.erb",
+ $template="git/gitconfig.erb"
) {
file { "${title}-gitconfig":
path => "${home}/.gitconfig",
@@ -0,0 +1,5 @@
+class htop {
+ package { "htop":
+ ensure => latest,
+ }
+}
@@ -0,0 +1,7 @@
+class strace {
+ include strace::params
+ package { "strace":
+ ensure => latest,
+ name => "${strace::params::strace_package}",
+ }
+}
@@ -0,0 +1,6 @@
+class strace::params {
+ $strace_package = $::operatingsystem ? {
+ /Fedora/ => 'strace',
+ default => 'strace',
+ }
+}
@@ -12,7 +12,9 @@
include fonts::inconsolata
- vim::user_config { "${username}": }
+ vim::user_config { "${username}":
+ template => "users/simpson/vimrc.erb",
+ }
ruby::dev::user_config { "${username}": }
puppet::dev::user_config { "${username}": }
@@ -19,7 +19,7 @@
}
#os::user_config { "$ { username}": }
- bash::user_config { "$ { username}": }
- ruby::dev::user_config { "$ { username}": }
- puppet::dev::user_config { "$ { username}": }
+ bash::user_config { "${username}": }
+ ruby::dev::user_config { "${username}": }
+ puppet::dev::user_config { "${username}": }
}
@@ -11,3 +11,10 @@ set wm=2
set textwidth=78
set listchars=tab:>-,eol:$
+
+filetype on
+filetype plugin on
+filetype indent on
+
+" JQuery
+au BufRead,BufNewFile jquery.*.js set ft=javascript syntax=jquery
@@ -2,7 +2,7 @@
define vim::user_config (
$home="/home/${title}",
$pathogen=false,
- $template="vim/vimrc.erb",
+ $template="vim/vimrc.erb"
) {
@file {
"vim_dir_${title}":
@@ -0,0 +1,5 @@
+class wget {
+ package { "wget":
+ ensure => latest,
+ }
+}

0 comments on commit b1ea5ad

Please sign in to comment.