fix

armincerf · Jul 29, 2012 · abb1b74 · abb1b74
1 parent cefd49e
commit abb1b74
Show file tree

Hide file tree

Showing 101 changed files with 40 additions and 33 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,10 +7,10 @@
 [submodule "dotsync"]
 	path = dotsync
 	url = https://github.com/dotphiles/dotsync.git
-[submodule "zsh/dotzsh"]
-	path = zsh/dotzsh
+[submodule "shell/zsh/dotzsh"]
+	path = shell/zsh/dotzsh
 	url = https://github.com/dotphiles/dotzsh.git
-[submodule "vim/dotvim"]
-	path = vim/dotvim
+[submodule "editor/vim/dotvim"]
+	path = editor/vim/dotvim
 	url = https://github.com/dotphiles/dotvim.git
 
diff --git a/bootstrap/README.md → apps/bootstrap/README.md b/bootstrap/README.md → apps/bootstrap/README.md
diff --git a/bootstrap/fonts/Inconsolata-dz-Powerline.otf → ...tstrap/fonts/Inconsolata-dz-Powerline.otf b/bootstrap/fonts/Inconsolata-dz-Powerline.otf → ...tstrap/fonts/Inconsolata-dz-Powerline.otf
diff --git a/bootstrap/fonts/Menlo-Powerline.otf → apps/bootstrap/fonts/Menlo-Powerline.otf b/bootstrap/fonts/Menlo-Powerline.otf → apps/bootstrap/fonts/Menlo-Powerline.otf
diff --git a/bootstrap/fonts/mensch-Powerline.otf → apps/bootstrap/fonts/mensch-Powerline.otf b/bootstrap/fonts/mensch-Powerline.otf → apps/bootstrap/fonts/mensch-Powerline.otf
diff --git a/bootstrap/macports → apps/bootstrap/macports b/bootstrap/macports → apps/bootstrap/macports
diff --git a/bootstrap/osx → apps/bootstrap/osx b/bootstrap/osx → apps/bootstrap/osx
diff --git a/...strap/terminal/iterm2/solarized/README.md → ...strap/terminal/iterm2/solarized/README.md b/...strap/terminal/iterm2/solarized/README.md → ...strap/terminal/iterm2/solarized/README.md
diff --git a/...erm2/solarized/Solarized Dark.itermcolors → ...erm2/solarized/Solarized Dark.itermcolors b/...erm2/solarized/Solarized Dark.itermcolors → ...erm2/solarized/Solarized Dark.itermcolors
diff --git a/...rm2/solarized/Solarized Light.itermcolors → ...rm2/solarized/Solarized Light.itermcolors b/...rm2/solarized/Solarized Light.itermcolors → ...rm2/solarized/Solarized Light.itermcolors
diff --git a/...terminal/osx-terminal/solarized/README.md → ...terminal/osx-terminal/solarized/README.md b/...terminal/osx-terminal/solarized/README.md → ...terminal/osx-terminal/solarized/README.md
diff --git a/...al/solarized/Solarized Dark ansi.terminal → ...al/solarized/Solarized Dark ansi.terminal b/...al/solarized/Solarized Dark ansi.terminal → ...al/solarized/Solarized Dark ansi.terminal
diff --git a/...l/solarized/Solarized Light ansi.terminal → ...l/solarized/Solarized Light ansi.terminal b/...l/solarized/Solarized Light ansi.terminal → ...l/solarized/Solarized Light ansi.terminal
diff --git a/...rminal/solarized/xterm-256color/README.md → ...rminal/solarized/xterm-256color/README.md b/...rminal/solarized/xterm-256color/README.md → ...rminal/solarized/xterm-256color/README.md
diff --git a/...or/Solarized Dark xterm-256color.terminal → ...or/Solarized Dark xterm-256color.terminal b/...or/Solarized Dark xterm-256color.terminal → ...or/Solarized Dark xterm-256color.terminal
diff --git a/...r/Solarized Light xterm-256color.terminal → ...r/Solarized Light xterm-256color.terminal b/...r/Solarized Light xterm-256color.terminal → ...r/Solarized Light xterm-256color.terminal
diff --git a/...strap/terminal/putty/solarized/README.mkd → ...strap/terminal/putty/solarized/README.mkd b/...strap/terminal/putty/solarized/README.mkd → ...strap/terminal/putty/solarized/README.mkd
diff --git a/bootstrap/terminal/putty/solarized/dark.png → ...otstrap/terminal/putty/solarized/dark.png b/bootstrap/terminal/putty/solarized/dark.png → ...otstrap/terminal/putty/solarized/dark.png
diff --git a/bootstrap/terminal/putty/solarized/light.png → ...tstrap/terminal/putty/solarized/light.png b/bootstrap/terminal/putty/solarized/light.png → ...tstrap/terminal/putty/solarized/light.png
diff --git a/...rminal/putty/solarized/solarized_dark.reg → ...rminal/putty/solarized/solarized_dark.reg b/...rminal/putty/solarized/solarized_dark.reg → ...rminal/putty/solarized/solarized_dark.reg
diff --git a/...ty/solarized/solarized_dark_puttytray.txt → ...ty/solarized/solarized_dark_puttytray.txt b/...ty/solarized/solarized_dark_puttytray.txt → ...ty/solarized/solarized_dark_puttytray.txt
diff --git a/...minal/putty/solarized/solarized_light.reg → ...minal/putty/solarized/solarized_light.reg b/...minal/putty/solarized/solarized_light.reg → ...minal/putty/solarized/solarized_light.reg
diff --git a/...y/solarized/solarized_light_puttytray.txt → ...y/solarized/solarized_light_puttytray.txt b/...y/solarized/solarized_light_puttytray.txt → ...y/solarized/solarized_light_puttytray.txt
diff --git a/taskwarrior/README.md → apps/taskwarrior/README.md b/taskwarrior/README.md → apps/taskwarrior/README.md
diff --git a/...colors/solarized/solarized-dark-256.theme → ...colors/solarized/solarized-dark-256.theme b/...colors/solarized/solarized-dark-256.theme → ...colors/solarized/solarized-dark-256.theme
diff --git a/...olors/solarized/solarized-light-256.theme → ...olors/solarized/solarized-light-256.theme b/...olors/solarized/solarized-light-256.theme → ...olors/solarized/solarized-light-256.theme
diff --git a/taskwarrior/taskrc → apps/taskwarrior/taskrc b/taskwarrior/taskrc → apps/taskwarrior/taskrc
diff --git a/irssi/config → chat/irssi/config b/irssi/config → chat/irssi/config
diff --git a/irssi/keepnick → chat/irssi/keepnick b/irssi/keepnick → chat/irssi/keepnick
diff --git a/irssi/scripts/autorun/adv_windowlist.pl → chat/irssi/scripts/autorun/adv_windowlist.pl b/irssi/scripts/autorun/adv_windowlist.pl → chat/irssi/scripts/autorun/adv_windowlist.pl
diff --git a/irssi/scripts/autorun/hilightwin.pl → chat/irssi/scripts/autorun/hilightwin.pl b/irssi/scripts/autorun/hilightwin.pl → chat/irssi/scripts/autorun/hilightwin.pl
diff --git a/irssi/scripts/autorun/keepnick.pl → chat/irssi/scripts/autorun/keepnick.pl b/irssi/scripts/autorun/keepnick.pl → chat/irssi/scripts/autorun/keepnick.pl
diff --git a/irssi/scripts/autorun/screen_away.pl → chat/irssi/scripts/autorun/screen_away.pl b/irssi/scripts/autorun/screen_away.pl → chat/irssi/scripts/autorun/screen_away.pl
diff --git a/irssi/solarized-universal.theme → chat/irssi/solarized-universal.theme b/irssi/solarized-universal.theme → chat/irssi/solarized-universal.theme
diff --git a/irssi/zenburn.theme → chat/irssi/zenburn.theme b/irssi/zenburn.theme → chat/irssi/zenburn.theme
diff --git a/mysql/my.cnf → dev/mysql/my.cnf b/mysql/my.cnf → dev/mysql/my.cnf
diff --git a/python/README.md → dev/python/README.md b/python/README.md → dev/python/README.md
diff --git a/python/pythonrc → dev/python/pythonrc b/python/pythonrc → dev/python/pythonrc
diff --git a/ruby/README.md → dev/ruby/README.md b/ruby/README.md → dev/ruby/README.md
diff --git a/ruby/gemrc → dev/ruby/gemrc b/ruby/gemrc → dev/ruby/gemrc
diff --git a/ruby/irbrc → dev/ruby/irbrc b/ruby/irbrc → dev/ruby/irbrc
diff --git a/ruby/pryrc → dev/ruby/pryrc b/ruby/pryrc → dev/ruby/pryrc
diff --git a/ruby/railsrc → dev/ruby/railsrc b/ruby/railsrc → dev/ruby/railsrc
diff --git a/dotsyncrc b/dotsyncrc
@@ -13,38 +13,42 @@
 # dotfiles to symlink
 #
 # srcfile:dstfile
