Wed, 13 Aug 2014 10:07:37 -0400
Merge from default
--- a/.homedir-setup.rb +++ b/.homedir-setup.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # vim: et sts=2 sw=2 fdm=marker -# we don't yet have rbenv so keep safe for ruby 1.8 +# we don't yet have rbenv so keep safe for ruby 1.9 if `which git` == '' puts "please install git" @@ -9,7 +9,7 @@ if `which git` == '' end -# just checks and bails after each call +# just checks and bails after each call, output already in STDERR def do_cmds (*cmds) cmds.each do |cmd| puts "$ #{cmd}" @@ -20,9 +20,7 @@ end # oh-my-zsh {{{ - # i have a custom theme and the omz install complains about already - # having a directory there. remove, install, then revert my stuff - # out of hg + # some custom zsh files are already in .oh-my-zsh.cust if Dir.exists?('.oh-my-zsh/.git') puts "oh-my-zsh already installed" @@ -30,8 +28,7 @@ end puts "Installing oh-my-zsh..." do_cmds \ - 'git clone git://github.com/robbyrussell/oh-my-zsh.git .oh-my-zsh', - 'hg stat -dn0 -I .oh-my-zsh/ | xargs -0 hg revert' + 'git clone git://github.com/robbyrussell/oh-my-zsh.git .oh-my-zsh' end @@ -63,7 +60,7 @@ end do_cmds \ 'git clone https://github.com/sstephenson/rbenv.git .rbenv', 'git clone https://github.com/sstephenson/ruby-build.git .rbenv/plugins/ruby-build/' - + end # }}}
--- a/.minttyrc +++ b/.minttyrc @@ -1,6 +1,6 @@ ForegroundColour=171,171,171 BackgroundColour=0,0,0 -CursorColour=253,157,79 +CursorColour=240,240,240 Black=0,0,0 BoldBlack=52,52,52 Red=233,47,47 @@ -18,3 +18,11 @@ BoldCyan=107,243,230 White=171,171,171 BoldWhite=249,249,249 PgUpDnScroll=no +Font=DejaVu Sans Mono +FontHeight=10 +FontSmoothing=full +CursorType=block +CursorBlinks=no +Transparency=off +Columns=120 +Rows=40