From c45e80a8ebf470969f5d4bdf5947b53dffa04a29 Mon Sep 17 00:00:00 2001 From: Jianwei Han Date: Sat, 12 Jul 2014 23:34:23 +0800 Subject: [PATCH] Update puppet-dotfiles --- Puppetfile | 2 +- Puppetfile.lock | 4 +-- .../people/manifests/hanjianwei/applications.pp | 40 ++++++++-------------- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/Puppetfile b/Puppetfile index 31cd155..6156b63 100644 --- a/Puppetfile +++ b/Puppetfile @@ -59,4 +59,4 @@ github "xquartz", "1.1.1" github "osx", "2.7.0" github "property_list_key", "0.2.1", :repo => "glarizza/puppet-property_list_key" github "brewcask", "0.0.4.rc2", :repo => "hanjianwei/puppet-brewcask" -github "dotfiles", "0.0.2", :repo => "hanjianwei/puppet-dotfiles" +github "dotfiles", "0.0.5", :repo => "hanjianwei/puppet-dotfiles" diff --git a/Puppetfile.lock b/Puppetfile.lock index 8a504de..f10ef9e 100644 --- a/Puppetfile.lock +++ b/Puppetfile.lock @@ -86,7 +86,7 @@ GITHUBTARBALL GITHUBTARBALL remote: hanjianwei/puppet-dotfiles specs: - dotfiles (0.0.2) + dotfiles (0.0.5) GITHUBTARBALL remote: puppetlabs/puppetlabs-inifile @@ -107,7 +107,7 @@ DEPENDENCIES boxen (= 3.6.1) brewcask (= 0.0.4.rc2) dnsmasq (= 1.0.1) - dotfiles (= 0.0.2) + dotfiles (= 0.0.5) gcc (= 2.0.101) git (= 2.4.0) homebrew (= 1.9.4) diff --git a/modules/people/manifests/hanjianwei/applications.pp b/modules/people/manifests/hanjianwei/applications.pp index b600eec..16f4e56 100644 --- a/modules/people/manifests/hanjianwei/applications.pp +++ b/modules/people/manifests/hanjianwei/applications.pp @@ -69,35 +69,23 @@ class people::hanjianwei::applications { } # Apps configuration - class { 'dotfiles::tmux': - require => Package['tmux'], - } - - class { 'dotfiles::vim': - require => Package['vim'], - } - - class { 'dotfiles::emacs': - require => Package['emacs-mac'], - } - - class { 'dotfiles::vimperator': - require => Package['firefox'], - } - - class { 'dotfiles::keyremap4macbook': - require => Package['keyremap4macbook'], - } - - class { 'dotfiles::seil': - require => Package['seil'] - } + Package <| |> -> Dotfiles::Deploy <| |> osx_chsh { $boxen_user: shell => '/bin/zsh' } - include dotfiles::git - include dotfiles::zsh - include dotfiles::rubygems + dotfiles::deploy { ['atom', + 'bettertouchtool', + 'emacs', + 'git', + 'iterm2', + 'keyremap4macbook', + 'prezto', + 'seil', + 'tmux', + 'vim', + 'vimperator', + 'zsh']: + } } -- 1.8.5.3