-# dstfile will be '.$srcfile' by default
+# dstfile will be '.$srcfile' by default (with path removed)
 #
 [files]
-##bin:bin
+# Uncomment examples below
+#bin:bin
 dotsyncrc
-##editor/editrc:.editrc
-##editor/fasdrc:.fasdrc
-##git/gitconfig:.gitconfig
-##git/gitignore:.gitignore
-##gnupg
-##grc
-##mercurial/hgrc:.hgrc
-##mercurial/hgignore:.hgignore
-##hushlogin
-##editor/inputrc:.inputrc
-##screen/screenrc:.screenrc
-##ssh
-##subversion
-##taskwarrior/task:.task
-##taskwarrior/taskrc:.taskrc
-##git/tigrc:.tigrc
-##tmux/tmux.conf:.tmux.conf
-##tmux/tmuxinator:.tmuxinator
-##python/pythonrc:.pythonrc
-##vim/dotvim:.vim
-##vim/vimrc:.vimrc
-##zsh/zlogin:.zlogin
-##zsh/zlogout:.zlogout
-##zsh/zprofile:.zprofile
-##zsh/dotzsh:.zsh
-##zsh/zshenv:.zshenv
-##zsh/zshrc:.zshrc
+#apps/taskwarrior/task
+#apps/taskwarrior/taskrc
+#dev/python/pythonrc
+#dev/ruby/irbrc
+#dev/ruby/pryrc
+#dev/ruby/gemrc
+#editor/editrc
+#editor/fasdrc
+#editor/inputrc
+#editor/vim/dotvim:.vim
+#editor/vim/vimrc
+#mux/screen/screenrc
+#mux/tmux/tmux.conf
+#mux/tmux/tmuxinator
+#sec/gnupg
+#sec/ssh
+#shell/grc
+#shell/hushlogin
+#shell/zsh/zlogin
+#shell/zsh/zlogout
+#shell/zsh/zprofile
+#shell/zsh/dotzsh
+#shell/zsh/zshenv
+#shell/zsh/zshrc
+#vcs/git/gitconfig
+#vcs/git/gitignore
+#vcs/git/tigrc
+#vcs/mercurial/hgrc
+#vcs/mercurial/hgignore
+#vcs/subversion
 [endfiles]
 
 # Hosts to sync

