Skip to content

Commit

Permalink
fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
fujimogn committed Oct 19, 2012
1 parent 191e6a9 commit 435d704
Show file tree
Hide file tree
Showing 13 changed files with 95 additions and 92 deletions.
2 changes: 2 additions & 0 deletions bin/homedir-fix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ if [ -d "${HOME}/.ssh" ]; then
[ -f ${HOME}/.ssh/known_hosts ] && chmod 644 ${HOME}/.ssh/known_hosts
find ${HOME}/.ssh/ -name "*_[dr]sa" -exec chmod 600 {} \;
find ${HOME}/.ssh/ -name "*_[dr]sa.pub" -exec chmod 644 {} \;
find ${HOME}/.ssh/ -name "identity.*" -exec chmod 600 {} \;
find ${HOME}/.ssh/ -name "identity.*.pub" -exec chmod 644 {} \;
fi

# ${HOME}/.tmp
Expand Down
3 changes: 3 additions & 0 deletions bin/osx-set-defaults
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ defaults write com.apple.Finder ShowRemovableMediaOnDesktop -int 1
# ネットワークで.DS_Storeを作らない
defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool true

# サードパーティのモニタでサブピクセルレンダリングする
defaults -currentHost write -globalDomain AppleFontSmoothing -int 2

killall Finder
killall SystemUIServer

Expand Down
46 changes: 46 additions & 0 deletions bin/skype
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/bin/sh

### check ostype
if [ ! `uname -s` == "Darwin" ]; then
echo "ERROR: only works with Mac OS X" >&2
exit 1
fi

### check app
app="/Applications/Skype.app/Contents/MacOS/Skype"
if [ ! -x ${app} ]; then
echo "ERROR: Skype.app does not exist." >&2
exit 1
fi

### perse options

help() {
echo "`basename $0` [ -h ] [ -u username ]"
echo " -h : display this text"
echo " -u : skype username"
}

[ $# -eq 0 ] && help && exit 1

while getopts "hu:" OPT; do
case $OPT in
h) help && exit ;;
u) user_name="$OPTARG";;
*) help && exit 1 ;;
esac
done

### check user

id ${user_name} > /dev/null 2>&1


### command

if [ $? -eq 0 ]; then
sudo -u ${user_name} ${app}
else
echo "ERROR: user ${user_name} does not exist." >&2
exit 1
fi
1 change: 1 addition & 0 deletions git/.gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@
token = db558a3cef4afdff338d057f373d1b5a


[heroku]
113 changes: 31 additions & 82 deletions os/darwin/AquaSKK/keymap.conf
Original file line number Diff line number Diff line change
@@ -1,105 +1,54 @@
# ======================================================================
# handle option
# ======================================================================

###
### keymap.conf
###


# ======================================================================
# event section
# ======================================================================

# : default
#
# SKK_JMODE ctrl::j
# SKK_ENTER group::hex::0x03,0x0a,0x0d||ctrl::m
# SKK_CANCEL ctrl::g||hex::0x1b
# SKK_BACKSPACE hex::0x08||ctrl::h
# SKK_DELETE hex::0x7f||ctrl::d
# SKK_TAB hex::0x09||ctrl::i
# SKK_PASTE ctrl::y
# SKK_LEFT hex::0x1c||ctrl::b||keycode::7b
# SKK_RIGHT hex::0x1d||ctrl::f||keycode::7c
# SKK_UP hex::0x1e||ctrl::a||keycode::7e
# SKK_DOWN hex::0x1f||ctrl::e||keycode::7d
# SKK_PING ctrl::l
# SKK_UNDO ctrl::/

SKK_JMODE ctrl::j
SKK_ENTER group::hex::0x03,0x0a,0x0d||ctrl::m
SKK_CANCEL ctrl::g||hex::0x1b
SKK_BACKSPACE hex::0x08||ctrl::h
SKK_DELETE hex::0x7f||ctrl::d
SKK_TAB hex::0x09||ctrl::i
SKK_PASTE ctrl::y
SKK_LEFT hex::0x1c||ctrl::b||keycode::7b
SKK_RIGHT hex::0x1d||ctrl::f||keycode::7c
SKK_UP hex::0x1e||ctrl::a||keycode::7e
SKK_DOWN hex::0x1f||ctrl::e||keycode::7d
SKK_PING ctrl::;
SKK_UNDO ctrl::/
SKK_JMODE ctrl::j
SKK_ENTER group::hex::0x03,0x0a,0x0d||ctrl::m
SKK_CANCEL ctrl::g||hex::0x1b
SKK_BACKSPACE hex::0x08||ctrl::h
SKK_DELETE hex::0x7f||ctrl::d
SKK_TAB hex::0x09||ctrl::i
SKK_PASTE ctrl::y
SKK_LEFT hex::0x1c||ctrl::b||keycode::7b
SKK_RIGHT hex::0x1d||ctrl::f||keycode::7c
SKK_UP hex::0x1e||ctrl::a||keycode::7e
SKK_DOWN hex::0x1f||ctrl::e||keycode::7d
SKK_PING ctrl::l
SKK_UNDO ctrl::/

# ======================================================================
# attribute section(for SKK_CHAR)
# ======================================================================

# : default
#
# ToggleKana q
# ToggleJisx0201Kana ctrl::q
# SwitchToAscii l
# SwitchToJisx0208Latin L

# EnterAbbrev /
# EnterJapanese Q
# NextCompletion .
# PrevCompletion ,
# NextCandidate hex::0x20||ctrl::n
# PrevCandidate x||ctrl::p
# RemoveTrigger X
ToggleKana q
ToggleJisx0201Kana ctrl::q
SwitchToAscii l
SwitchToJisx0208Latin L