diff --git a/vim/README.md → editor/vim/README.md b/vim/README.md → editor/vim/README.md
diff --git a/vim/dotvim → editor/vim/dotvim b/vim/dotvim → editor/vim/dotvim
diff --git a/vim/fasdrc → editor/vim/fasdrc b/vim/fasdrc → editor/vim/fasdrc
diff --git a/vim/vimrc → editor/vim/vimrc b/vim/vimrc → editor/vim/vimrc
diff --git a/mutt/gmail → mail/gmail b/mutt/gmail → mail/gmail
diff --git a/mutt/.gitignore → mail/mutt/.gitignore b/mutt/.gitignore → mail/mutt/.gitignore
diff --git a/mutt/README.md → mail/mutt/README.md b/mutt/README.md → mail/mutt/README.md
diff --git a/mutt/certificates → mail/mutt/certificates b/mutt/certificates → mail/mutt/certificates
diff --git a/mutt/colors/solarized → mail/mutt/colors/solarized b/mutt/colors/solarized → mail/mutt/colors/solarized
diff --git a/mutt/colors/zenburn → mail/mutt/colors/zenburn b/mutt/colors/zenburn → mail/mutt/colors/zenburn
diff --git a/mutt/config/global → mail/mutt/config/global b/mutt/config/global → mail/mutt/config/global
diff --git a/mutt/config/pgp → mail/mutt/config/pgp b/mutt/config/pgp → mail/mutt/config/pgp
diff --git a/mutt/config/sidebar → mail/mutt/config/sidebar b/mutt/config/sidebar → mail/mutt/config/sidebar
diff --git a/mutt/config/smime → mail/mutt/config/smime b/mutt/config/smime → mail/mutt/config/smime
diff --git a/mutt/mailcap → mail/mutt/mailcap b/mutt/mailcap → mail/mutt/mailcap
diff --git a/mutt/smime/cacerts/ca-bundle.cer → mail/mutt/smime/cacerts/ca-bundle.cer b/mutt/smime/cacerts/ca-bundle.cer → mail/mutt/smime/cacerts/ca-bundle.cer
diff --git a/mutt/smime/certificates/.index → mail/mutt/smime/certificates/.index b/mutt/smime/certificates/.index → mail/mutt/smime/certificates/.index
diff --git a/mutt/smime/keys/.index → mail/mutt/smime/keys/.index b/mutt/smime/keys/.index → mail/mutt/smime/keys/.index
diff --git a/mutt/muttrc → mail/muttrc b/mutt/muttrc → mail/muttrc
diff --git a/mutt/offlineimaprc → mail/offlineimaprc b/mutt/offlineimaprc → mail/offlineimaprc
diff --git a/mutt/work → mail/work b/mutt/work → mail/work
diff --git a/screen/README.md → mux/screen/README.md b/screen/README.md → mux/screen/README.md
diff --git a/screen/screenrc → mux/screen/screenrc b/screen/screenrc → mux/screen/screenrc
diff --git a/tmux/README.md → mux/tmux/README.md b/tmux/README.md → mux/tmux/README.md
diff --git a/tmux/tmux.conf → mux/tmux/tmux.conf b/tmux/tmux.conf → mux/tmux/tmux.conf
diff --git a/tmux/tmuxinator/dotphiles.yml → mux/tmux/tmuxinator/dotphiles.yml b/tmux/tmuxinator/dotphiles.yml → mux/tmux/tmuxinator/dotphiles.yml
diff --git a/gnupg/README.md → sec/gnupg/README.md b/gnupg/README.md → sec/gnupg/README.md
diff --git a/gnupg/gpg-agent.conf → sec/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf → sec/gnupg/gpg-agent.conf
diff --git a/gnupg/gpg.conf → sec/gnupg/gpg.conf b/gnupg/gpg.conf → sec/gnupg/gpg.conf
diff --git a/ssh/README.md → sec/ssh/README.md b/ssh/README.md → sec/ssh/README.md
diff --git a/ssh/authorized_keys → sec/ssh/authorized_keys b/ssh/authorized_keys → sec/ssh/authorized_keys
diff --git a/ssh/config → sec/ssh/config b/ssh/config → sec/ssh/config
diff --git a/sec/ssh/environment-mac-mini b/sec/ssh/environment-mac-mini
@@ -0,0 +1,3 @@
+SSH_AUTH_SOCK=/tmp/ssh-QYq4yAA9l8zk/agent.3504; export SSH_AUTH_SOCK;
+SSH_AGENT_PID=3505; export SSH_AGENT_PID;
+echo Agent pid 3505;
diff --git a/ssh/master/.gitignore → sec/ssh/master/.gitignore b/ssh/master/.gitignore → sec/ssh/master/.gitignore
diff --git a/grc/README.md → shell/grc/README.md b/grc/README.md → shell/grc/README.md
diff --git a/grc/conf.nmap → shell/grc/conf.nmap b/grc/conf.nmap → shell/grc/conf.nmap
diff --git a/grc/conf.ps → shell/grc/conf.ps b/grc/conf.ps → shell/grc/conf.ps
diff --git a/grc/grc.conf → shell/grc/grc.conf b/grc/grc.conf → shell/grc/grc.conf
diff --git a/hushlogin/README.md → shell/hushlogin/README.md b/hushlogin/README.md → shell/hushlogin/README.md
diff --git a/hushlogin/hushlogin → shell/hushlogin/hushlogin b/hushlogin/hushlogin → shell/hushlogin/hushlogin
diff --git a/zsh/README.md → shell/zsh/README.md b/zsh/README.md → shell/zsh/README.md
diff --git a/zsh/dotzsh → shell/zsh/dotzsh b/zsh/dotzsh → shell/zsh/dotzsh
diff --git a/zsh/zlogin → shell/zsh/zlogin b/zsh/zlogin → shell/zsh/zlogin
diff --git a/zsh/zlogout → shell/zsh/zlogout b/zsh/zlogout → shell/zsh/zlogout
diff --git a/zsh/zprofile → shell/zsh/zprofile b/zsh/zprofile → shell/zsh/zprofile
diff --git a/zsh/zshenv → shell/zsh/zshenv b/zsh/zshenv → shell/zsh/zshenv
diff --git a/zsh/zshrc → shell/zsh/zshrc b/zsh/zshrc → shell/zsh/zshrc
diff --git a/git/README.md → vcs/git/README.md b/git/README.md → vcs/git/README.md
diff --git a/git/gitconfig → vcs/git/gitconfig b/git/gitconfig → vcs/git/gitconfig
diff --git a/git/gitignore → vcs/git/gitignore b/git/gitignore → vcs/git/gitignore
diff --git a/git/tigrc → vcs/git/tigrc b/git/tigrc → vcs/git/tigrc
diff --git a/mercurial/README.md → vcs/mercurial/README.md b/mercurial/README.md → vcs/mercurial/README.md
diff --git a/mercurial/hgignore → vcs/mercurial/hgignore b/mercurial/hgignore → vcs/mercurial/hgignore
diff --git a/mercurial/hgrc → vcs/mercurial/hgrc b/mercurial/hgrc → vcs/mercurial/hgrc
diff --git a/subversion/README.md → vcs/subversion/README.md b/subversion/README.md → vcs/subversion/README.md
diff --git a/subversion/config → vcs/subversion/config b/subversion/config → vcs/subversion/config
diff --git a/subversion/servers → vcs/subversion/servers b/subversion/servers → vcs/subversion/servers