# UpperCases group::A-K,M-P,R-Z
# Direct group::keycode::0x41,0x43,0x45,0x4b,0x4e,0x51-0x59,0x5b,0x5c,0x5f
# InputChars group::hex::0x20-0x7e
EnterAbbrev /
EnterJapanese Q
NextCompletion .
PrevCompletion ,
NextCandidate hex::0x20||ctrl::n
PrevCandidate x||ctrl::p
RemoveTrigger X

# CompConversion alt::hex::0x20||shift::hex::0x20
UpperCases group::A-K,M-P,R-Z
Direct group::keycode::0x41,0x43,0x45,0x4b,0x4e,0x51-0x59,0x5b,0x5c,0x5f
InputChars group::hex::0x20-0x7e

# <c-q>で全角カナ
# <c-s-q>で半角カナ
ToggleKana ctrl::q
ToggleJisx0201Kana shift::ctrl::q

# <c-l>で半角英数
# <c-s-l>で全角英数
SwitchToAscii ctrl::l
SwitchToJisx0208Latin shift::ctrl::l

EnterAbbrev /
EnterJapanese Q
NextCompletion .
PrevCompletion ,
NextCandidate hex::0x20||ctrl::n
PrevCandidate ctrl::x||ctrl::p
RemoveTrigger ctrl::X

UpperCases group::A-K,M-P,R-Z||+
Direct group::keycode::0x41,0x43,0x45,0x4b,0x4e,0x51-0x59,0x5b,0x5c,0x5f
InputChars group::hex::0x20-0x7e

CompConversion alt::hex::0x20||shift::hex::0x20
CompConversion alt::hex::0x20||shift::hex::0x20

# ======================================================================
# handle option
# ======================================================================

# : default
#
# AlwaysHandled group::keycode::0x66,0x68
# PseudoHandled ctrl::l||hex::0x1b

AlwaysHandled group::keycode::0x66,0x68
PseudoHandled hex::0x1b

AlwaysHandled group::keycode::0x66,0x68
PseudoHandled ctrl::l||hex::0x1b


Binary file modified os/darwin/iTerm2/com.googlecode.iterm2.plist
Binary file not shown.
1 change: 0 additions & 1 deletion ruby/ruby.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ cucumber
foreman
guard
haml
heroku
html2haml
jekyll
pry
Expand Down
8 changes: 5 additions & 3 deletions vim/.vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ if has('vim_starting')
call neobundle#rc(expand('~/.vim/bundle'))
endif

if $SUDO_USER == ''
NeoBundle 'Shougo/neobundle.vim'
NeoBundle 'Shougo/neocomplcache'
NeoBundle 'Shougo/neocomplcache-snippets-complete'
Expand All @@ -17,8 +16,6 @@ NeoBundle 'Shougo/vimshell'
NeoBundle 'Shougo/unite.vim'
NeoBundle 'h1mesuke/unite-outline'
NeoBundle 'tsukkee/unite-help'
endif

NeoBundle 'Shougo/vimproc'
NeoBundle 'Shougo/vim-vcs'
NeoBundle 'thinca/vim-ref'
Expand All @@ -44,6 +41,7 @@ NeoBundle 'nathanaelkane/vim-indent-guides'
NeoBundle 'Lokaltog/vim-powerline'
NeoBundle 'h1mesuke/vim-alignta'
NeoBundle 'vim-scripts/Align'
NeoBundle 'vim-scripts/sudo.vim'

NeoBundle 'vim-ruby/vim-ruby'
NeoBundle 'tpope/vim-rails'
Expand Down Expand Up @@ -807,6 +805,10 @@ autocmd FileType ruby,rake call EnableSmartchrRubyHash()
let g:syntastic_enable_signs=1
let g:syntastic_auto_loc_list=2

" }}}
" sudo.vim {{{
nnoremap ;es :e sudo:%<CR><C-^>:bd!
nnoremap ;ws :w sudo:%<CR>
" }}}
" vim-altr {{{

Expand Down
2 changes: 1 addition & 1 deletion vimperator/.vimperator/vimpr
Submodule vimpr updated 3 files
+1 −0 twittperator.js
+1 −0 twittperator/pong.tw
+1 −2 umihara.js
2 changes: 1 addition & 1 deletion vimperator/.vimperatorrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
""3.3pre
" $Date: 2012-09-15T07:50:15+0900$
" $Date: 2012-10-16T00:48:06+0900$



Expand Down
5 changes: 3 additions & 2 deletions zsh/.zsh/lib/export.darwin.zshenv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/zsh
#
# $File: ${ZDOTDIR}/lib/export.darwin.zshrc
# $Date: 2012-06-30T05:28:38+0900$
# $Date: 2012-10-02T02:16:44+0900$
# vim:filetype=zsh:tabstop=2:shiftwidth=2:fdm=marker:

# OSX GCC Installer
Expand Down Expand Up @@ -30,8 +30,9 @@ if [ -s "${HOME}/.pythonbrew/etc/bashrc" ]; then
fi

## gisty
if which gisty >/dev/null 2>&1 ; then
if [ -d "${HOME}/gist" ]; then
export GISTY_DIR=${HOME}/gist
export GISTY_ACCESS_TOKEN=08095b8bc8136b1b36d8107a904878f722d89ae1
export GISTY_SSL_CA=`ruby -ropenssl -e 'p OpenSSL::X509::DEFAULT_CERT_FILE'`
export GISTY_SSL_VERIFY="none"
fi
Expand Down
2 changes: 1 addition & 1 deletion zsh/.zsh/modules/zsh-completions
Submodule zsh-completions updated 2 files
+10 −0 src/_gem
+17 −9 src/_knife

0 comments on commit 435d704

Please sign in to comment.