From 41c881762403dc501310db4a6d5f0713cc984484 Mon Sep 17 00:00:00 2001 From: Tristaan Date: Mon, 16 Oct 2017 18:54:30 +0200 Subject: [PATCH] branched changes for homepc --- .i3/config | 29 +- .i3/custom.map | 10 +- .oh-my-zsh/.gitignore | 5 + .oh-my-zsh/.zsh-update | 1 - .oh-my-zsh/CONTRIBUTING.md | 123 ++ .oh-my-zsh/LICENSE.txt | 2 +- .oh-my-zsh/README.md | 6 +- .oh-my-zsh/lib/bzr.zsh | 0 .oh-my-zsh/lib/clipboard.zsh | 0 .oh-my-zsh/lib/compfix.zsh | 0 .oh-my-zsh/lib/completion.zsh | 2 +- .oh-my-zsh/lib/correction.zsh | 0 .oh-my-zsh/lib/diagnostics.zsh | 0 .oh-my-zsh/lib/directories.zsh | 0 .oh-my-zsh/lib/functions.zsh | 2 +- .oh-my-zsh/lib/git.zsh | 0 .oh-my-zsh/lib/grep.zsh | 0 .oh-my-zsh/lib/history.zsh | 0 .oh-my-zsh/lib/key-bindings.zsh | 0 .oh-my-zsh/lib/misc.zsh | 0 .oh-my-zsh/lib/nvm.zsh | 0 .oh-my-zsh/lib/prompt_info_functions.zsh | 0 .oh-my-zsh/lib/spectrum.zsh | 0 .oh-my-zsh/lib/termsupport.zsh | 0 .oh-my-zsh/lib/theme-and-appearance.zsh | 0 .oh-my-zsh/oh-my-zsh.sh | 0 .oh-my-zsh/plugins/adb/README.md | 0 .oh-my-zsh/plugins/adb/_adb | 5 + .oh-my-zsh/plugins/ant/ant.plugin.zsh | 0 .oh-my-zsh/plugins/apache2-macports/README.md | 0 .../apache2-macports.plugin.zsh | 0 .oh-my-zsh/plugins/arcanist/README.md | 0 .../plugins/arcanist/arcanist.plugin.zsh | 0 .oh-my-zsh/plugins/archlinux/README.md | 2 + .../plugins/archlinux/archlinux.plugin.zsh | 2 + .oh-my-zsh/plugins/asdf/README.md | 0 .oh-my-zsh/plugins/asdf/asdf.plugin.zsh | 0 .oh-my-zsh/plugins/autoenv/autoenv.plugin.zsh | 2 +- .../plugins/autojump/autojump.plugin.zsh | 0 .oh-my-zsh/plugins/autopep8/_autopep8 | 0 .../plugins/autopep8/autopep8.plugin.zsh | 0 .oh-my-zsh/plugins/aws/aws.plugin.zsh | 0 .oh-my-zsh/plugins/battery/battery.plugin.zsh | 2 +- .oh-my-zsh/plugins/bbedit/README.md | 0 .oh-my-zsh/plugins/bbedit/bbedit.plugin.zsh | 0 .oh-my-zsh/plugins/bgnotify/README.md | 0 .oh-my-zsh/plugins/boot2docker/README.md | 0 .oh-my-zsh/plugins/boot2docker/_boot2docker | 0 .oh-my-zsh/plugins/bower/_bower | 0 .oh-my-zsh/plugins/bower/bower.plugin.zsh | 0 .oh-my-zsh/plugins/branch/README.md | 0 .oh-my-zsh/plugins/branch/branch.plugin.zsh | 0 .oh-my-zsh/plugins/brew/brew.plugin.zsh | 0 .oh-my-zsh/plugins/bundler/README.md | 0 .oh-my-zsh/plugins/bundler/_bundler | 0 .oh-my-zsh/plugins/bundler/bundler.plugin.zsh | 0 .oh-my-zsh/plugins/bwana/bwana.plugin.zsh | 0 .oh-my-zsh/plugins/cabal/cabal.plugin.zsh | 0 .oh-my-zsh/plugins/cake/cake.plugin.zsh | 0 .../plugins/cakephp3/cakephp3.plugin.zsh | 0 .oh-my-zsh/plugins/capistrano/_capistrano | 0 .../plugins/capistrano/capistrano.plugin.zsh | 0 .oh-my-zsh/plugins/cargo/README.md | 0 .oh-my-zsh/plugins/cargo/_cargo | 0 .oh-my-zsh/plugins/cask/README.md | 12 +- .oh-my-zsh/plugins/cask/cask.plugin.zsh | 0 .oh-my-zsh/plugins/catimg/catimg.plugin.zsh | 0 .oh-my-zsh/plugins/catimg/colors.png | Bin .oh-my-zsh/plugins/celery/_celery | 0 .oh-my-zsh/plugins/chruby/chruby.plugin.zsh | 0 .oh-my-zsh/plugins/chucknorris/.gitignore | 0 .oh-my-zsh/plugins/chucknorris/LICENSE | 0 .../chucknorris/chucknorris.plugin.zsh | 0 .../plugins/chucknorris/fortunes/chucknorris | 0 .../plugins/cloudapp/cloudapp.plugin.zsh | 0 .oh-my-zsh/plugins/codeclimate/_codeclimate | 0 .oh-my-zsh/plugins/coffee/README.md | 0 .oh-my-zsh/plugins/coffee/_coffee | 0 .oh-my-zsh/plugins/coffee/coffee.plugin.zsh | 0 .oh-my-zsh/plugins/colemak/colemak-less | 0 .oh-my-zsh/plugins/colemak/colemak.plugin.zsh | 0 .../colored-man-pages.plugin.zsh | 0 .../plugins/colorize/colorize.plugin.zsh | 0 .../command-not-found.plugin.zsh | 0 .../common-aliases/common-aliases.plugin.zsh | 0 .../plugins/compleat/compleat.plugin.zsh | 0 .../plugins/composer/composer.plugin.zsh | 5 +- .oh-my-zsh/plugins/copybuffer/README.md | 0 .../plugins/copybuffer/copybuffer.plugin.zsh | 0 .oh-my-zsh/plugins/copydir/copydir.plugin.zsh | 0 .../plugins/copyfile/copyfile.plugin.zsh | 0 .oh-my-zsh/plugins/cp/README.md | 0 .oh-my-zsh/plugins/cp/cp.plugin.zsh | 0 .oh-my-zsh/plugins/cpanm/_cpanm | 0 .oh-my-zsh/plugins/debian/debian.plugin.zsh | 2 +- .../plugins/dircycle/dircycle.plugin.zsh | 0 .../plugins/dirhistory/dirhistory.plugin.zsh | 0 .../plugins/dirpersist/dirpersist.plugin.zsh | 0 .oh-my-zsh/plugins/django/django.plugin.zsh | 0 .oh-my-zsh/plugins/dnf/dnf.plugin.zsh | 0 .oh-my-zsh/plugins/docker-compose/README.md | 0 .../plugins/docker-compose/_docker-compose | 0 .../docker-compose/docker-compose.plugin.zsh | 0 .oh-my-zsh/plugins/docker/README.md | 0 .oh-my-zsh/plugins/docker/_docker | 1540 ++++++++++++----- .oh-my-zsh/plugins/dotenv/README.md | 34 + .oh-my-zsh/plugins/dotenv/dotenv.plugin.zsh | 10 + .oh-my-zsh/plugins/droplr/README.md | 2 +- .oh-my-zsh/plugins/droplr/droplr.plugin.zsh | 0 .oh-my-zsh/plugins/emacs/emacs.plugin.zsh | 0 .oh-my-zsh/plugins/ember-cli/README.md | 0 .../plugins/ember-cli/ember-cli.plugin.zsh | 0 .../emoji-clock/emoji-clock.plugin.zsh | 0 .oh-my-zsh/plugins/emoji/README.md | 0 .../plugins/emoji/emoji-char-definitions.zsh | 0 .oh-my-zsh/plugins/emoji/emoji-data.txt | 0 .oh-my-zsh/plugins/emoji/emoji.plugin.zsh | 0 .oh-my-zsh/plugins/emoji/update_emoji.pl | 0 .oh-my-zsh/plugins/emotty/emotty.plugin.zsh | 0 .../plugins/emotty/emotty_emoji_set.zsh | 0 .../plugins/emotty/emotty_floral_set.zsh | 0 .oh-my-zsh/plugins/emotty/emotty_love_set.zsh | 0 .../plugins/emotty/emotty_nature_set.zsh | 0 .../plugins/emotty/emotty_stellar_set.zsh | 0 .../plugins/emotty/emotty_zodiac_set.zsh | 0 .../plugins/encode64/encode64.plugin.zsh | 0 .oh-my-zsh/plugins/extract/README.md | 0 .oh-my-zsh/plugins/extract/_extract | 0 .oh-my-zsh/plugins/extract/extract.plugin.zsh | 0 .oh-my-zsh/plugins/fabric/_fab | 0 .oh-my-zsh/plugins/fabric/fabric.plugin.zsh | 0 .oh-my-zsh/plugins/fancy-ctrl-z/README.md | 0 .../fancy-ctrl-z/fancy-ctrl-z.plugin.zsh | 0 .oh-my-zsh/plugins/fasd/fasd.plugin.zsh | 0 .../plugins/fastfile/fastfile.plugin.zsh | 0 .oh-my-zsh/plugins/fbterm/fbterm.plugin.zsh | 0 .oh-my-zsh/plugins/fedora/README.md | 0 .oh-my-zsh/plugins/fedora/fedora.plugin.zsh | 0 .../plugins/firewalld/firewalld.plugin.zsh | 0 .oh-my-zsh/plugins/firewalld/readme.md | 0 .oh-my-zsh/plugins/forklift/README.md | 0 .../plugins/forklift/forklift.plugin.zsh | 0 .oh-my-zsh/plugins/fossil/README.md | 0 .oh-my-zsh/plugins/fossil/fossil.plugin.zsh | 0 .oh-my-zsh/plugins/frontend-search/README.md | 0 .../frontend-search/_frontend-search.sh | 0 .../frontend-search.plugin.zsh | 0 .oh-my-zsh/plugins/gas/_gas | 0 .oh-my-zsh/plugins/gb/README.md | 0 .oh-my-zsh/plugins/gb/_gb | 0 .oh-my-zsh/plugins/geeknote/README.md | 0 .oh-my-zsh/plugins/geeknote/_geeknote | 0 .../plugins/geeknote/geeknote.plugin.zsh | 0 .oh-my-zsh/plugins/gem/_gem | 0 .oh-my-zsh/plugins/gem/gem.plugin.zsh | 0 .oh-my-zsh/plugins/git-extras/README.md | 0 .../plugins/git-extras/git-extras.plugin.zsh | 0 .../git-flow-avh/git-flow-avh.plugin.zsh | 0 .oh-my-zsh/plugins/git-flow/README.md | 0 .../plugins/git-flow/git-flow.plugin.zsh | 0 .../git-hubflow/git-hubflow.plugin.zsh | 0 .../plugins/git-prompt/git-prompt.plugin.zsh | 0 .oh-my-zsh/plugins/git-prompt/gitstatus.py | 0 .../git-remote-branch.plugin.zsh | 0 .oh-my-zsh/plugins/git/README.md | 0 .oh-my-zsh/plugins/git/git.plugin.zsh | 1 + .oh-my-zsh/plugins/gitfast/_git | 0 .../plugins/gitfast/git-completion.bash | 0 .oh-my-zsh/plugins/gitfast/git-prompt.sh | 0 .oh-my-zsh/plugins/gitfast/gitfast.plugin.zsh | 0 .oh-my-zsh/plugins/github/README.md | 0 .oh-my-zsh/plugins/github/_hub | 0 .oh-my-zsh/plugins/github/github.plugin.zsh | 0 .../plugins/gitignore/gitignore.plugin.zsh | 0 .oh-my-zsh/plugins/glassfish/_asadmin | 0 .../plugins/glassfish/glassfish.plugin.zsh | 0 .oh-my-zsh/plugins/globalias/README.md | 0 .../plugins/globalias/globalias.plugin.zsh | 0 .../plugins/gnu-utils/gnu-utils.plugin.zsh | 2 +- .oh-my-zsh/plugins/golang/golang.plugin.zsh | 0 .../plugins/golang/templates/package.txt | 0 .../plugins/golang/templates/search.txt | 0 .../plugins/gpg-agent/gpg-agent.plugin.zsh | 0 .oh-my-zsh/plugins/gradle/gradle.plugin.zsh | 100 +- .oh-my-zsh/plugins/grails/grails.plugin.zsh | 0 .oh-my-zsh/plugins/grunt/grunt.plugin.zsh | 0 .oh-my-zsh/plugins/gulp/gulp.plugin.zsh | 0 .oh-my-zsh/plugins/heroku/_heroku | 7 +- .../history-substring-search/README.md | 0 .../history-substring-search.plugin.zsh | 0 .../history-substring-search.zsh | 2 +- .oh-my-zsh/plugins/history/README.md | 0 .oh-my-zsh/plugins/history/history.plugin.zsh | 0 .oh-my-zsh/plugins/httpie/README.md | 0 .oh-my-zsh/plugins/httpie/httpie.plugin.zsh | 0 .oh-my-zsh/plugins/iwhois/iwhois.plugin.zsh | 0 .../plugins/jake-node/jake-node.plugin.zsh | 0 .oh-my-zsh/plugins/jhbuild/README.md | 0 .oh-my-zsh/plugins/jhbuild/jhbuild.plugin.zsh | 0 .oh-my-zsh/plugins/jira/README.md | 0 .oh-my-zsh/plugins/jira/_jira | 0 .oh-my-zsh/plugins/jira/jira.plugin.zsh | 0 .oh-my-zsh/plugins/jruby/jruby.plugin.zsh | 0 .oh-my-zsh/plugins/jsontools/README.md | 0 .../plugins/jsontools/jsontools.plugin.zsh | 0 .oh-my-zsh/plugins/jump/jump.plugin.zsh | 0 .oh-my-zsh/plugins/kate/kate.plugin.zsh | 0 .oh-my-zsh/plugins/kitchen/_kitchen | 0 .oh-my-zsh/plugins/knife/_knife | 0 .../plugins/knife_ssh/knife_ssh.plugin.zsh | 0 .oh-my-zsh/plugins/kubectl/kubectl.plugin.zsh | 0 .oh-my-zsh/plugins/laravel/_artisan | 0 .oh-my-zsh/plugins/laravel/laravel.plugin.zsh | 0 .../plugins/laravel4/laravel4.plugin.zsh | 0 .../plugins/laravel5/laravel5.plugin.zsh | 0 .oh-my-zsh/plugins/last-working-dir/README.md | 0 .../last-working-dir.plugin.zsh | 0 .oh-my-zsh/plugins/lein/lein.plugin.zsh | 0 .../plugins/lighthouse/lighthouse.plugin.zsh | 0 .oh-my-zsh/plugins/lol/lol.plugin.zsh | 0 .oh-my-zsh/plugins/macports/_port | 0 .../plugins/macports/macports.plugin.zsh | 0 .oh-my-zsh/plugins/man/man.zsh | 0 .oh-my-zsh/plugins/marked2/README.md | 0 .oh-my-zsh/plugins/marked2/marked2.plugin.zsh | 0 .oh-my-zsh/plugins/mercurial/README.md | 0 .../plugins/mercurial/mercurial.plugin.zsh | 0 .oh-my-zsh/plugins/meteor/README.md | 0 .oh-my-zsh/plugins/meteor/_meteor | 0 .oh-my-zsh/plugins/meteor/meteor.plugin.zsh | 0 .oh-my-zsh/plugins/mix-fast/README.md | 0 .../plugins/mix-fast/mix-fast.plugin.zsh | 0 .oh-my-zsh/plugins/mix/_mix | 3 + .oh-my-zsh/plugins/mosh/mosh.plugin.zsh | 0 .oh-my-zsh/plugins/mvn/README.md | 0 .oh-my-zsh/plugins/mvn/mvn.plugin.zsh | 187 +- .../mysql-macports/mysql-macports.plugin.zsh | 0 .oh-my-zsh/plugins/nanoc/_nanoc | 0 .oh-my-zsh/plugins/nanoc/nanoc.plugin.zsh | 0 .oh-my-zsh/plugins/ng/README.md | 0 .oh-my-zsh/plugins/ng/ng.plugin.zsh | 0 .oh-my-zsh/plugins/nmap/README.md | 0 .oh-my-zsh/plugins/nmap/nmap.plugin.zsh | 0 .oh-my-zsh/plugins/node/node.plugin.zsh | 0 .oh-my-zsh/plugins/nomad/README.md | 0 .oh-my-zsh/plugins/nomad/_nomad | 0 .oh-my-zsh/plugins/npm/npm.plugin.zsh | 0 .oh-my-zsh/plugins/nvm/_nvm | 0 .oh-my-zsh/plugins/nvm/nvm.plugin.zsh | 0 .oh-my-zsh/plugins/nyan/nyan.plugin.zsh | 0 .oh-my-zsh/plugins/osx/README.md | 0 .oh-my-zsh/plugins/osx/osx.plugin.zsh | 29 +- .oh-my-zsh/plugins/pass/_pass | 0 .oh-my-zsh/plugins/paver/paver.plugin.zsh | 0 .oh-my-zsh/plugins/pep8/_pep8 | 0 .../plugins/per-directory-history/README.md | 0 .../per-directory-history.zsh | 0 .oh-my-zsh/plugins/perl/perl.plugin.zsh | 0 .oh-my-zsh/plugins/perms/README.md | 0 .oh-my-zsh/plugins/perms/perms.plugin.zsh | 0 .oh-my-zsh/plugins/phing/phing.plugin.zsh | 0 .oh-my-zsh/plugins/pip/_pip | 0 .oh-my-zsh/plugins/pip/pip.plugin.zsh | 0 .oh-my-zsh/plugins/pj/README.md | 0 .oh-my-zsh/plugins/pj/pj.plugin.zsh | 0 .oh-my-zsh/plugins/pod/_pod | 0 .../plugins/postgres/postgres.plugin.zsh | 0 .oh-my-zsh/plugins/pow/pow.plugin.zsh | 0 .oh-my-zsh/plugins/powder/_powder | 0 .oh-my-zsh/plugins/powify/_powify | 0 .../plugins/profiles/profiles.plugin.zsh | 0 .oh-my-zsh/plugins/pyenv/pyenv.plugin.zsh | 0 .oh-my-zsh/plugins/pylint/_pylint | 0 .oh-my-zsh/plugins/pylint/pylint.plugin.zsh | 0 .oh-my-zsh/plugins/python/_python | 0 .oh-my-zsh/plugins/python/python.plugin.zsh | 0 .oh-my-zsh/plugins/rails/_rails | 0 .oh-my-zsh/plugins/rails/rails.plugin.zsh | 0 .oh-my-zsh/plugins/rake-fast/README.md | 0 .../plugins/rake-fast/rake-fast.plugin.zsh | 0 .oh-my-zsh/plugins/rake/rake.plugin.zsh | 0 .../plugins/rand-quote/rand-quote.plugin.zsh | 0 .oh-my-zsh/plugins/rbenv/rbenv.plugin.zsh | 0 .oh-my-zsh/plugins/rbfu/rbfu.plugin.zsh | 0 .oh-my-zsh/plugins/react-native/README.md | 35 +- .oh-my-zsh/plugins/react-native/_react-native | 17 +- .../react-native/react-native.plugin.zsh | 9 +- .oh-my-zsh/plugins/rebar/_rebar | 0 .oh-my-zsh/plugins/redis-cli/_redis-cli | 0 .oh-my-zsh/plugins/repo/README.md | 0 .oh-my-zsh/plugins/repo/_repo | 0 .oh-my-zsh/plugins/repo/repo.plugin.zsh | 0 .oh-my-zsh/plugins/rsync/rsync.plugin.zsh | 0 .oh-my-zsh/plugins/ruby/ruby.plugin.zsh | 0 .oh-my-zsh/plugins/rust/_rust | 0 .oh-my-zsh/plugins/rvm/rvm.plugin.zsh | 0 .../plugins/safe-paste/safe-paste.plugin.zsh | 0 .oh-my-zsh/plugins/sbt/_sbt | 0 .oh-my-zsh/plugins/sbt/sbt.plugin.zsh | 0 .oh-my-zsh/plugins/scala/_scala | 4 +- .oh-my-zsh/plugins/scd/README.md | 0 .oh-my-zsh/plugins/scd/scd.plugin.zsh | 0 .oh-my-zsh/plugins/screen/screen.plugin.zsh | 0 .oh-my-zsh/plugins/scw/README.md | 0 .oh-my-zsh/plugins/scw/_scw | 0 .oh-my-zsh/plugins/sfffe/sfffe.plugin.zsh | 0 .oh-my-zsh/plugins/shrink-path/README.md | 0 .../shrink-path/shrink-path.plugin.zsh | 0 .../plugins/singlechar/singlechar.plugin.zsh | 0 .oh-my-zsh/plugins/spring/README.md | 0 .oh-my-zsh/plugins/spring/_spring | 0 .oh-my-zsh/plugins/sprunge/sprunge.plugin.zsh | 0 .oh-my-zsh/plugins/ssh-agent/README.md | 0 .../plugins/ssh-agent/ssh-agent.plugin.zsh | 0 .oh-my-zsh/plugins/stack/stack.plugin.zsh | 0 .oh-my-zsh/plugins/sublime/README.md | 0 .oh-my-zsh/plugins/sublime/sublime.plugin.zsh | 0 .oh-my-zsh/plugins/sudo/sudo.plugin.zsh | 0 .oh-my-zsh/plugins/supervisor/_supervisorctl | 0 .oh-my-zsh/plugins/supervisor/_supervisord | 0 .../plugins/supervisor/supervisor.plugin.zsh | 0 .oh-my-zsh/plugins/suse/suse.plugin.zsh | 4 +- .../svn-fast-info/svn-fast-info.plugin.zsh | 0 .oh-my-zsh/plugins/svn/README.md | 0 .oh-my-zsh/plugins/svn/svn.plugin.zsh | 0 .oh-my-zsh/plugins/swiftpm/README.md | 22 + .oh-my-zsh/plugins/swiftpm/swiftpm.plugin.zsh | 8 + .oh-my-zsh/plugins/symfony/symfony.plugin.zsh | 0 .../plugins/symfony2/symfony2.plugin.zsh | 0 .../systemadmin/systemadmin.plugin.zsh | 0 .oh-my-zsh/plugins/systemd/systemd.plugin.zsh | 0 .oh-my-zsh/plugins/taskwarrior/README.md | 0 .oh-my-zsh/plugins/taskwarrior/_task | 0 .../taskwarrior/taskwarrior.plugin.zsh | 0 .../terminalapp/terminalapp.plugin.zsh | 0 .oh-my-zsh/plugins/terminitor/_terminitor | 0 .oh-my-zsh/plugins/terraform/README.md | 0 .oh-my-zsh/plugins/terraform/_terraform | 2 +- .oh-my-zsh/plugins/textastic/README.md | 0 .../plugins/textastic/textastic.plugin.zsh | 0 .../plugins/textmate/textmate.plugin.zsh | 0 .oh-my-zsh/plugins/thefuck/README.md | 0 .oh-my-zsh/plugins/thefuck/thefuck.plugin.zsh | 0 .oh-my-zsh/plugins/themes/_theme | 0 .oh-my-zsh/plugins/themes/themes.plugin.zsh | 0 .oh-my-zsh/plugins/thor/_thor | 0 .oh-my-zsh/plugins/tig/README.md | 0 .oh-my-zsh/plugins/tig/tig.plugin.zsh | 0 .oh-my-zsh/plugins/tmux-cssh/_tmux-cssh | 0 .oh-my-zsh/plugins/tmux/tmux.extra.conf | 0 .oh-my-zsh/plugins/tmux/tmux.only.conf | 0 .oh-my-zsh/plugins/tmux/tmux.plugin.zsh | 0 .oh-my-zsh/plugins/tmuxinator/_tmuxinator | 0 .oh-my-zsh/plugins/torrent/torrent.plugin.zsh | 0 .oh-my-zsh/plugins/tugboat/_tugboat | 0 .oh-my-zsh/plugins/ubuntu/readme.md | 2 +- .oh-my-zsh/plugins/ubuntu/ubuntu.plugin.zsh | 4 +- .../plugins/urltools/urltools.plugin.zsh | 0 .oh-my-zsh/plugins/vagrant/_vagrant | 0 .oh-my-zsh/plugins/vault/README.md | 0 .oh-my-zsh/plugins/vault/_vault | 0 .oh-my-zsh/plugins/vi-mode/README.md | 0 .oh-my-zsh/plugins/vi-mode/vi-mode.plugin.zsh | 0 .oh-my-zsh/plugins/vim-interaction/README.md | 0 .../vim-interaction.plugin.zsh | 0 .../plugins/virtualenv/virtualenv.plugin.zsh | 0 .../virtualenvwrapper.plugin.zsh | 0 .oh-my-zsh/plugins/vundle/vundle.plugin.zsh | 0 .oh-my-zsh/plugins/wakeonlan/README | 0 .oh-my-zsh/plugins/wakeonlan/_wake | 0 .../plugins/wakeonlan/wakeonlan.plugin.zsh | 0 .oh-my-zsh/plugins/wd/LICENSE | 0 .oh-my-zsh/plugins/wd/README.md | 0 .oh-my-zsh/plugins/wd/_wd.sh | 0 .oh-my-zsh/plugins/wd/wd.plugin.zsh | 0 .../plugins/web-search/web-search.plugin.zsh | 2 + .oh-my-zsh/plugins/wp-cli/README.md | 0 .oh-my-zsh/plugins/wp-cli/wp-cli.plugin.zsh | 0 .oh-my-zsh/plugins/xcode/README.md | 0 .oh-my-zsh/plugins/xcode/_xcselv | 0 .oh-my-zsh/plugins/xcode/xcode.plugin.zsh | 0 .oh-my-zsh/plugins/yarn/yarn.plugin.zsh | 81 + .oh-my-zsh/plugins/yii/yii.plugin.zsh | 0 .oh-my-zsh/plugins/yii2/README.md | 0 .oh-my-zsh/plugins/yii2/yii2.plugin.zsh | 0 .oh-my-zsh/plugins/yum/yum.plugin.zsh | 0 .oh-my-zsh/plugins/z/Makefile | 0 .oh-my-zsh/plugins/z/README | 2 +- .oh-my-zsh/plugins/z/z.1 | 2 +- .oh-my-zsh/plugins/z/z.plugin.zsh | 0 .oh-my-zsh/plugins/z/z.sh | 0 .oh-my-zsh/plugins/zeus/README.md | 0 .oh-my-zsh/plugins/zeus/_zeus | 0 .oh-my-zsh/plugins/zeus/zeus.plugin.zsh | 0 .../.config/znt/README.txt | 0 .../.config/znt/n-aliases.conf | 0 .../.config/znt/n-cd.conf | 0 .../.config/znt/n-env.conf | 0 .../.config/znt/n-functions.conf | 0 .../.config/znt/n-history.conf | 0 .../.config/znt/n-kill.conf | 0 .../.config/znt/n-list.conf | 0 .../.config/znt/n-options.conf | 0 .../.config/znt/n-panelize.conf | 0 .../plugins/zsh-navigation-tools/LICENSE | 0 .oh-my-zsh/plugins/zsh-navigation-tools/NEWS | 0 .../plugins/zsh-navigation-tools/README.md | 0 .../plugins/zsh-navigation-tools/_n-kill | 0 .../plugins/zsh-navigation-tools/n-aliases | 0 .oh-my-zsh/plugins/zsh-navigation-tools/n-cd | 0 .oh-my-zsh/plugins/zsh-navigation-tools/n-env | 0 .../plugins/zsh-navigation-tools/n-functions | 0 .../plugins/zsh-navigation-tools/n-help | 0 .../plugins/zsh-navigation-tools/n-history | 0 .../plugins/zsh-navigation-tools/n-kill | 0 .../plugins/zsh-navigation-tools/n-list | 0 .../plugins/zsh-navigation-tools/n-list-draw | 0 .../plugins/zsh-navigation-tools/n-list-input | 0 .../plugins/zsh-navigation-tools/n-options | 0 .../plugins/zsh-navigation-tools/n-panelize | 0 .../zsh-navigation-tools/znt-cd-widget | 0 .../zsh-navigation-tools/znt-history-widget | 0 .../zsh-navigation-tools/znt-kill-widget | 0 .../zsh-navigation-tools/znt-usetty-wrapper | 0 .../plugins/zsh_reload/zsh_reload.plugin.zsh | 0 .oh-my-zsh/templates/zshrc.zsh-template | 0 .oh-my-zsh/themes/3den.zsh-theme | 7 + .oh-my-zsh/themes/Soliah.zsh-theme | 87 + .oh-my-zsh/themes/adben.zsh-theme | 114 ++ .oh-my-zsh/themes/af-magic.zsh-theme | 33 + .oh-my-zsh/themes/afowler.zsh-theme | 10 + .oh-my-zsh/themes/agnoster.zsh-theme | 228 +++ .oh-my-zsh/themes/alanpeabody.zsh-theme | 28 + .oh-my-zsh/themes/amuse.zsh-theme | 29 + .oh-my-zsh/themes/apple.zsh-theme | 28 + .oh-my-zsh/themes/arrow.zsh-theme | 14 + .oh-my-zsh/themes/aussiegeek.zsh-theme | 8 + .oh-my-zsh/themes/avit.zsh-theme | 110 ++ .oh-my-zsh/themes/awesomepanda.zsh-theme | 16 + .oh-my-zsh/themes/bira.zsh-theme | 30 + .oh-my-zsh/themes/blinks.zsh-theme | 30 + .oh-my-zsh/themes/bureau.zsh-theme | 123 ++ .oh-my-zsh/themes/candy-kingdom.zsh-theme | 30 + .oh-my-zsh/themes/candy.zsh-theme | 7 + .oh-my-zsh/themes/clean.zsh-theme | 14 + .oh-my-zsh/themes/cloud.zsh-theme | 10 + .oh-my-zsh/themes/crcandy.zsh-theme | 8 + .oh-my-zsh/themes/crunch.zsh-theme | 43 + .oh-my-zsh/themes/cypher.zsh-theme | 4 + .oh-my-zsh/themes/dallas.zsh-theme | 32 + .oh-my-zsh/themes/darkblood.zsh-theme | 9 + .oh-my-zsh/themes/daveverwer.zsh-theme | 7 + .oh-my-zsh/themes/dieter.zsh-theme | 56 + .oh-my-zsh/themes/dogenpunk.zsh-theme | 79 + .oh-my-zsh/themes/dpoggi.zsh-theme | 14 + .oh-my-zsh/themes/dst.zsh-theme | 16 + .oh-my-zsh/themes/dstufft.zsh-theme | 19 + .oh-my-zsh/themes/duellj.zsh-theme | 7 + .oh-my-zsh/themes/eastwood.zsh-theme | 23 + .oh-my-zsh/themes/edvardm.zsh-theme | 6 + .oh-my-zsh/themes/emotty.zsh-theme | 99 ++ .oh-my-zsh/themes/essembeh.zsh-theme | 30 + .oh-my-zsh/themes/evan.zsh-theme | 2 + .oh-my-zsh/themes/example.zsh-theme | 5 + .oh-my-zsh/themes/fino-time.zsh-theme | 39 + .oh-my-zsh/themes/fino.zsh-theme | 43 + .oh-my-zsh/themes/fishy.zsh-theme | 29 + .oh-my-zsh/themes/flazz.zsh-theme | 19 + .oh-my-zsh/themes/fletcherm.zsh-theme | 12 + .oh-my-zsh/themes/fox.zsh-theme | 9 + .oh-my-zsh/themes/frisk.zsh-theme | 12 + .oh-my-zsh/themes/frontcube.zsh-theme | 12 + .oh-my-zsh/themes/funky.zsh-theme | 14 + .oh-my-zsh/themes/fwalch.zsh-theme | 6 + .oh-my-zsh/themes/gallifrey.zsh-theme | 8 + .oh-my-zsh/themes/gallois.zsh-theme | 23 + .oh-my-zsh/themes/garyblessington.zsh-theme | 6 + .oh-my-zsh/themes/gentoo.zsh-theme | 8 + .oh-my-zsh/themes/geoffgarside.zsh-theme | 5 + .oh-my-zsh/themes/gianu.zsh-theme | 6 + .oh-my-zsh/themes/gnzh.zsh-theme | 50 + .oh-my-zsh/themes/gozilla.zsh-theme | 15 + .oh-my-zsh/themes/half-life.zsh-theme | 96 + .oh-my-zsh/themes/humza.zsh-theme | 26 + .oh-my-zsh/themes/imajes.zsh-theme | 5 + .oh-my-zsh/themes/intheloop.zsh-theme | 23 + .oh-my-zsh/themes/itchy.zsh-theme | 18 + .oh-my-zsh/themes/jaischeema.zsh-theme | 16 + .oh-my-zsh/themes/jbergantine.zsh-theme | 6 + .oh-my-zsh/themes/jispwoso.zsh-theme | 10 + .oh-my-zsh/themes/jnrowe.zsh-theme | 38 + .oh-my-zsh/themes/jonathan.zsh-theme | 153 ++ .oh-my-zsh/themes/josh.zsh-theme | 43 + .oh-my-zsh/themes/jreese.zsh-theme | 16 + .oh-my-zsh/themes/jtriley.zsh-theme | 8 + .oh-my-zsh/themes/juanghurtado.zsh-theme | 41 + .oh-my-zsh/themes/junkfood.zsh-theme | 30 + .oh-my-zsh/themes/kafeitu.zsh-theme | 6 + .oh-my-zsh/themes/kardan.zsh-theme | 12 + .oh-my-zsh/themes/kennethreitz.zsh-theme | 15 + .oh-my-zsh/themes/kiwi.zsh-theme | 12 + .oh-my-zsh/themes/kolo.zsh-theme | 22 + .oh-my-zsh/themes/kphoen.zsh-theme | 43 + .oh-my-zsh/themes/lambda.zsh-theme | 6 + .oh-my-zsh/themes/linuxonly.zsh-theme | 79 + .oh-my-zsh/themes/lukerandall.zsh-theme | 24 + .oh-my-zsh/themes/macovsky-ruby.zsh-theme | 15 + .oh-my-zsh/themes/macovsky.zsh-theme | 14 + .oh-my-zsh/themes/maran.zsh-theme | 6 + .oh-my-zsh/themes/mgutz.zsh-theme | 6 + .oh-my-zsh/themes/mh.zsh-theme | 24 + .oh-my-zsh/themes/michelebologna.zsh-theme | 75 + .oh-my-zsh/themes/mikeh.zsh-theme | 21 + .oh-my-zsh/themes/miloshadzic.zsh-theme | 8 + .oh-my-zsh/themes/minimal.zsh-theme | 24 + .oh-my-zsh/themes/mira.zsh-theme | 29 + .oh-my-zsh/themes/mortalscumbag.zsh-theme | 59 + .oh-my-zsh/themes/mrtazz.zsh-theme | 7 + .oh-my-zsh/themes/murilasso.zsh-theme | 14 + .oh-my-zsh/themes/muse.zsh-theme | 33 + .oh-my-zsh/themes/nanotech.zsh-theme | 7 + .oh-my-zsh/themes/nebirhos.zsh-theme | 21 + .oh-my-zsh/themes/nicoulaj.zsh-theme | 43 + .oh-my-zsh/themes/norm.zsh-theme | 4 + .oh-my-zsh/themes/obraun.zsh-theme | 11 + .oh-my-zsh/themes/peepcode.zsh-theme | 44 + .oh-my-zsh/themes/philips.zsh-theme | 14 + .oh-my-zsh/themes/pmcgee.zsh-theme | 16 + .oh-my-zsh/themes/pure.zsh-theme | 10 + .oh-my-zsh/themes/pygmalion.zsh-theme | 34 + .oh-my-zsh/themes/re5et.zsh-theme | 15 + .oh-my-zsh/themes/refined.zsh-theme | 106 ++ .oh-my-zsh/themes/rgm.zsh-theme | 8 + .oh-my-zsh/themes/risto.zsh-theme | 6 + .oh-my-zsh/themes/rixius.zsh-theme | 21 + .oh-my-zsh/themes/rkj-repos.zsh-theme | 36 + .oh-my-zsh/themes/rkj.zsh-theme | 9 + .oh-my-zsh/themes/robbyrussell.zsh-theme | 7 + .oh-my-zsh/themes/sammy.zsh-theme | 6 + .oh-my-zsh/themes/simonoff.zsh-theme | 138 ++ .oh-my-zsh/themes/simple.zsh-theme | 6 + .oh-my-zsh/themes/skaro.zsh-theme | 7 + .oh-my-zsh/themes/smt.zsh-theme | 86 + .oh-my-zsh/themes/sonicradish.zsh-theme | 37 + .oh-my-zsh/themes/sorin.zsh-theme | 42 + .oh-my-zsh/themes/sporty_256.zsh-theme | 13 + .oh-my-zsh/themes/steeef.zsh-theme | 100 ++ .oh-my-zsh/themes/strug.zsh-theme | 25 + .oh-my-zsh/themes/sunaku.zsh-theme | 26 + .oh-my-zsh/themes/sunrise.zsh-theme | 93 + .oh-my-zsh/themes/superjarin.zsh-theme | 18 + .oh-my-zsh/themes/suvash.zsh-theme | 34 + .oh-my-zsh/themes/takashiyoshida.zsh-theme | 27 + .oh-my-zsh/themes/terminalparty.zsh-theme | 8 + .oh-my-zsh/themes/theunraveler.zsh-theme | 16 + .oh-my-zsh/themes/tjkirch.zsh-theme | 15 + .oh-my-zsh/themes/tjkirch_mod.zsh-theme | 13 + .oh-my-zsh/themes/tonotdo.zsh-theme | 12 + .oh-my-zsh/themes/trapd00r.zsh-theme | 94 + .oh-my-zsh/themes/wedisagree.zsh-theme | 108 ++ .oh-my-zsh/themes/wezm+.zsh-theme | 7 + .oh-my-zsh/themes/wezm.zsh-theme | 7 + .oh-my-zsh/themes/wuffers.zsh-theme | 5 + .../themes/xiong-chiamiov-plus.zsh-theme | 6 + .oh-my-zsh/themes/xiong-chiamiov.zsh-theme | 6 + .oh-my-zsh/themes/ys.zsh-theme | 60 + .oh-my-zsh/themes/zhann.zsh-theme | 23 + .oh-my-zsh/tools/check_for_upgrade.sh | 0 .oh-my-zsh/tools/uninstall.sh | 0 .oh-my-zsh/tools/upgrade.sh | 0 .vim/init.vim | 6 +- 571 files changed, 5977 insertions(+), 616 deletions(-) mode change 100755 => 100644 .oh-my-zsh/.gitignore delete mode 100755 .oh-my-zsh/.zsh-update create mode 100644 .oh-my-zsh/CONTRIBUTING.md mode change 100755 => 100644 .oh-my-zsh/LICENSE.txt mode change 100755 => 100644 .oh-my-zsh/README.md mode change 100755 => 100644 .oh-my-zsh/lib/bzr.zsh mode change 100755 => 100644 .oh-my-zsh/lib/clipboard.zsh mode change 100755 => 100644 .oh-my-zsh/lib/compfix.zsh mode change 100755 => 100644 .oh-my-zsh/lib/completion.zsh mode change 100755 => 100644 .oh-my-zsh/lib/correction.zsh mode change 100755 => 100644 .oh-my-zsh/lib/diagnostics.zsh mode change 100755 => 100644 .oh-my-zsh/lib/directories.zsh mode change 100755 => 100644 .oh-my-zsh/lib/functions.zsh mode change 100755 => 100644 .oh-my-zsh/lib/git.zsh mode change 100755 => 100644 .oh-my-zsh/lib/grep.zsh mode change 100755 => 100644 .oh-my-zsh/lib/history.zsh mode change 100755 => 100644 .oh-my-zsh/lib/key-bindings.zsh mode change 100755 => 100644 .oh-my-zsh/lib/misc.zsh mode change 100755 => 100644 .oh-my-zsh/lib/nvm.zsh mode change 100755 => 100644 .oh-my-zsh/lib/prompt_info_functions.zsh mode change 100755 => 100644 .oh-my-zsh/lib/spectrum.zsh mode change 100755 => 100644 .oh-my-zsh/lib/termsupport.zsh mode change 100755 => 100644 .oh-my-zsh/lib/theme-and-appearance.zsh mode change 100755 => 100644 .oh-my-zsh/oh-my-zsh.sh mode change 100755 => 100644 .oh-my-zsh/plugins/adb/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/adb/_adb mode change 100755 => 100644 .oh-my-zsh/plugins/ant/ant.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/apache2-macports/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/apache2-macports/apache2-macports.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/arcanist/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/arcanist/arcanist.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/archlinux/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/archlinux/archlinux.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/asdf/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/asdf/asdf.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/autoenv/autoenv.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/autojump/autojump.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/autopep8/_autopep8 mode change 100755 => 100644 .oh-my-zsh/plugins/autopep8/autopep8.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/aws/aws.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/battery/battery.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/bbedit/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/bbedit/bbedit.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/bgnotify/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/boot2docker/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/boot2docker/_boot2docker mode change 100755 => 100644 .oh-my-zsh/plugins/bower/_bower mode change 100755 => 100644 .oh-my-zsh/plugins/bower/bower.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/branch/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/branch/branch.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/brew/brew.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/bundler/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/bundler/_bundler mode change 100755 => 100644 .oh-my-zsh/plugins/bundler/bundler.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/bwana/bwana.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/cabal/cabal.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/cake/cake.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/cakephp3/cakephp3.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/capistrano/_capistrano mode change 100755 => 100644 .oh-my-zsh/plugins/capistrano/capistrano.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/cargo/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/cargo/_cargo mode change 100755 => 100644 .oh-my-zsh/plugins/cask/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/cask/cask.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/catimg/catimg.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/catimg/colors.png mode change 100755 => 100644 .oh-my-zsh/plugins/celery/_celery mode change 100755 => 100644 .oh-my-zsh/plugins/chruby/chruby.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/chucknorris/.gitignore mode change 100755 => 100644 .oh-my-zsh/plugins/chucknorris/LICENSE mode change 100755 => 100644 .oh-my-zsh/plugins/chucknorris/chucknorris.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/chucknorris/fortunes/chucknorris mode change 100755 => 100644 .oh-my-zsh/plugins/cloudapp/cloudapp.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/codeclimate/_codeclimate mode change 100755 => 100644 .oh-my-zsh/plugins/coffee/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/coffee/_coffee mode change 100755 => 100644 .oh-my-zsh/plugins/coffee/coffee.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/colemak/colemak-less mode change 100755 => 100644 .oh-my-zsh/plugins/colemak/colemak.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/colored-man-pages/colored-man-pages.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/colorize/colorize.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/command-not-found/command-not-found.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/common-aliases/common-aliases.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/compleat/compleat.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/composer/composer.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/copybuffer/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/copybuffer/copybuffer.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/copydir/copydir.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/copyfile/copyfile.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/cp/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/cp/cp.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/cpanm/_cpanm mode change 100755 => 100644 .oh-my-zsh/plugins/debian/debian.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/dircycle/dircycle.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/dirhistory/dirhistory.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/dirpersist/dirpersist.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/django/django.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/dnf/dnf.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/docker-compose/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/docker-compose/_docker-compose mode change 100755 => 100644 .oh-my-zsh/plugins/docker-compose/docker-compose.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/docker/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/docker/_docker create mode 100644 .oh-my-zsh/plugins/dotenv/README.md create mode 100644 .oh-my-zsh/plugins/dotenv/dotenv.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/droplr/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/droplr/droplr.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/emacs/emacs.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/ember-cli/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/ember-cli/ember-cli.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/emoji-clock/emoji-clock.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/emoji/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/emoji/emoji-char-definitions.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/emoji/emoji-data.txt mode change 100755 => 100644 .oh-my-zsh/plugins/emoji/emoji.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/emoji/update_emoji.pl mode change 100755 => 100644 .oh-my-zsh/plugins/emotty/emotty.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/emotty/emotty_emoji_set.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/emotty/emotty_floral_set.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/emotty/emotty_love_set.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/emotty/emotty_nature_set.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/emotty/emotty_stellar_set.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/emotty/emotty_zodiac_set.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/encode64/encode64.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/extract/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/extract/_extract mode change 100755 => 100644 .oh-my-zsh/plugins/extract/extract.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/fabric/_fab mode change 100755 => 100644 .oh-my-zsh/plugins/fabric/fabric.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/fancy-ctrl-z/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/fasd/fasd.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/fastfile/fastfile.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/fbterm/fbterm.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/fedora/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/fedora/fedora.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/firewalld/firewalld.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/firewalld/readme.md mode change 100755 => 100644 .oh-my-zsh/plugins/forklift/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/forklift/forklift.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/fossil/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/fossil/fossil.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/frontend-search/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/frontend-search/_frontend-search.sh mode change 100755 => 100644 .oh-my-zsh/plugins/frontend-search/frontend-search.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/gas/_gas mode change 100755 => 100644 .oh-my-zsh/plugins/gb/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/gb/_gb mode change 100755 => 100644 .oh-my-zsh/plugins/geeknote/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/geeknote/_geeknote mode change 100755 => 100644 .oh-my-zsh/plugins/geeknote/geeknote.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/gem/_gem mode change 100755 => 100644 .oh-my-zsh/plugins/gem/gem.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/git-extras/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/git-extras/git-extras.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/git-flow-avh/git-flow-avh.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/git-flow/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/git-flow/git-flow.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/git-hubflow/git-hubflow.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/git-prompt/git-prompt.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/git-prompt/gitstatus.py mode change 100755 => 100644 .oh-my-zsh/plugins/git-remote-branch/git-remote-branch.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/git/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/git/git.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/gitfast/_git mode change 100755 => 100644 .oh-my-zsh/plugins/gitfast/git-completion.bash mode change 100755 => 100644 .oh-my-zsh/plugins/gitfast/git-prompt.sh mode change 100755 => 100644 .oh-my-zsh/plugins/gitfast/gitfast.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/github/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/github/_hub mode change 100755 => 100644 .oh-my-zsh/plugins/github/github.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/gitignore/gitignore.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/glassfish/_asadmin mode change 100755 => 100644 .oh-my-zsh/plugins/glassfish/glassfish.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/globalias/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/globalias/globalias.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/gnu-utils/gnu-utils.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/golang/golang.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/golang/templates/package.txt mode change 100755 => 100644 .oh-my-zsh/plugins/golang/templates/search.txt mode change 100755 => 100644 .oh-my-zsh/plugins/gpg-agent/gpg-agent.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/gradle/gradle.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/grails/grails.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/grunt/grunt.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/gulp/gulp.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/heroku/_heroku mode change 100755 => 100644 .oh-my-zsh/plugins/history-substring-search/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/history-substring-search/history-substring-search.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/history-substring-search/history-substring-search.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/history/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/history/history.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/httpie/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/httpie/httpie.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/iwhois/iwhois.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/jake-node/jake-node.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/jhbuild/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/jhbuild/jhbuild.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/jira/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/jira/_jira mode change 100755 => 100644 .oh-my-zsh/plugins/jira/jira.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/jruby/jruby.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/jsontools/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/jsontools/jsontools.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/jump/jump.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/kate/kate.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/kitchen/_kitchen mode change 100755 => 100644 .oh-my-zsh/plugins/knife/_knife mode change 100755 => 100644 .oh-my-zsh/plugins/knife_ssh/knife_ssh.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/kubectl/kubectl.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/laravel/_artisan mode change 100755 => 100644 .oh-my-zsh/plugins/laravel/laravel.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/laravel4/laravel4.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/laravel5/laravel5.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/last-working-dir/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/last-working-dir/last-working-dir.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/lein/lein.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/lighthouse/lighthouse.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/lol/lol.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/macports/_port mode change 100755 => 100644 .oh-my-zsh/plugins/macports/macports.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/man/man.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/marked2/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/marked2/marked2.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/mercurial/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/mercurial/mercurial.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/meteor/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/meteor/_meteor mode change 100755 => 100644 .oh-my-zsh/plugins/meteor/meteor.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/mix-fast/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/mix-fast/mix-fast.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/mix/_mix mode change 100755 => 100644 .oh-my-zsh/plugins/mosh/mosh.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/mvn/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/mvn/mvn.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/mysql-macports/mysql-macports.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/nanoc/_nanoc mode change 100755 => 100644 .oh-my-zsh/plugins/nanoc/nanoc.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/ng/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/ng/ng.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/nmap/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/nmap/nmap.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/node/node.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/nomad/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/nomad/_nomad mode change 100755 => 100644 .oh-my-zsh/plugins/npm/npm.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/nvm/_nvm mode change 100755 => 100644 .oh-my-zsh/plugins/nvm/nvm.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/nyan/nyan.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/osx/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/osx/osx.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/pass/_pass mode change 100755 => 100644 .oh-my-zsh/plugins/paver/paver.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/pep8/_pep8 mode change 100755 => 100644 .oh-my-zsh/plugins/per-directory-history/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/per-directory-history/per-directory-history.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/perl/perl.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/perms/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/perms/perms.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/phing/phing.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/pip/_pip mode change 100755 => 100644 .oh-my-zsh/plugins/pip/pip.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/pj/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/pj/pj.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/pod/_pod mode change 100755 => 100644 .oh-my-zsh/plugins/postgres/postgres.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/pow/pow.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/powder/_powder mode change 100755 => 100644 .oh-my-zsh/plugins/powify/_powify mode change 100755 => 100644 .oh-my-zsh/plugins/profiles/profiles.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/pyenv/pyenv.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/pylint/_pylint mode change 100755 => 100644 .oh-my-zsh/plugins/pylint/pylint.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/python/_python mode change 100755 => 100644 .oh-my-zsh/plugins/python/python.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/rails/_rails mode change 100755 => 100644 .oh-my-zsh/plugins/rails/rails.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/rake-fast/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/rake-fast/rake-fast.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/rake/rake.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/rand-quote/rand-quote.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/rbenv/rbenv.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/rbfu/rbfu.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/react-native/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/react-native/_react-native mode change 100755 => 100644 .oh-my-zsh/plugins/react-native/react-native.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/rebar/_rebar mode change 100755 => 100644 .oh-my-zsh/plugins/redis-cli/_redis-cli mode change 100755 => 100644 .oh-my-zsh/plugins/repo/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/repo/_repo mode change 100755 => 100644 .oh-my-zsh/plugins/repo/repo.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/rsync/rsync.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/ruby/ruby.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/rust/_rust mode change 100755 => 100644 .oh-my-zsh/plugins/rvm/rvm.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/safe-paste/safe-paste.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/sbt/_sbt mode change 100755 => 100644 .oh-my-zsh/plugins/sbt/sbt.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/scala/_scala mode change 100755 => 100644 .oh-my-zsh/plugins/scd/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/scd/scd.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/screen/screen.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/scw/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/scw/_scw mode change 100755 => 100644 .oh-my-zsh/plugins/sfffe/sfffe.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/shrink-path/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/shrink-path/shrink-path.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/singlechar/singlechar.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/spring/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/spring/_spring mode change 100755 => 100644 .oh-my-zsh/plugins/sprunge/sprunge.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/ssh-agent/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/ssh-agent/ssh-agent.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/stack/stack.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/sublime/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/sublime/sublime.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/sudo/sudo.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/supervisor/_supervisorctl mode change 100755 => 100644 .oh-my-zsh/plugins/supervisor/_supervisord mode change 100755 => 100644 .oh-my-zsh/plugins/supervisor/supervisor.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/suse/suse.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/svn-fast-info/svn-fast-info.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/svn/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/svn/svn.plugin.zsh create mode 100644 .oh-my-zsh/plugins/swiftpm/README.md create mode 100644 .oh-my-zsh/plugins/swiftpm/swiftpm.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/symfony/symfony.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/symfony2/symfony2.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/systemadmin/systemadmin.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/systemd/systemd.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/taskwarrior/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/taskwarrior/_task mode change 100755 => 100644 .oh-my-zsh/plugins/taskwarrior/taskwarrior.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/terminalapp/terminalapp.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/terminitor/_terminitor mode change 100755 => 100644 .oh-my-zsh/plugins/terraform/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/terraform/_terraform mode change 100755 => 100644 .oh-my-zsh/plugins/textastic/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/textastic/textastic.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/textmate/textmate.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/thefuck/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/thefuck/thefuck.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/themes/_theme mode change 100755 => 100644 .oh-my-zsh/plugins/themes/themes.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/thor/_thor mode change 100755 => 100644 .oh-my-zsh/plugins/tig/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/tig/tig.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/tmux-cssh/_tmux-cssh mode change 100755 => 100644 .oh-my-zsh/plugins/tmux/tmux.extra.conf mode change 100755 => 100644 .oh-my-zsh/plugins/tmux/tmux.only.conf mode change 100755 => 100644 .oh-my-zsh/plugins/tmux/tmux.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/tmuxinator/_tmuxinator mode change 100755 => 100644 .oh-my-zsh/plugins/torrent/torrent.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/tugboat/_tugboat mode change 100755 => 100644 .oh-my-zsh/plugins/ubuntu/readme.md mode change 100755 => 100644 .oh-my-zsh/plugins/ubuntu/ubuntu.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/urltools/urltools.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/vagrant/_vagrant mode change 100755 => 100644 .oh-my-zsh/plugins/vault/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/vault/_vault mode change 100755 => 100644 .oh-my-zsh/plugins/vi-mode/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/vi-mode/vi-mode.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/vim-interaction/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/vim-interaction/vim-interaction.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/virtualenv/virtualenv.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/vundle/vundle.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/wakeonlan/README mode change 100755 => 100644 .oh-my-zsh/plugins/wakeonlan/_wake mode change 100755 => 100644 .oh-my-zsh/plugins/wakeonlan/wakeonlan.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/wd/LICENSE mode change 100755 => 100644 .oh-my-zsh/plugins/wd/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/wd/_wd.sh mode change 100755 => 100644 .oh-my-zsh/plugins/wd/wd.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/web-search/web-search.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/wp-cli/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/wp-cli/wp-cli.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/xcode/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/xcode/_xcselv mode change 100755 => 100644 .oh-my-zsh/plugins/xcode/xcode.plugin.zsh create mode 100644 .oh-my-zsh/plugins/yarn/yarn.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/yii/yii.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/yii2/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/yii2/yii2.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/yum/yum.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/z/Makefile mode change 100755 => 100644 .oh-my-zsh/plugins/z/README mode change 100755 => 100644 .oh-my-zsh/plugins/z/z.1 mode change 100755 => 100644 .oh-my-zsh/plugins/z/z.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/z/z.sh mode change 100755 => 100644 .oh-my-zsh/plugins/zeus/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/zeus/_zeus mode change 100755 => 100644 .oh-my-zsh/plugins/zeus/zeus.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/README.txt mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-aliases.conf mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-cd.conf mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-env.conf mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-functions.conf mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-history.conf mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-kill.conf mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-list.conf mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-options.conf mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-panelize.conf mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/LICENSE mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/NEWS mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/README.md mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/_n-kill mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-aliases mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-cd mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-env mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-functions mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-help mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-history mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-kill mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-list mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-list-draw mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-list-input mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-options mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/n-panelize mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/znt-cd-widget mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/znt-history-widget mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/znt-kill-widget mode change 100755 => 100644 .oh-my-zsh/plugins/zsh-navigation-tools/znt-usetty-wrapper mode change 100755 => 100644 .oh-my-zsh/plugins/zsh_reload/zsh_reload.plugin.zsh mode change 100755 => 100644 .oh-my-zsh/templates/zshrc.zsh-template create mode 100644 .oh-my-zsh/themes/3den.zsh-theme create mode 100644 .oh-my-zsh/themes/Soliah.zsh-theme create mode 100644 .oh-my-zsh/themes/adben.zsh-theme create mode 100644 .oh-my-zsh/themes/af-magic.zsh-theme create mode 100644 .oh-my-zsh/themes/afowler.zsh-theme create mode 100644 .oh-my-zsh/themes/agnoster.zsh-theme create mode 100644 .oh-my-zsh/themes/alanpeabody.zsh-theme create mode 100644 .oh-my-zsh/themes/amuse.zsh-theme create mode 100644 .oh-my-zsh/themes/apple.zsh-theme create mode 100644 .oh-my-zsh/themes/arrow.zsh-theme create mode 100644 .oh-my-zsh/themes/aussiegeek.zsh-theme create mode 100644 .oh-my-zsh/themes/avit.zsh-theme create mode 100644 .oh-my-zsh/themes/awesomepanda.zsh-theme create mode 100644 .oh-my-zsh/themes/bira.zsh-theme create mode 100644 .oh-my-zsh/themes/blinks.zsh-theme create mode 100644 .oh-my-zsh/themes/bureau.zsh-theme create mode 100644 .oh-my-zsh/themes/candy-kingdom.zsh-theme create mode 100644 .oh-my-zsh/themes/candy.zsh-theme create mode 100644 .oh-my-zsh/themes/clean.zsh-theme create mode 100644 .oh-my-zsh/themes/cloud.zsh-theme create mode 100644 .oh-my-zsh/themes/crcandy.zsh-theme create mode 100644 .oh-my-zsh/themes/crunch.zsh-theme create mode 100644 .oh-my-zsh/themes/cypher.zsh-theme create mode 100644 .oh-my-zsh/themes/dallas.zsh-theme create mode 100644 .oh-my-zsh/themes/darkblood.zsh-theme create mode 100644 .oh-my-zsh/themes/daveverwer.zsh-theme create mode 100644 .oh-my-zsh/themes/dieter.zsh-theme create mode 100644 .oh-my-zsh/themes/dogenpunk.zsh-theme create mode 100644 .oh-my-zsh/themes/dpoggi.zsh-theme create mode 100644 .oh-my-zsh/themes/dst.zsh-theme create mode 100644 .oh-my-zsh/themes/dstufft.zsh-theme create mode 100644 .oh-my-zsh/themes/duellj.zsh-theme create mode 100644 .oh-my-zsh/themes/eastwood.zsh-theme create mode 100644 .oh-my-zsh/themes/edvardm.zsh-theme create mode 100644 .oh-my-zsh/themes/emotty.zsh-theme create mode 100644 .oh-my-zsh/themes/essembeh.zsh-theme create mode 100644 .oh-my-zsh/themes/evan.zsh-theme create mode 100644 .oh-my-zsh/themes/example.zsh-theme create mode 100644 .oh-my-zsh/themes/fino-time.zsh-theme create mode 100644 .oh-my-zsh/themes/fino.zsh-theme create mode 100644 .oh-my-zsh/themes/fishy.zsh-theme create mode 100644 .oh-my-zsh/themes/flazz.zsh-theme create mode 100644 .oh-my-zsh/themes/fletcherm.zsh-theme create mode 100644 .oh-my-zsh/themes/fox.zsh-theme create mode 100644 .oh-my-zsh/themes/frisk.zsh-theme create mode 100644 .oh-my-zsh/themes/frontcube.zsh-theme create mode 100644 .oh-my-zsh/themes/funky.zsh-theme create mode 100644 .oh-my-zsh/themes/fwalch.zsh-theme create mode 100644 .oh-my-zsh/themes/gallifrey.zsh-theme create mode 100644 .oh-my-zsh/themes/gallois.zsh-theme create mode 100644 .oh-my-zsh/themes/garyblessington.zsh-theme create mode 100644 .oh-my-zsh/themes/gentoo.zsh-theme create mode 100644 .oh-my-zsh/themes/geoffgarside.zsh-theme create mode 100644 .oh-my-zsh/themes/gianu.zsh-theme create mode 100644 .oh-my-zsh/themes/gnzh.zsh-theme create mode 100644 .oh-my-zsh/themes/gozilla.zsh-theme create mode 100644 .oh-my-zsh/themes/half-life.zsh-theme create mode 100644 .oh-my-zsh/themes/humza.zsh-theme create mode 100644 .oh-my-zsh/themes/imajes.zsh-theme create mode 100644 .oh-my-zsh/themes/intheloop.zsh-theme create mode 100644 .oh-my-zsh/themes/itchy.zsh-theme create mode 100644 .oh-my-zsh/themes/jaischeema.zsh-theme create mode 100644 .oh-my-zsh/themes/jbergantine.zsh-theme create mode 100644 .oh-my-zsh/themes/jispwoso.zsh-theme create mode 100644 .oh-my-zsh/themes/jnrowe.zsh-theme create mode 100644 .oh-my-zsh/themes/jonathan.zsh-theme create mode 100644 .oh-my-zsh/themes/josh.zsh-theme create mode 100644 .oh-my-zsh/themes/jreese.zsh-theme create mode 100644 .oh-my-zsh/themes/jtriley.zsh-theme create mode 100644 .oh-my-zsh/themes/juanghurtado.zsh-theme create mode 100644 .oh-my-zsh/themes/junkfood.zsh-theme create mode 100644 .oh-my-zsh/themes/kafeitu.zsh-theme create mode 100644 .oh-my-zsh/themes/kardan.zsh-theme create mode 100644 .oh-my-zsh/themes/kennethreitz.zsh-theme create mode 100644 .oh-my-zsh/themes/kiwi.zsh-theme create mode 100644 .oh-my-zsh/themes/kolo.zsh-theme create mode 100644 .oh-my-zsh/themes/kphoen.zsh-theme create mode 100644 .oh-my-zsh/themes/lambda.zsh-theme create mode 100644 .oh-my-zsh/themes/linuxonly.zsh-theme create mode 100644 .oh-my-zsh/themes/lukerandall.zsh-theme create mode 100644 .oh-my-zsh/themes/macovsky-ruby.zsh-theme create mode 100644 .oh-my-zsh/themes/macovsky.zsh-theme create mode 100644 .oh-my-zsh/themes/maran.zsh-theme create mode 100644 .oh-my-zsh/themes/mgutz.zsh-theme create mode 100644 .oh-my-zsh/themes/mh.zsh-theme create mode 100644 .oh-my-zsh/themes/michelebologna.zsh-theme create mode 100644 .oh-my-zsh/themes/mikeh.zsh-theme create mode 100644 .oh-my-zsh/themes/miloshadzic.zsh-theme create mode 100644 .oh-my-zsh/themes/minimal.zsh-theme create mode 100644 .oh-my-zsh/themes/mira.zsh-theme create mode 100644 .oh-my-zsh/themes/mortalscumbag.zsh-theme create mode 100644 .oh-my-zsh/themes/mrtazz.zsh-theme create mode 100644 .oh-my-zsh/themes/murilasso.zsh-theme create mode 100644 .oh-my-zsh/themes/muse.zsh-theme create mode 100644 .oh-my-zsh/themes/nanotech.zsh-theme create mode 100644 .oh-my-zsh/themes/nebirhos.zsh-theme create mode 100644 .oh-my-zsh/themes/nicoulaj.zsh-theme create mode 100644 .oh-my-zsh/themes/norm.zsh-theme create mode 100644 .oh-my-zsh/themes/obraun.zsh-theme create mode 100644 .oh-my-zsh/themes/peepcode.zsh-theme create mode 100644 .oh-my-zsh/themes/philips.zsh-theme create mode 100644 .oh-my-zsh/themes/pmcgee.zsh-theme create mode 100644 .oh-my-zsh/themes/pure.zsh-theme create mode 100644 .oh-my-zsh/themes/pygmalion.zsh-theme create mode 100644 .oh-my-zsh/themes/re5et.zsh-theme create mode 100644 .oh-my-zsh/themes/refined.zsh-theme create mode 100644 .oh-my-zsh/themes/rgm.zsh-theme create mode 100644 .oh-my-zsh/themes/risto.zsh-theme create mode 100644 .oh-my-zsh/themes/rixius.zsh-theme create mode 100644 .oh-my-zsh/themes/rkj-repos.zsh-theme create mode 100644 .oh-my-zsh/themes/rkj.zsh-theme create mode 100644 .oh-my-zsh/themes/robbyrussell.zsh-theme create mode 100644 .oh-my-zsh/themes/sammy.zsh-theme create mode 100644 .oh-my-zsh/themes/simonoff.zsh-theme create mode 100644 .oh-my-zsh/themes/simple.zsh-theme create mode 100644 .oh-my-zsh/themes/skaro.zsh-theme create mode 100644 .oh-my-zsh/themes/smt.zsh-theme create mode 100644 .oh-my-zsh/themes/sonicradish.zsh-theme create mode 100644 .oh-my-zsh/themes/sorin.zsh-theme create mode 100644 .oh-my-zsh/themes/sporty_256.zsh-theme create mode 100644 .oh-my-zsh/themes/steeef.zsh-theme create mode 100644 .oh-my-zsh/themes/strug.zsh-theme create mode 100644 .oh-my-zsh/themes/sunaku.zsh-theme create mode 100644 .oh-my-zsh/themes/sunrise.zsh-theme create mode 100644 .oh-my-zsh/themes/superjarin.zsh-theme create mode 100644 .oh-my-zsh/themes/suvash.zsh-theme create mode 100644 .oh-my-zsh/themes/takashiyoshida.zsh-theme create mode 100644 .oh-my-zsh/themes/terminalparty.zsh-theme create mode 100644 .oh-my-zsh/themes/theunraveler.zsh-theme create mode 100644 .oh-my-zsh/themes/tjkirch.zsh-theme create mode 100644 .oh-my-zsh/themes/tjkirch_mod.zsh-theme create mode 100644 .oh-my-zsh/themes/tonotdo.zsh-theme create mode 100644 .oh-my-zsh/themes/trapd00r.zsh-theme create mode 100644 .oh-my-zsh/themes/wedisagree.zsh-theme create mode 100644 .oh-my-zsh/themes/wezm+.zsh-theme create mode 100644 .oh-my-zsh/themes/wezm.zsh-theme create mode 100644 .oh-my-zsh/themes/wuffers.zsh-theme create mode 100644 .oh-my-zsh/themes/xiong-chiamiov-plus.zsh-theme create mode 100644 .oh-my-zsh/themes/xiong-chiamiov.zsh-theme create mode 100644 .oh-my-zsh/themes/ys.zsh-theme create mode 100644 .oh-my-zsh/themes/zhann.zsh-theme mode change 100755 => 100644 .oh-my-zsh/tools/check_for_upgrade.sh mode change 100755 => 100644 .oh-my-zsh/tools/uninstall.sh mode change 100755 => 100644 .oh-my-zsh/tools/upgrade.sh diff --git a/.i3/config b/.i3/config index 49804a6..460bc43 100644 --- a/.i3/config +++ b/.i3/config @@ -1,5 +1,5 @@ # T's desktop v3 -#exec --no-startup-id xrandr --output HDMI-0 --auto --mode 1920x1080 --primary --output DVI-I-1 --right-of HDMI-0 --auto --dpi 96/HDMI-0 +exec --no-startup-id xrandr --output HDMI-0 --auto --mode 1920x1080 --primary --dpi 96/HDMI-0 exec --no-startup-id mplayer -fs ~/.i3/boot.mp4 exec --no-startup-id i3lock -f "xos4 Terminus" -F 40 -X 200 -Y 100 -i '~/Pictures/backgrounds/6a171c_5499051.jpg' #DAEMONS @@ -15,7 +15,7 @@ exec --no-startup-id setxkbmap us altgr-intl # US brackets on slovene special characters #exec xmodmap ~/.i3/custom.map -font pango: FontAwesome, xos4 Terminess Powerline 12 +font pango: FontAwesome, xos4 Terminess Powerline 10 #--APPEARANCE--# @@ -41,6 +41,7 @@ hide_edge_borders smart set $mod Mod4 set $alt Mod1 +set $m Mod3 #--WINDOW-SETTINGS--# floating_modifier $mod @@ -146,12 +147,22 @@ bindsym $mod+Shift+2 move container to workspace $WS2 bindsym $mod+Shift+3 move container to workspace $WS3 bindsym $mod+Shift+4 move container to workspace $WS4 bindsym $mod+Shift+5 move container to workspace $WS5 +bindsym $m+1 workspace $WS1 +bindsym $m+2 workspace $WS2 +bindsym $m+3 workspace $WS3 +bindsym $m+4 workspace $WS4 +bindsym $m+5 workspace $WS5 +bindsym $m+Shift+1 move container to workspace $WS1 +bindsym $m+Shift+2 move container to workspace $WS2 +bindsym $m+Shift+3 move container to workspace $WS3 +bindsym $m+Shift+4 move container to workspace $WS4 +bindsym $m+Shift+5 move container to workspace $WS5 #Secondary workspaces set $WSW1 "W1" set $WSW2 "W2" set $WSW3 "W3" -set $WSW4 "W4" +set $WSW4 "W4" bindsym $mod+F1 workspace $WSW1 bindsym $mod+F2 workspace $WSW2 bindsym $mod+F3 workspace $WSW3 @@ -160,6 +171,14 @@ bindsym $mod+Shift+F1 move container to workspace $WSW1 bindsym $mod+Shift+F2 move container to workspace $WSW2 bindsym $mod+Shift+F3 move container to workspace $WSW3 bindsym $mod+Shift+F4 move container to workspace $WSW4 +bindsym $m+F1 workspace $WSW1 +bindsym $m+F2 workspace $WSW2 +bindsym $m+F3 workspace $WSW3 +bindsym $m+F4 workspace $WSW4 +bindsym $m+Shift+F1 move container to workspace $WSW1 +bindsym $m+Shift+F2 move container to workspace $WSW2 +bindsym $m+Shift+F3 move container to workspace $WSW3 +bindsym $m+Shift+F4 move container to workspace $WSW4 #Multiple screens bindsym $mod+Left move container to output left @@ -195,8 +214,8 @@ bindsym $alt+i mode "ignore" #--BAR CONFIGURATION--# bar { tray_output primary - #status_command i3blocks -c ~/.i3/i3blocks.conf - status_command i3blocks -c ~/.i3/i3blocks-netbook.conf + status_command i3blocks -c ~/.i3/i3blocks.conf + #status_command i3blocks -c ~/.i3/i3blocks-netbook.conf mode dock hidden_state show diff --git a/.i3/custom.map b/.i3/custom.map index a125933..91bd394 100644 --- a/.i3/custom.map +++ b/.i3/custom.map @@ -1,6 +1,4 @@ -keycode 10 = 1 exclam 1 exclam asciitilde dead_tilde -keycode 49 = asciitilde dead_diaeresis -keycode 21 = plus asterisk -keycode 34 = braceleft bracketleft braceleft bracketleft scaron Scaron -keycode 35 = braceright bracketright braceright bracketright dstroke Dstroke - +clear mod4 +keycode 49 = Hyper_L asciitilde Hyper_L asciitilde dead_grave dead_tilde dead_grave +add mod3 = Hyper_L +add mod4 = Super_L Super_R diff --git a/.oh-my-zsh/.gitignore b/.oh-my-zsh/.gitignore old mode 100755 new mode 100644 index 56eb5fe..b202208 --- a/.oh-my-zsh/.gitignore +++ b/.oh-my-zsh/.gitignore @@ -1,3 +1,8 @@ +# custom files +custom/ +!custom/plugins/example +!custom/example.zsh + # temp files directories cache/ log/ diff --git a/.oh-my-zsh/.zsh-update b/.oh-my-zsh/.zsh-update deleted file mode 100755 index 05daea0..0000000 --- a/.oh-my-zsh/.zsh-update +++ /dev/null @@ -1 +0,0 @@ -LAST_EPOCH=17126 diff --git a/.oh-my-zsh/CONTRIBUTING.md b/.oh-my-zsh/CONTRIBUTING.md new file mode 100644 index 0000000..ac263fd --- /dev/null +++ b/.oh-my-zsh/CONTRIBUTING.md @@ -0,0 +1,123 @@ +# CONTRIBUTING GUIDELINES + +Oh-My-Zsh is a community-driven project. Contribution is welcome, encouraged and appreciated. +It is also essential for the development of the project. + +These guidelines are an attempt at better addressing the huge amount of pending +issues and pull requests. Please read them closely. + +Foremost, be so kind as to [search](#use-the-search-luke). This ensures any contribution +you would make is not already covered. + +* [Issues](#reporting-issues) + * [You have a problem](#you-have-a-problem) + * [You have a suggestion](#you-have-a-suggestion) +* [Pull Requests](#submitting-pull-requests) + * [Getting started](#getting-started) + * [You have a solution](#you-have-a-solution) + * [You have an addition](#you-have-an-addition) +* [Information sources (_aka_ search)](#use-the-search-luke) + +**BONUS:** [Volunteering](#you-have-spare-time-to-volunteer) + +## Reporting Issues + +### You have a problem + +Please be so kind as to [search](#use-the-search-luke) for any open issue already covering +your problem. + +If you find one, comment on it so we can know there are more people experiencing it. + +If not, look at the [Troubleshooting](https://github.com/robbyrussell/oh-my-zsh/wiki/Troubleshooting) +page for instructions on how to gather data to better debug your problem. + +Then, you can go ahead and create an issue with as much detail as you can provide. +It should include the data gathered as indicated above, along with: + +1. How to reproduce the problem +2. What the correct behavior should be +3. What the actual behavior is + +Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle +(starting with `@`) in your message. + +We will do our very best to help you. + +### You have a suggestion + +Please be so kind as to [search](#use-the-search-luke) for any open issue already covering +your suggestion. + +If you find one, comment on it so we can know there are more people supporting it. + +If not, you can go ahead and create an issue. Please copy to anyone relevant (_eg_ plugin +maintainers) by mentioning their GitHub handle (starting with `@`) in your message. + +## Submitting Pull Requests + +### Getting started + +You should be familiar with the basics of +[contributing on GitHub](https://help.github.com/articles/using-pull-requests) and have a fork +[properly set up](https://github.com/robbyrussell/oh-my-zsh/wiki/Contribution-Technical-Practices). + +You MUST always create PRs with _a dedicated branch_ based on the latest upstream tree. + +If you create your own PR, please make sure you do it right. Also be so kind as to reference +any issue that would be solved in the PR description body, +[for instance](https://help.github.com/articles/closing-issues-via-commit-messages/) +_"Fixes #XXXX"_ for issue number XXXX. + +### You have a solution + +Please be so kind as to [search](#use-the-search-luke) for any open issue already covering +your [problem](#you-have-a-problem), and any pending/merged/rejected PR covering your solution. + +If the solution is already reported, try it out and +1 the pull request if the +solution works ok. On the other hand, if you think your solution is better, post +it with a reference to the other one so we can have both solutions to compare. + +If not, then go ahead and submit a PR. Please copy to anyone relevant (e.g. plugin +maintainers) by mentioning their GitHub handle (starting with `@`) in your message. + +### You have an addition + +Please [do not](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now) +send themes for now. + +Please be so kind as to [search](#use-the-search-luke) for any pending, merged or rejected Pull Requests +covering or related to what you want to add. + +If you find one, try it out and work with the author on a common solution. + +If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin +maintainers) by mentioning their GitHub handle (starting with `@`) in your message. + +For any extensive change, _eg_ a new plugin, you will have to find testers to +1 your PR. + +---- + +## Use the Search, Luke + +_May the Force (of past experiences) be with you_ + +GitHub offers [many search features](https://help.github.com/articles/searching-github/) +to help you check whether a similar contribution to yours already exists. Please search +before making any contribution, it avoids duplicates and eases maintenance. Trust me, +that works 90% of the time. + +You can also take a look at the [FAQ](https://github.com/robbyrussell/oh-my-zsh/wiki/FAQ) +to be sure your contribution has not already come up. + +If all fails, your thing has probably not been reported yet, so you can go ahead +and [create an issue](#reporting-issues) or [submit a PR](#submitting-pull-requests). + +---- + +### You have spare time to volunteer + +Very nice!! :) + +Please have a look at the [Volunteer](https://github.com/robbyrussell/oh-my-zsh/wiki/Volunteers) +page for instructions on where to start and more. diff --git a/.oh-my-zsh/LICENSE.txt b/.oh-my-zsh/LICENSE.txt old mode 100755 new mode 100644 index 42f607f..ed0ae75 --- a/.oh-my-zsh/LICENSE.txt +++ b/.oh-my-zsh/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2009-2016 Robby Russell and contributors +Copyright (c) 2009-2017 Robby Russell and contributors See the full list at https://github.com/robbyrussell/oh-my-zsh/contributors Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/.oh-my-zsh/README.md b/.oh-my-zsh/README.md old mode 100755 new mode 100644 index eecde15..54107b1 --- a/.oh-my-zsh/README.md +++ b/.oh-my-zsh/README.md @@ -4,9 +4,9 @@ Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. -That sounds boring. Let's try this again. +Sounds boring. Let's try again. -__Oh My Zsh is a way of life!__ +__Oh My Zsh will not make you a 10x developer...but you might feel like one.__ Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes. Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_ @@ -20,7 +20,7 @@ To learn more, visit [ohmyz.sh](http://ohmyz.sh) and follow [@ohmyzsh](https://t __Disclaimer:__ _Oh My Zsh works best on macOS and Linux._ -* Unix-based operating system (macOS or Linux) +* Unix-like operating system (macOS or Linux) * [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH) * `curl` or `wget` should be installed * `git` should be installed diff --git a/.oh-my-zsh/lib/bzr.zsh b/.oh-my-zsh/lib/bzr.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/clipboard.zsh b/.oh-my-zsh/lib/clipboard.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/compfix.zsh b/.oh-my-zsh/lib/compfix.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/completion.zsh b/.oh-my-zsh/lib/completion.zsh old mode 100755 new mode 100644 index bbd0216..a1e9343 --- a/.oh-my-zsh/lib/completion.zsh +++ b/.oh-my-zsh/lib/completion.zsh @@ -5,7 +5,7 @@ WORDCHARS='' unsetopt menu_complete # do not autoselect the first completion entry unsetopt flowcontrol -setopt auto_menu # show completion menu on succesive tab press +setopt auto_menu # show completion menu on successive tab press setopt complete_in_word setopt always_to_end diff --git a/.oh-my-zsh/lib/correction.zsh b/.oh-my-zsh/lib/correction.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/diagnostics.zsh b/.oh-my-zsh/lib/diagnostics.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/directories.zsh b/.oh-my-zsh/lib/directories.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/functions.zsh b/.oh-my-zsh/lib/functions.zsh old mode 100755 new mode 100644 index 9f11318..f306537 --- a/.oh-my-zsh/lib/functions.zsh +++ b/.oh-my-zsh/lib/functions.zsh @@ -86,7 +86,7 @@ function default() { } # -# Set enviroment variable "$1" to default value "$2" if "$1" is not yet defined. +# Set environment variable "$1" to default value "$2" if "$1" is not yet defined. # # Arguments: # 1. name - The env variable to set diff --git a/.oh-my-zsh/lib/git.zsh b/.oh-my-zsh/lib/git.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/grep.zsh b/.oh-my-zsh/lib/grep.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/history.zsh b/.oh-my-zsh/lib/history.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/key-bindings.zsh b/.oh-my-zsh/lib/key-bindings.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/misc.zsh b/.oh-my-zsh/lib/misc.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/nvm.zsh b/.oh-my-zsh/lib/nvm.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/prompt_info_functions.zsh b/.oh-my-zsh/lib/prompt_info_functions.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/spectrum.zsh b/.oh-my-zsh/lib/spectrum.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/termsupport.zsh b/.oh-my-zsh/lib/termsupport.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/lib/theme-and-appearance.zsh b/.oh-my-zsh/lib/theme-and-appearance.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/oh-my-zsh.sh b/.oh-my-zsh/oh-my-zsh.sh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/adb/README.md b/.oh-my-zsh/plugins/adb/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/adb/_adb b/.oh-my-zsh/plugins/adb/_adb old mode 100755 new mode 100644 index f30f324..5f37bed --- a/.oh-my-zsh/plugins/adb/_adb +++ b/.oh-my-zsh/plugins/adb/_adb @@ -13,9 +13,13 @@ _1st_arguments=( 'disconnect:disconnect from a TCP/IP device. Port 5555 is default.' 'emu:run emulator console command' 'forward:forward socket connections' +'get-devpath:print the device path' +'get-serialno:print the serial number of the device' +'get-state:print the current state of the device: offline | bootloader | device' 'help:show the help message' 'install:push this package file to the device and install it' 'jdwp:list PIDs of processes hosting a JDWP transport' +'keygen:generate adb public/private key' 'kill-server:kill the server if it is running' 'logcat:view device log' 'pull:copy file/dir from device' @@ -30,6 +34,7 @@ _1st_arguments=( 'start-server:ensure that there is a server running' 'tcpip:restart host adb in tcpip mode' 'uninstall:remove this app package from the device' +'usb:restart the adbd daemon listing on USB' 'version:show version num' 'wait-for-device:block until device is online' ) diff --git a/.oh-my-zsh/plugins/ant/ant.plugin.zsh b/.oh-my-zsh/plugins/ant/ant.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/apache2-macports/README.md b/.oh-my-zsh/plugins/apache2-macports/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/apache2-macports/apache2-macports.plugin.zsh b/.oh-my-zsh/plugins/apache2-macports/apache2-macports.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/arcanist/README.md b/.oh-my-zsh/plugins/arcanist/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/arcanist/arcanist.plugin.zsh b/.oh-my-zsh/plugins/arcanist/arcanist.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/archlinux/README.md b/.oh-my-zsh/plugins/archlinux/README.md old mode 100755 new mode 100644 index 16f0994..e408db1 --- a/.oh-my-zsh/plugins/archlinux/README.md +++ b/.oh-my-zsh/plugins/archlinux/README.md @@ -73,6 +73,8 @@ | pacupd | sudo pacman -Sy | Update and refresh the local package database | | pacupg | sudo pacman -Syu | Sync with repositories before upgrading packages | | upgrade | sudo pacman -Syu | Sync with repositories before upgrading packages | +| pacfileupg | sudo pacman -Fy | Download fresh package databases from the server | +| pacfiles | pacman -Fs | Search package file names for matching strings. | | Function | Description | |----------------|------------------------------------------------------| diff --git a/.oh-my-zsh/plugins/archlinux/archlinux.plugin.zsh b/.oh-my-zsh/plugins/archlinux/archlinux.plugin.zsh old mode 100755 new mode 100644 index 3156e94..105bd2d --- a/.oh-my-zsh/plugins/archlinux/archlinux.plugin.zsh +++ b/.oh-my-zsh/plugins/archlinux/archlinux.plugin.zsh @@ -82,6 +82,8 @@ alias pacinsd='sudo pacman -S --asdeps' alias pacmir='sudo pacman -Syy' alias paclsorphans='sudo pacman -Qdt' alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)' +alias pacfileupg='sudo pacman -Fy' +alias pacfiles='pacman tFs' if (( $+commands[abs] && $+commands[aur] )); then diff --git a/.oh-my-zsh/plugins/asdf/README.md b/.oh-my-zsh/plugins/asdf/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/asdf/asdf.plugin.zsh b/.oh-my-zsh/plugins/asdf/asdf.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/autoenv/autoenv.plugin.zsh b/.oh-my-zsh/plugins/autoenv/autoenv.plugin.zsh old mode 100755 new mode 100644 index af58ee7..3c1b0fa --- a/.oh-my-zsh/plugins/autoenv/autoenv.plugin.zsh +++ b/.oh-my-zsh/plugins/autoenv/autoenv.plugin.zsh @@ -1,7 +1,7 @@ # Activates autoenv or reports its failure () { if ! type autoenv_init >/dev/null; then - for d (~/.autoenv /usr/local/opt/autoenv /usr/local/bin); do + for d (~/.autoenv ~/.local/bin /usr/local/opt/autoenv /usr/local/bin); do if [[ -e $d/activate.sh ]]; then autoenv_dir=$d break diff --git a/.oh-my-zsh/plugins/autojump/autojump.plugin.zsh b/.oh-my-zsh/plugins/autojump/autojump.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/autopep8/_autopep8 b/.oh-my-zsh/plugins/autopep8/_autopep8 old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/autopep8/autopep8.plugin.zsh b/.oh-my-zsh/plugins/autopep8/autopep8.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/aws/aws.plugin.zsh b/.oh-my-zsh/plugins/aws/aws.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/battery/battery.plugin.zsh b/.oh-my-zsh/plugins/battery/battery.plugin.zsh old mode 100755 new mode 100644 index da229cf..8f398cf --- a/.oh-my-zsh/plugins/battery/battery.plugin.zsh +++ b/.oh-my-zsh/plugins/battery/battery.plugin.zsh @@ -100,7 +100,7 @@ elif [[ "$OSTYPE" = linux* ]] ; then else color='red' fi - echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}" + echo "%{$fg[$color]%}$(battery_pct_remaining)%%%{$reset_color%}" else echo "∞" fi diff --git a/.oh-my-zsh/plugins/bbedit/README.md b/.oh-my-zsh/plugins/bbedit/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/bbedit/bbedit.plugin.zsh b/.oh-my-zsh/plugins/bbedit/bbedit.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/bgnotify/README.md b/.oh-my-zsh/plugins/bgnotify/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/boot2docker/README.md b/.oh-my-zsh/plugins/boot2docker/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/boot2docker/_boot2docker b/.oh-my-zsh/plugins/boot2docker/_boot2docker old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/bower/_bower b/.oh-my-zsh/plugins/bower/_bower old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/bower/bower.plugin.zsh b/.oh-my-zsh/plugins/bower/bower.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/branch/README.md b/.oh-my-zsh/plugins/branch/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/branch/branch.plugin.zsh b/.oh-my-zsh/plugins/branch/branch.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/brew/brew.plugin.zsh b/.oh-my-zsh/plugins/brew/brew.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/bundler/README.md b/.oh-my-zsh/plugins/bundler/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/bundler/_bundler b/.oh-my-zsh/plugins/bundler/_bundler old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/bundler/bundler.plugin.zsh b/.oh-my-zsh/plugins/bundler/bundler.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/bwana/bwana.plugin.zsh b/.oh-my-zsh/plugins/bwana/bwana.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/cabal/cabal.plugin.zsh b/.oh-my-zsh/plugins/cabal/cabal.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/cake/cake.plugin.zsh b/.oh-my-zsh/plugins/cake/cake.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/cakephp3/cakephp3.plugin.zsh b/.oh-my-zsh/plugins/cakephp3/cakephp3.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/capistrano/_capistrano b/.oh-my-zsh/plugins/capistrano/_capistrano old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/capistrano/capistrano.plugin.zsh b/.oh-my-zsh/plugins/capistrano/capistrano.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/cargo/README.md b/.oh-my-zsh/plugins/cargo/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/cargo/_cargo b/.oh-my-zsh/plugins/cargo/_cargo old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/cask/README.md b/.oh-my-zsh/plugins/cask/README.md old mode 100755 new mode 100644 index 6457fd8..e1335c1 --- a/.oh-my-zsh/plugins/cask/README.md +++ b/.oh-my-zsh/plugins/cask/README.md @@ -1,11 +1,15 @@ -# cask plugin +# Cask plugin -Loads `cask` completion from non-standard locations, such as if installed +[Cask](https://github.com/cask/cask) is a project management tool for Emacs that helps +automate the package development cycle; development, dependencies, testing, building, +packaging and more. + +This plugin loads `cask` completion from non-standard locations, such as if installed via Homebrew or others. To enable it, add `cask` to your plugins array: ```zsh plugins=(... cask) ``` -Make sure you have the `cask` directory in your `$PATH` before loading -Oh My Zsh, otherwise you'll get the "command not found" error. +Make sure you have the `cask` directory in your `$PATH` before loading Oh My Zsh, +otherwise you'll get a "command not found" error. diff --git a/.oh-my-zsh/plugins/cask/cask.plugin.zsh b/.oh-my-zsh/plugins/cask/cask.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/catimg/catimg.plugin.zsh b/.oh-my-zsh/plugins/catimg/catimg.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/catimg/colors.png b/.oh-my-zsh/plugins/catimg/colors.png old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/celery/_celery b/.oh-my-zsh/plugins/celery/_celery old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/chruby/chruby.plugin.zsh b/.oh-my-zsh/plugins/chruby/chruby.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/chucknorris/.gitignore b/.oh-my-zsh/plugins/chucknorris/.gitignore old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/chucknorris/LICENSE b/.oh-my-zsh/plugins/chucknorris/LICENSE old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/chucknorris/chucknorris.plugin.zsh b/.oh-my-zsh/plugins/chucknorris/chucknorris.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/chucknorris/fortunes/chucknorris b/.oh-my-zsh/plugins/chucknorris/fortunes/chucknorris old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/cloudapp/cloudapp.plugin.zsh b/.oh-my-zsh/plugins/cloudapp/cloudapp.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/codeclimate/_codeclimate b/.oh-my-zsh/plugins/codeclimate/_codeclimate old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/coffee/README.md b/.oh-my-zsh/plugins/coffee/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/coffee/_coffee b/.oh-my-zsh/plugins/coffee/_coffee old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/coffee/coffee.plugin.zsh b/.oh-my-zsh/plugins/coffee/coffee.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/colemak/colemak-less b/.oh-my-zsh/plugins/colemak/colemak-less old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/colemak/colemak.plugin.zsh b/.oh-my-zsh/plugins/colemak/colemak.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/.oh-my-zsh/plugins/colored-man-pages/colored-man-pages.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/colorize/colorize.plugin.zsh b/.oh-my-zsh/plugins/colorize/colorize.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/command-not-found/command-not-found.plugin.zsh b/.oh-my-zsh/plugins/command-not-found/command-not-found.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/common-aliases/common-aliases.plugin.zsh b/.oh-my-zsh/plugins/common-aliases/common-aliases.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/compleat/compleat.plugin.zsh b/.oh-my-zsh/plugins/compleat/compleat.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/composer/composer.plugin.zsh b/.oh-my-zsh/plugins/composer/composer.plugin.zsh old mode 100755 new mode 100644 index 07eb1de..8cf50d5 --- a/.oh-my-zsh/plugins/composer/composer.plugin.zsh +++ b/.oh-my-zsh/plugins/composer/composer.plugin.zsh @@ -39,14 +39,17 @@ alias c='composer' alias csu='composer self-update' alias cu='composer update' alias cr='composer require' +alias crm='composer remove' alias ci='composer install' alias ccp='composer create-project' alias cdu='composer dump-autoload' +alias cdo='composer dump-autoload --optimize-autoloader' alias cgu='composer global update' alias cgr='composer global require' +alias cgrm='composer global remove' # install composer in the current directory alias cget='curl -s https://getcomposer.org/installer | php' # Add Composer's global binaries to PATH -export PATH=$PATH:~/.composer/vendor/bin +export PATH=$PATH:$(composer global config bin-dir --absolute) 2>/dev/null diff --git a/.oh-my-zsh/plugins/copybuffer/README.md b/.oh-my-zsh/plugins/copybuffer/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/copybuffer/copybuffer.plugin.zsh b/.oh-my-zsh/plugins/copybuffer/copybuffer.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/copydir/copydir.plugin.zsh b/.oh-my-zsh/plugins/copydir/copydir.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/copyfile/copyfile.plugin.zsh b/.oh-my-zsh/plugins/copyfile/copyfile.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/cp/README.md b/.oh-my-zsh/plugins/cp/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/cp/cp.plugin.zsh b/.oh-my-zsh/plugins/cp/cp.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/cpanm/_cpanm b/.oh-my-zsh/plugins/cpanm/_cpanm old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/debian/debian.plugin.zsh b/.oh-my-zsh/plugins/debian/debian.plugin.zsh old mode 100755 new mode 100644 index 31a772d..28131ff --- a/.oh-my-zsh/plugins/debian/debian.plugin.zsh +++ b/.oh-my-zsh/plugins/debian/debian.plugin.zsh @@ -192,7 +192,7 @@ apt-history () { awk '{print $4"="$5}' ;; list) - zcat $(ls -rt /var/log/dpkg*) + zgrep --no-filename '' $(ls -rt /var/log/dpkg*) ;; *) echo "Parameters:" diff --git a/.oh-my-zsh/plugins/dircycle/dircycle.plugin.zsh b/.oh-my-zsh/plugins/dircycle/dircycle.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/dirhistory/dirhistory.plugin.zsh b/.oh-my-zsh/plugins/dirhistory/dirhistory.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/dirpersist/dirpersist.plugin.zsh b/.oh-my-zsh/plugins/dirpersist/dirpersist.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/django/django.plugin.zsh b/.oh-my-zsh/plugins/django/django.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/dnf/dnf.plugin.zsh b/.oh-my-zsh/plugins/dnf/dnf.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/docker-compose/README.md b/.oh-my-zsh/plugins/docker-compose/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/docker-compose/_docker-compose b/.oh-my-zsh/plugins/docker-compose/_docker-compose old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/docker-compose/docker-compose.plugin.zsh b/.oh-my-zsh/plugins/docker-compose/docker-compose.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/docker/README.md b/.oh-my-zsh/plugins/docker/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/docker/_docker b/.oh-my-zsh/plugins/docker/_docker old mode 100755 new mode 100644 index 415e731..1aec353 --- a/.oh-my-zsh/plugins/docker/_docker +++ b/.oh-my-zsh/plugins/docker/_docker @@ -113,27 +113,27 @@ __docker_get_containers() { return ret } -__docker_stoppedcontainers() { +__docker_complete_stopped_containers() { [[ $PREFIX = -* ]] && return 1 __docker_get_containers stopped all "$@" } -__docker_runningcontainers() { +__docker_complete_running_containers() { [[ $PREFIX = -* ]] && return 1 __docker_get_containers running all "$@" } -__docker_containers() { +__docker_complete_containers() { [[ $PREFIX = -* ]] && return 1 __docker_get_containers all all "$@" } -__docker_containers_ids() { +__docker_complete_containers_ids() { [[ $PREFIX = -* ]] && return 1 __docker_get_containers all ids "$@" } -__docker_containers_names() { +__docker_complete_containers_names() { [[ $PREFIX = -* ]] && return 1 __docker_get_containers all names "$@" } @@ -149,25 +149,27 @@ __docker_complete_info_plugins() { return ret } -__docker_images() { +__docker_complete_images() { [[ $PREFIX = -* ]] && return 1 integer ret=1 declare -a images images=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}[2,-1]}/(#b)([^ ]##) ##([^ ]##) ##([^ ]##)*/${match[3]}:${(r:15:: :::)match[2]} in ${match[1]}}) _describe -t docker-images "images" images && ret=0 - __docker_repositories_with_tags && ret=0 + __docker_complete_repositories_with_tags && ret=0 return ret } -__docker_repositories() { +__docker_complete_repositories() { [[ $PREFIX = -* ]] && return 1 + integer ret=1 declare -a repos repos=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}%% *}[2,-1]}) repos=(${repos#}) - _describe -t docker-repos "repositories" repos + _describe -t docker-repos "repositories" repos && ret=0 + return ret } -__docker_repositories_with_tags() { +__docker_complete_repositories_with_tags() { [[ $PREFIX = -* ]] && return 1 integer ret=1 declare -a repos onlyrepos matched @@ -244,7 +246,7 @@ __docker_get_log_options() { return ret } -__docker_log_drivers() { +__docker_complete_log_drivers() { [[ $PREFIX = -* ]] && return 1 integer ret=1 drivers=(awslogs etwlogs fluentd gcplogs gelf journald json-file none splunk syslog) @@ -252,7 +254,7 @@ __docker_log_drivers() { return ret } -__docker_log_options() { +__docker_complete_log_options() { [[ $PREFIX = -* ]] && return 1 integer ret=1 @@ -295,7 +297,7 @@ __docker_complete_pid() { if compset -P '*:'; then case "${${words[-1]%:*}#*=}" in (container) - __docker_runningcontainers && ret=0 + __docker_complete_running_containers && ret=0 ;; *) _message 'value' && ret=0 @@ -327,36 +329,40 @@ __docker_complete_ps_filters() { if compset -P '*='; then case "${${words[-1]%=*}#*=}" in (ancestor) - __docker_images && ret=0 + __docker_complete_images && ret=0 ;; (before|since) - __docker_containers && ret=0 + __docker_complete_containers && ret=0 + ;; + (health) + health_opts=('healthy' 'none' 'starting' 'unhealthy') + _describe -t health-filter-opts "health filter options" health_opts && ret=0 ;; (id) - __docker_containers_ids && ret=0 + __docker_complete_containers_ids && ret=0 ;; (is-task) _describe -t boolean-filter-opts "filter options" boolean_opts && ret=0 ;; (name) - __docker_containers_names && ret=0 + __docker_complete_containers_names && ret=0 ;; (network) - __docker_networks && ret=0 + __docker_complete_networks && ret=0 ;; (status) status_opts=('created' 'dead' 'exited' 'paused' 'restarting' 'running' 'removing') - _describe -t status-filter-opts "Status Filter Options" status_opts && ret=0 + _describe -t status-filter-opts "status filter options" status_opts && ret=0 ;; (volume) - __docker_volumes && ret=0 + __docker_complete_volumes && ret=0 ;; *) _message 'value' && ret=0 ;; esac else - opts=('ancestor' 'before' 'exited' 'id' 'label' 'name' 'network' 'since' 'status' 'volume') + opts=('ancestor' 'before' 'exited' 'health' 'id' 'label' 'name' 'network' 'since' 'status' 'volume') _describe -t filter-opts "Filter Options" opts -qS "=" && ret=0 fi @@ -393,12 +399,12 @@ __docker_complete_images_filters() { declare -a boolean_opts opts boolean_opts=('true' 'false') - opts=('before' 'dangling' 'label' 'since') + opts=('before' 'dangling' 'label' 'reference' 'since') if compset -P '*='; then case "${${words[-1]%=*}#*=}" in - (before|since) - __docker_images && ret=0 + (before|reference|since) + __docker_complete_images && ret=0 ;; (dangling) _describe -t boolean-filter-opts "filter options" boolean_opts && ret=0 @@ -424,7 +430,7 @@ __docker_complete_events_filter() { if compset -P '*='; then case "${${words[-1]%=*}#*=}" in (container) - __docker_containers && ret=0 + __docker_complete_containers && ret=0 ;; (daemon) emulate -L zsh @@ -444,10 +450,10 @@ __docker_complete_events_filter() { _describe -t event-filter-opts "event filter options" event_opts && ret=0 ;; (image) - __docker_images && ret=0 + __docker_complete_images && ret=0 ;; (network) - __docker_networks && ret=0 + __docker_complete_networks && ret=0 ;; (type) local -a type_opts @@ -455,7 +461,7 @@ __docker_complete_events_filter() { _describe -t type-filter-opts "type filter options" type_opts && ret=0 ;; (volume) - __docker_volumes && ret=0 + __docker_complete_volumes && ret=0 ;; *) _message 'value' && ret=0 @@ -468,6 +474,553 @@ __docker_complete_events_filter() { return ret } +# BO container + +__docker_container_commands() { + local -a _docker_container_subcommands + _docker_container_subcommands=( + "attach:Attach to a running container" + "commit:Create a new image from a container's changes" + "cp:Copy files/folders between a container and the local filesystem" + "create:Create a new container" + "diff:Inspect changes on a container's filesystem" + "exec:Run a command in a running container" + "export:Export a container's filesystem as a tar archive" + "inspect:Display detailed information on one or more containers" + "kill:Kill one or more running containers" + "logs:Fetch the logs of a container" + "ls:List containers" + "pause:Pause all processes within one or more containers" + "port:List port mappings or a specific mapping for the container" + "prune:Remove all stopped containers" + "rename:Rename a container" + "restart:Restart one or more containers" + "rm:Remove one or more containers" + "run:Run a command in a new container" + "start:Start one or more stopped containers" + "stats:Display a live stream of container(s) resource usage statistics" + "stop:Stop one or more running containers" + "top:Display the running processes of a container" + "unpause:Unpause all processes within one or more containers" + "update:Update configuration of one or more containers" + "wait:Block until one or more containers stop, then print their exit codes" + ) + _describe -t docker-container-commands "docker container command" _docker_container_subcommands +} + +__docker_container_subcommand() { + local -a _command_args opts_help opts_attach_exec_run_start opts_create_run opts_create_run_update + local expl help="--help" + integer ret=1 + + opts_attach_exec_run_start=( + "($help)--detach-keys=[Escape key sequence used to detach a container]:sequence:__docker_complete_detach_keys" + ) + opts_create_run=( + "($help -a --attach)"{-a=,--attach=}"[Attach to stdin, stdout or stderr]:device:(STDIN STDOUT STDERR)" + "($help)*--add-host=[Add a custom host-to-IP mapping]:host\:ip mapping: " + "($help)*--blkio-weight-device=[Block IO (relative device weight)]:device:Block IO weight: " + "($help)*--cap-add=[Add Linux capabilities]:capability: " + "($help)*--cap-drop=[Drop Linux capabilities]:capability: " + "($help)--cgroup-parent=[Parent cgroup for the container]:cgroup: " + "($help)--cidfile=[Write the container ID to the file]:CID file:_files" + "($help)--cpus=[Number of CPUs (default 0.000)]:cpus: " + "($help)*--device=[Add a host device to the container]:device:_files" + "($help)*--device-read-bps=[Limit the read rate (bytes per second) from a device]:device:IO rate: " + "($help)*--device-read-iops=[Limit the read rate (IO per second) from a device]:device:IO rate: " + "($help)*--device-write-bps=[Limit the write rate (bytes per second) to a device]:device:IO rate: " + "($help)*--device-write-iops=[Limit the write rate (IO per second) to a device]:device:IO rate: " + "($help)--disable-content-trust[Skip image verification]" + "($help)*--dns=[Custom DNS servers]:DNS server: " + "($help)*--dns-option=[Custom DNS options]:DNS option: " + "($help)*--dns-search=[Custom DNS search domains]:DNS domains: " + "($help)*"{-e=,--env=}"[Environment variables]:environment variable: " + "($help)--entrypoint=[Overwrite the default entrypoint of the image]:entry point: " + "($help)*--env-file=[Read environment variables from a file]:environment file:_files" + "($help)*--expose=[Expose a port from the container without publishing it]: " + "($help)*--group=[Set one or more supplementary user groups for the container]:group:_groups" + "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts" + "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" + "($help)--ip=[Container IPv4 address]:IPv4: " + "($help)--ip6=[Container IPv6 address]:IPv6: " + "($help)--ipc=[IPC namespace to use]:IPC namespace: " + "($help)--isolation=[Container isolation technology]:isolation:(default hyperv process)" + "($help)*--link=[Add link to another container]:link:->link" + "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: " + "($help)*"{-l=,--label=}"[Container metadata]:label: " + "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_complete_log_drivers" + "($help)*--log-opt=[Log driver specific options]:log driver options:__docker_complete_log_options" + "($help)--mac-address=[Container MAC address]:MAC address: " + "($help)--name=[Container name]:name: " + "($help)--network=[Connect a container to a network]:network mode:(bridge none container host)" + "($help)*--network-alias=[Add network-scoped alias for the container]:alias: " + "($help)--oom-kill-disable[Disable OOM Killer]" + "($help)--oom-score-adj[Tune the host's OOM preferences for containers (accepts -1000 to 1000)]" + "($help)--pids-limit[Tune container pids limit (set -1 for unlimited)]" + "($help -P --publish-all)"{-P,--publish-all}"[Publish all exposed ports]" + "($help)*"{-p=,--publish=}"[Expose a container's port to the host]:port:_ports" + "($help)--pid=[PID namespace to use]:PID namespace:__docker_complete_pid" + "($help)--privileged[Give extended privileges to this container]" + "($help)--read-only[Mount the container's root filesystem as read only]" + "($help)*--security-opt=[Security options]:security option: " + "($help)*--shm-size=[Size of '/dev/shm' (format is '')]:shm size: " + "($help)--stop-timeout=[Timeout (in seconds) to stop a container]:time: " + "($help)*--sysctl=-[sysctl options]:sysctl: " + "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" + "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" + "($help)*--ulimit=[ulimit options]:ulimit: " + "($help)--userns=[Container user namespace]:user namespace:(host)" + "($help)--tmpfs[mount tmpfs]" + "($help)*-v[Bind mount a volume]:volume: " + "($help)--volume-driver=[Optional volume driver for the container]:volume driver:(local)" + "($help)*--volumes-from=[Mount volumes from the specified container]:volume: " + "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories" + ) + opts_create_run_update=( + "($help)--blkio-weight=[Block IO (relative weight), between 10 and 1000]:Block IO weight:(10 100 500 1000)" + "($help -c --cpu-shares)"{-c=,--cpu-shares=}"[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)" + "($help)--cpu-period=[Limit the CPU CFS (Completely Fair Scheduler) period]:CPU period: " + "($help)--cpu-quota=[Limit the CPU CFS (Completely Fair Scheduler) quota]:CPU quota: " + "($help)--cpu-rt-period=[Limit the CPU real-time period]:CPU real-time period in microseconds: " + "($help)--cpu-rt-runtime=[Limit the CPU real-time runtime]:CPU real-time runtime in microseconds: " + "($help)--cpuset-cpus=[CPUs in which to allow execution]:CPUs: " + "($help)--cpuset-mems=[MEMs in which to allow execution]:MEMs: " + "($help)--kernel-memory=[Kernel memory limit in bytes]:Memory limit: " + "($help -m --memory)"{-m=,--memory=}"[Memory limit]:Memory limit: " + "($help)--memory-reservation=[Memory soft limit]:Memory limit: " + "($help)--memory-swap=[Total memory limit with swap]:Memory limit: " + "($help)--restart=[Restart policy]:restart policy:(no on-failure always unless-stopped)" + ) + opts_help=("(: -)--help[Print usage]") + + case "$words[1]" in + (attach) + _arguments $(__docker_arguments) \ + $opts_help \ + $opts_attach_exec_run_start \ + "($help)--no-stdin[Do not attach stdin]" \ + "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \ + "($help -):containers:__docker_complete_running_containers" && ret=0 + ;; + (commit) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -a --author)"{-a=,--author=}"[Author]:author: " \ + "($help)*"{-c=,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \ + "($help -m --message)"{-m=,--message=}"[Commit message]:message: " \ + "($help -p --pause)"{-p,--pause}"[Pause container during commit]" \ + "($help -):container:__docker_complete_containers" \ + "($help -): :__docker_complete_repositories_with_tags" && ret=0 + ;; + (cp) + local state + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -L --follow-link)"{-L,--follow-link}"[Always follow symbol link]" \ + "($help -)1:container:->container" \ + "($help -)2:hostpath:_files" && ret=0 + case $state in + (container) + if compset -P "*:"; then + _files && ret=0 + else + __docker_complete_containers -qS ":" && ret=0 + fi + ;; + esac + ;; + (create) + local state + _arguments $(__docker_arguments) \ + $opts_help \ + $opts_create_run \ + $opts_create_run_update \ + "($help -): :__docker_complete_images" \ + "($help -):command: _command_names -e" \ + "($help -)*::arguments: _normal" && ret=0 + case $state in + (link) + if compset -P "*:"; then + _wanted alias expl "Alias" compadd -E "" && ret=0 + else + __docker_complete_running_containers -qS ":" && ret=0 + fi + ;; + esac + ;; + (diff) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -)*:containers:__docker_complete_containers" && ret=0 + ;; + (exec) + local state + _arguments $(__docker_arguments) \ + $opts_help \ + $opts_attach_exec_run_start \ + "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \ + "($help)*"{-e=,--env=}"[Set environment variables]:environment variable: " \ + "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" \ + "($help)--privileged[Give extended Linux capabilities to the command]" \ + "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \ + "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" \ + "($help -):containers:__docker_complete_running_containers" \ + "($help -)*::command:->anycommand" && ret=0 + case $state in + (anycommand) + shift 1 words + (( CURRENT-- )) + _normal && ret=0 + ;; + esac + ;; + (export) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -o --output)"{-o=,--output=}"[Write to a file, instead of stdout]:output file:_files" \ + "($help -)*:containers:__docker_complete_containers" && ret=0 + ;; + (inspect) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \ + "($help -s --size)"{-s,--size}"[Display total file sizes]" \ + "($help -)*:containers:__docker_complete_containers" && ret=0 + ;; + (kill) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -s --signal)"{-s=,--signal=}"[Signal to send]:signal:_signals" \ + "($help -)*:containers:__docker_complete_running_containers" && ret=0 + ;; + (logs) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help)--details[Show extra details provided to logs]" \ + "($help -f --follow)"{-f,--follow}"[Follow log output]" \ + "($help -s --since)"{-s=,--since=}"[Show logs since this timestamp]:timestamp: " \ + "($help -t --timestamps)"{-t,--timestamps}"[Show timestamps]" \ + "($help)--tail=[Output the last K lines]:lines:(1 10 20 50 all)" \ + "($help -)*:containers:__docker_complete_containers" && ret=0 + ;; + (ls|list) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -a --all)"{-a,--all}"[Show all containers]" \ + "($help)--before=[Show only container created before...]:containers:__docker_complete_containers" \ + "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_ps_filters" \ + "($help)--format=[Pretty-print containers using a Go template]:template: " \ + "($help -l --latest)"{-l,--latest}"[Show only the latest created container]" \ + "($help -n --last)"{-n=,--last=}"[Show n last created containers (includes all states)]:n:(1 5 10 25 50)" \ + "($help)--no-trunc[Do not truncate output]" \ + "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \ + "($help -s --size)"{-s,--size}"[Display total file sizes]" \ + "($help)--since=[Show only containers created since...]:containers:__docker_complete_containers" && ret=0 + ;; + (pause|unpause) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -)*:containers:__docker_complete_running_containers" && ret=0 + ;; + (port) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -)1:containers:__docker_complete_running_containers" \ + "($help -)2:port:_ports" && ret=0 + ;; + (prune) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0 + ;; + (rename) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -):old name:__docker_complete_containers" \ + "($help -):new name: " && ret=0 + ;; + (restart) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \ + "($help -)*:containers:__docker_complete_containers_ids" && ret=0 + ;; + (rm) + local state + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -f --force)"{-f,--force}"[Force removal]" \ + "($help -l --link)"{-l,--link}"[Remove the specified link and not the underlying container]" \ + "($help -v --volumes)"{-v,--volumes}"[Remove the volumes associated to the container]" \ + "($help -)*:containers:->values" && ret=0 + case $state in + (values) + if [[ ${words[(r)-f]} == -f || ${words[(r)--force]} == --force ]]; then + __docker_complete_containers && ret=0 + else + __docker_complete_stopped_containers && ret=0 + fi + ;; + esac + ;; + (run) + local state + _arguments $(__docker_arguments) \ + $opts_help \ + $opts_create_run \ + $opts_create_run_update \ + $opts_attach_exec_run_start \ + "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \ + "($help)--health-cmd=[Command to run to check health]:command: " \ + "($help)--health-interval=[Time between running the check]:time: " \ + "($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)" \ + "($help)--health-timeout=[Maximum time to allow one check to run]:time: " \ + "($help)--no-healthcheck[Disable any container-specified HEALTHCHECK]" \ + "($help)--rm[Remove intermediate containers when it exits]" \ + "($help)--runtime=[Name of the runtime to be used for that container]:runtime:__docker_complete_runtimes" \ + "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \ + "($help)--stop-signal=[Signal to kill a container]:signal:_signals" \ + "($help)--storage-opt=[Storage driver options for the container]:storage options:->storage-opt" \ + "($help -): :__docker_complete_images" \ + "($help -):command: _command_names -e" \ + "($help -)*::arguments: _normal" && ret=0 + case $state in + (link) + if compset -P "*:"; then + _wanted alias expl "Alias" compadd -E "" && ret=0 + else + __docker_complete_running_containers -qS ":" && ret=0 + fi + ;; + (storage-opt) + if compset -P "*="; then + _message "value" && ret=0 + else + opts=('size') + _describe -t filter-opts "storage options" opts -qS "=" && ret=0 + fi + ;; + esac + ;; + (start) + _arguments $(__docker_arguments) \ + $opts_help \ + $opts_attach_exec_run_start \ + "($help -a --attach)"{-a,--attach}"[Attach container's stdout/stderr and forward all signals]" \ + "($help -i --interactive)"{-i,--interactive}"[Attach container's stding]" \ + "($help -)*:containers:__docker_complete_stopped_containers" && ret=0 + ;; + (stats) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -a --all)"{-a,--all}"[Show all containers (default shows just running)]" \ + "($help)--format=[Pretty-print images using a Go template]:template: " \ + "($help)--no-stream[Disable streaming stats and only pull the first result]" \ + "($help -)*:containers:__docker_complete_running_containers" && ret=0 + ;; + (stop) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \ + "($help -)*:containers:__docker_complete_running_containers" && ret=0 + ;; + (top) + local state + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -)1:containers:__docker_complete_running_containers" \ + "($help -)*:: :->ps-arguments" && ret=0 + case $state in + (ps-arguments) + _ps && ret=0 + ;; + esac + ;; + (update) + local state + _arguments $(__docker_arguments) \ + $opts_help \ + opts_create_run_update \ + "($help -)*: :->values" && ret=0 + case $state in + (values) + if [[ ${words[(r)--kernel-memory*]} = (--kernel-memory*) ]]; then + __docker_complete_stopped_containers && ret=0 + else + __docker_complete_containers && ret=0 + fi + ;; + esac + ;; + (wait) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -)*:containers:__docker_complete_running_containers" && ret=0 + ;; + (help) + _arguments $(__docker_arguments) ":subcommand:__docker_container_commands" && ret=0 + ;; + esac + + return ret +} + +# EO container + +# BO image + +__docker_image_commands() { + local -a _docker_image_subcommands + _docker_image_subcommands=( + "build:Build an image from a Dockerfile" + "history:Show the history of an image" + "import:Import the contents from a tarball to create a filesystem image" + "inspect:Display detailed information on one or more images" + "load:Load an image from a tar archive or STDIN" + "ls:List images" + "prune:Remove unused images" + "pull:Pull an image or a repository from a registry" + "push:Push an image or a repository to a registry" + "rm:Remove one or more images" + "save:Save one or more images to a tar archive (streamed to STDOUT by default)" + "tag:Tag an image into a repository" + ) + _describe -t docker-image-commands "docker image command" _docker_image_subcommands +} + +__docker_image_subcommand() { + local -a _command_args opts_help + local expl help="--help" + integer ret=1 + + opts_help=("(: -)--help[Print usage]") + + case "$words[1]" in + (build) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help)*--build-arg=[Build-time variables]:=: " \ + "($help)*--cache-from=[Images to consider as cache sources]: :__docker_complete_repositories_with_tags" \ + "($help -c --cpu-shares)"{-c=,--cpu-shares=}"[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)" \ + "($help)--cgroup-parent=[Parent cgroup for the container]:cgroup: " \ + "($help)--compress[Compress the build context using gzip]" \ + "($help)--cpu-period=[Limit the CPU CFS (Completely Fair Scheduler) period]:CPU period: " \ + "($help)--cpu-quota=[Limit the CPU CFS (Completely Fair Scheduler) quota]:CPU quota: " \ + "($help)--cpu-rt-period=[Limit the CPU real-time period]:CPU real-time period in microseconds: " \ + "($help)--cpu-rt-runtime=[Limit the CPU real-time runtime]:CPU real-time runtime in microseconds: " \ + "($help)--cpuset-cpus=[CPUs in which to allow execution]:CPUs: " \ + "($help)--cpuset-mems=[MEMs in which to allow execution]:MEMs: " \ + "($help)--disable-content-trust[Skip image verification]" \ + "($help -f --file)"{-f=,--file=}"[Name of the Dockerfile]:Dockerfile:_files" \ + "($help)--force-rm[Always remove intermediate containers]" \ + "($help)--isolation=[Container isolation technology]:isolation:(default hyperv process)" \ + "($help)*--label=[Set metadata for an image]:label=value: " \ + "($help -m --memory)"{-m=,--memory=}"[Memory limit]:Memory limit: " \ + "($help)--memory-swap=[Total memory limit with swap]:Memory limit: " \ + "($help)--network=[Connect a container to a network]:network mode:(bridge none container host)" \ + "($help)--no-cache[Do not use cache when building the image]" \ + "($help)--pull[Attempt to pull a newer version of the image]" \ + "($help -q --quiet)"{-q,--quiet}"[Suppress verbose build output]" \ + "($help)--rm[Remove intermediate containers after a successful build]" \ + "($help)*--shm-size=[Size of '/dev/shm' (format is '')]:shm size: " \ + "($help -t --tag)*"{-t=,--tag=}"[Repository, name and tag for the image]: :__docker_complete_repositories_with_tags" \ + "($help)*--ulimit=[ulimit options]:ulimit: " \ + "($help)--userns=[Container user namespace]:user namespace:(host)" \ + "($help -):path or URL:_directories" && ret=0 + ;; + (history) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -H --human)"{-H,--human}"[Print sizes and dates in human readable format]" \ + "($help)--no-trunc[Do not truncate output]" \ + "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \ + "($help -)*: :__docker_complete_images" && ret=0 + ;; + (import) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help)*"{-c=,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \ + "($help -m --message)"{-m=,--message=}"[Commit message for imported image]:message: " \ + "($help -):URL:(- http:// file://)" \ + "($help -): :__docker_complete_repositories_with_tags" && ret=0 + ;; + (inspect) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \ + "($help -)*:images:__docker_complete_images" && ret=0 + ;; + (load) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -i --input)"{-i=,--input=}"[Read from tar archive file]:archive file:_files -g \"*.((tar|TAR)(.gz|.GZ|.Z|.bz2|.lzma|.xz|)|(tbz|tgz|txz))(-.)\"" \ + "($help -q --quiet)"{-q,--quiet}"[Suppress the load output]" && ret=0 + ;; + (ls|list) + local state + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -a --all)"{-a,--all}"[Show all images]" \ + "($help)--digests[Show digests]" \ + "($help)*"{-f=,--filter=}"[Filter values]:filter:->filter-options" \ + "($help)--format=[Pretty-print images using a Go template]:template: " \ + "($help)--no-trunc[Do not truncate output]" \ + "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \ + "($help -): :__docker_complete_repositories" && ret=0 + case $state in + (filter-options) + __docker_complete_images_filters && ret=0 + ;; + esac + ;; + (prune) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -a --all)"{-a,--all}"[Remove all unused images, not just dangling ones]" \ + "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0 + ;; + (pull) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -a --all-tags)"{-a,--all-tags}"[Download all tagged images]" \ + "($help)--disable-content-trust[Skip image verification]" \ + "($help -):name:__docker_search" && ret=0 + ;; + (push) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help)--disable-content-trust[Skip image signing]" \ + "($help -): :__docker_complete_images" && ret=0 + ;; + (rm) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -f --force)"{-f,--force}"[Force removal]" \ + "($help)--no-prune[Do not delete untagged parents]" \ + "($help -)*: :__docker_complete_images" && ret=0 + ;; + (save) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -o --output)"{-o=,--output=}"[Write to file]:file:_files" \ + "($help -)*: :__docker_complete_images" && ret=0 + ;; + (tag) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -):source:__docker_complete_images"\ + "($help -):destination:__docker_complete_repositories_with_tags" && ret=0 + ;; + (help) + _arguments $(__docker_arguments) ":subcommand:__docker_container_commands" && ret=0 + ;; + esac + + return ret +} + +# EO image + # BO network __docker_network_complete_ls_filters() { @@ -480,10 +1033,10 @@ __docker_network_complete_ls_filters() { __docker_complete_info_plugins Network && ret=0 ;; (id) - __docker_networks_ids && ret=0 + __docker_complete_networks_ids && ret=0 ;; (name) - __docker_networks_names && ret=0 + __docker_complete_networks_names && ret=0 ;; (type) type_opts=('builtin' 'custom') @@ -529,6 +1082,7 @@ __docker_get_networks() { for line in $lines; do s="${line[${begin[NETWORK ID]},${end[NETWORK ID]}]%% ##}" s="$s:${(l:7:: :::)${${line[${begin[DRIVER]},${end[DRIVER]}]}%% ##}}" + s="$s, ${${line[${begin[SCOPE]},${end[SCOPE]}]}%% ##}" networks=($networks $s) done fi @@ -538,6 +1092,7 @@ __docker_get_networks() { for line in $lines; do s="${line[${begin[NAME]},${end[NAME]}]%% ##}" s="$s:${(l:7:: :::)${${line[${begin[DRIVER]},${end[DRIVER]}]}%% ##}}" + s="$s, ${${line[${begin[SCOPE]},${end[SCOPE]}]}%% ##}" networks=($networks $s) done fi @@ -546,17 +1101,17 @@ __docker_get_networks() { return ret } -__docker_networks() { +__docker_complete_networks() { [[ $PREFIX = -* ]] && return 1 __docker_get_networks all "$@" } -__docker_networks_ids() { +__docker_complete_networks_ids() { [[ $PREFIX = -* ]] && return 1 __docker_get_networks ids "$@" } -__docker_networks_names() { +__docker_complete_networks_names() { [[ $PREFIX = -* ]] && return 1 __docker_get_networks names "$@" } @@ -569,6 +1124,7 @@ __docker_network_commands() { "disconnect:Disconnects a container from a network" "inspect:Displays detailed information on a network" "ls:Lists all the networks created by the user" + "prune:Remove all unused networks" "rm:Deletes one or more networks" ) _describe -t docker-network-commands "docker network command" _docker_network_subcommands @@ -590,15 +1146,15 @@ __docker_network_subcommand() { "($help)--ip6=[Container IPv6 address]:IPv6: " \ "($help)*--link=[Add a link to another container]:link:->link" \ "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: " \ - "($help -)1:network:__docker_networks" \ - "($help -)2:containers:__docker_containers" && ret=0 + "($help -)1:network:__docker_complete_networks" \ + "($help -)2:containers:__docker_complete_containers" && ret=0 case $state in (link) if compset -P "*:"; then _wanted alias expl "Alias" compadd -E "" && ret=0 else - __docker_runningcontainers -qS ":" && ret=0 + __docker_complete_running_containers -qS ":" && ret=0 fi ;; esac @@ -606,6 +1162,7 @@ __docker_network_subcommand() { (create) _arguments $(__docker_arguments) -A '-*' \ $opts_help \ + "($help)--attachable[Enable manual container attachment]" \ "($help)*--aux-address[Auxiliary IPv4 or IPv6 addresses used by network driver]:key=IP: " \ "($help -d --driver)"{-d=,--driver=}"[Driver to manage the Network]:driver:(null host bridge overlay)" \ "($help)*--gateway=[IPv4 or IPv6 Gateway for the master subnet]:IP: " \ @@ -622,14 +1179,14 @@ __docker_network_subcommand() { (disconnect) _arguments $(__docker_arguments) \ $opts_help \ - "($help -)1:network:__docker_networks" \ - "($help -)2:containers:__docker_containers" && ret=0 + "($help -)1:network:__docker_complete_networks" \ + "($help -)2:containers:__docker_complete_containers" && ret=0 ;; (inspect) _arguments $(__docker_arguments) \ $opts_help \ "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \ - "($help -)*:network:__docker_networks" && ret=0 + "($help -)*:network:__docker_complete_networks" && ret=0 ;; (ls) _arguments $(__docker_arguments) \ @@ -644,10 +1201,15 @@ __docker_network_subcommand() { ;; esac ;; + (prune) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0 + ;; (rm) _arguments $(__docker_arguments) \ $opts_help \ - "($help -)*:network:__docker_networks" && ret=0 + "($help -)*:network:__docker_complete_networks" && ret=0 ;; (help) _arguments $(__docker_arguments) ":subcommand:__docker_network_commands" && ret=0 @@ -814,7 +1376,7 @@ __docker_node_subcommand() { (rm|remove) _arguments $(__docker_arguments) \ $opts_help \ - "($help)--force[Force remove an active node]" \ + "($help -f --force)"{-f,--force}"[Force remove a node from the swarm]" \ "($help -)*:node:__docker_complete_pending_nodes" && ret=0 ;; (demote) @@ -956,6 +1518,107 @@ __docker_plugin_subcommand() { # EO plugin +# BO secret + +__docker_secrets() { + [[ $PREFIX = -* ]] && return 1 + integer ret=1 + local line s + declare -a lines secrets + + type=$1; shift + + lines=(${(f)${:-"$(_call_program commands docker $docker_options secret ls)"$'\n'}}) + + # Parse header line to find columns + local i=1 j=1 k header=${lines[1]} + declare -A begin end + while (( j < ${#header} - 1 )); do + i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 )) + j=$(( i + ${${header[$i,-1]}[(i) ]} - 1 )) + k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 )) + begin[${header[$i,$((j-1))]}]=$i + end[${header[$i,$((j-1))]}]=$k + done + end[${header[$i,$((j-1))]}]=-1 + lines=(${lines[2,-1]}) + + # ID + if [[ $type = (ids|all) ]]; then + for line in $lines; do + s="${line[${begin[ID]},${end[ID]}]%% ##}" + secrets=($secrets $s) + done + fi + + # Names + if [[ $type = (names|all) ]]; then + for line in $lines; do + s="${line[${begin[NAME]},${end[NAME]}]%% ##}" + secrets=($secrets $s) + done + fi + + _describe -t secrets-list "secrets" secrets "$@" && ret=0 + return ret +} + +__docker_complete_secrets() { + [[ $PREFIX = -* ]] && return 1 + __docker_secrets all "$@" +} + +__docker_secret_commands() { + local -a _docker_secret_subcommands + _docker_secret_subcommands=( + "create:Create a secret using stdin as content" + "inspect:Display detailed information on one or more secrets" + "ls:List secrets" + "rm:Remove one or more secrets" + ) + _describe -t docker-secret-commands "docker secret command" _docker_secret_subcommands +} + +__docker_secret_subcommand() { + local -a _command_args opts_help + local expl help="--help" + integer ret=1 + + opts_help=("(: -)--help[Print usage]") + + case "$words[1]" in + (create) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help)*"{-l=,--label=}"[Secret labels]:label: " \ + "($help -):secret: " && ret=0 + ;; + (inspect) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -f --format)"{-f=,--format=}"[Format the output using the given Go template]:template: " \ + "($help -)*:secret:__docker_complete_secrets" && ret=0 + ;; + (ls|list) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" && ret=0 + ;; + (rm|remove) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -)*:secret:__docker_complete_secrets" && ret=0 + ;; + (help) + _arguments $(__docker_arguments) ":subcommand:__docker_secret_commands" && ret=0 + ;; + esac + + return ret +} + +# EO secret + # BO service __docker_service_complete_ls_filters() { @@ -1071,7 +1734,7 @@ __docker_service_commands() { "inspect:Display detailed information on one or more services" "ls:List services" "rm:Remove one or more services" - "scale:Scale one or multiple services" + "scale:Scale one or multiple replicated services" "ps:List the tasks of a service" "update:Update a service" ) @@ -1088,15 +1751,19 @@ __docker_service_subcommand() { "($help)*--constraint=[Placement constraints]:constraint: " "($help)--endpoint-mode=[Placement constraints]:mode:(dnsrr vip)" "($help)*"{-e=,--env=}"[Set environment variables]:env: " - "($help)*--group-add=[Add additional user groups to the container]:group:_groups" + "($help)--health-cmd=[Command to run to check health]:command: " + "($help)--health-interval=[Time between running the check]:time: " + "($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)" + "($help)--health-timeout=[Maximum time to allow one check to run]:time: " + "($help)--hostname=[Service container hostname]:hostname: " \ "($help)*--label=[Service labels]:label: " "($help)--limit-cpu=[Limit CPUs]:value: " "($help)--limit-memory=[Limit Memory]:value: " - "($help)--log-driver=[Logging driver for service]:logging driver:__docker_log_drivers" - "($help)*--log-opt=[Logging driver options]:log driver options:__docker_log_options" - "($help)*--mount=[Attach a mount to the service]:mount: " - "($help)--name=[Service name]:name: " + "($help)--log-driver=[Logging driver for service]:logging driver:__docker_complete_log_drivers" + "($help)*--log-opt=[Logging driver options]:log driver options:__docker_complete_log_options" + "($help)*--mount=[Attach a filesystem mount to the service]:mount: " "($help)*--network=[Network attachments]:network: " + "($help)--no-healthcheck[Disable any container-specified HEALTHCHECK]" "($help)*"{-p=,--publish=}"[Publish a port as a node port]:port: " "($help)--replicas=[Number of tasks]:replicas: " "($help)--reserve-cpu=[Reserve CPUs]:value: " @@ -1105,7 +1772,9 @@ __docker_service_subcommand() { "($help)--restart-delay=[Delay between restart attempts]:delay: " "($help)--restart-max-attempts=[Maximum number of restarts before giving up]:max-attempts: " "($help)--restart-window=[Window used to evaluate the restart policy]:window: " + "($help)*--secret=[Specify secrets to expose to the service]:secret:__docker_complete_secrets" "($help)--stop-grace-period=[Time to wait before force killing a container]:grace period: " + "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-TTY]" "($help)--update-delay=[Delay between updates]:delay: " "($help)--update-failure-action=[Action on update failure]:mode:(pause continue)" "($help)--update-max-failure-ratio=[Failure rate to tolerate during an update]:fraction: " @@ -1122,8 +1791,14 @@ __docker_service_subcommand() { $opts_help \ $opts_create_update \ "($help)*--container-label=[Container labels]:label: " \ + "($help)*--dns=[Set custom DNS servers]:DNS: " \ + "($help)*--dns-option=[Set DNS options]:DNS option: " \ + "($help)*--dns-search=[Set custom DNS search domains]:DNS search: " \ + "($help)*--env-file=[Read environment variables from a file]:environment file:_files" \ "($help)--mode=[Service Mode]:mode:(global replicated)" \ - "($help -): :__docker_images" \ + "($help)--name=[Service name]:name: " \ + "($help)*--publish=[Publish a port]:port: " \ + "($help -): :__docker_complete_images" \ "($help -):command: _command_names -e" \ "($help -)*::arguments: _normal" && ret=0 ;; @@ -1167,10 +1842,10 @@ __docker_service_subcommand() { (ps) _arguments $(__docker_arguments) \ $opts_help \ - "($help -a --all)"{-a,--all}"[Display all tasks]" \ "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \ "($help)--no-resolve[Do not map IDs to Names]" \ "($help)--no-trunc[Do not truncate output]" \ + "($help -q --quiet)"{-q,--quiet}"[Only display task IDs]" \ "($help -)1:service:__docker_complete_services" && ret=0 case $state in (filter-options) @@ -1185,9 +1860,18 @@ __docker_service_subcommand() { "($help)--arg=[Service command args]:arguments: _normal" \ "($help)*--container-label-add=[Add or update container labels]:label: " \ "($help)*--container-label-rm=[Remove a container label by its key]:label: " \ + "($help)*--dns-add=[Add or update custom DNS servers]:DNS: " \ + "($help)*--dns-rm=[Remove custom DNS servers]:DNS: " \ + "($help)*--dns-option-add=[Add or update DNS options]:DNS option: " \ + "($help)*--dns-option-rm=[Remove DNS options]:DNS option: " \ + "($help)*--dns-search-add=[Add or update custom DNS search domains]:DNS search: " \ + "($help)*--dns-search-rm=[Remove DNS search domains]:DNS search: " \ "($help)--force[Force update]" \ - "($help)*--group-rm=[Remove previously added user groups from the container]:group:_groups" \ - "($help)--image=[Service image tag]:image:__docker_repositories" \ + "($help)*--group-add=[Add additional supplementary user groups to the container]:group:_groups" \ + "($help)*--group-rm=[Remove previously added supplementary user groups from the container]:group:_groups" \ + "($help)--image=[Service image tag]:image:__docker_complete_repositories" \ + "($help)*--publish-add=[Add or update a port]:port: " \ + "($help)*--publish-rm=[Remove a port(target-port mandatory)]:port: " \ "($help)--rollback[Rollback to previous specification]" \ "($help -)1:service:__docker_complete_services" && ret=0 ;; @@ -1201,6 +1885,147 @@ __docker_service_subcommand() { # EO service +# BO stack + +__docker_stack_complete_ps_filters() { + [[ $PREFIX = -* ]] && return 1 + integer ret=1 + + if compset -P '*='; then + case "${${words[-1]%=*}#*=}" in + (desired-state) + state_opts=('accepted' 'running') + _describe -t state-opts "desired state options" state_opts && ret=0 + ;; + *) + _message 'value' && ret=0 + ;; + esac + else + opts=('desired-state' 'id' 'name') + _describe -t filter-opts "filter options" opts -qS "=" && ret=0 + fi + + return ret +} + +__docker_stack_complete_services_filters() { + [[ $PREFIX = -* ]] && return 1 + integer ret=1 + + if compset -P '*='; then + case "${${words[-1]%=*}#*=}" in + *) + _message 'value' && ret=0 + ;; + esac + else + opts=('id' 'label' 'name') + _describe -t filter-opts "filter options" opts -qS "=" && ret=0 + fi + + return ret +} + +__docker_stacks() { + [[ $PREFIX = -* ]] && return 1 + integer ret=1 + local line s + declare -a lines stacks + + lines=(${(f)${:-"$(_call_program commands docker $docker_options stack ls)"$'\n'}}) + + # Parse header line to find columns + local i=1 j=1 k header=${lines[1]} + declare -A begin end + while (( j < ${#header} - 1 )); do + i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 )) + j=$(( i + ${${header[$i,-1]}[(i) ]} - 1 )) + k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 )) + begin[${header[$i,$((j-1))]}]=$i + end[${header[$i,$((j-1))]}]=$k + done + end[${header[$i,$((j-1))]}]=-1 + lines=(${lines[2,-1]}) + + # Service ID + for line in $lines; do + s="${line[${begin[ID]},${end[ID]}]%% ##}" + stacks=($stacks $s) + done + + _describe -t stacks-list "stacks" stacks "$@" && ret=0 + return ret +} + +__docker_complete_stacks() { + [[ $PREFIX = -* ]] && return 1 + __docker_stacks "$@" +} + +__docker_stack_commands() { + local -a _docker_stack_subcommands + _docker_stack_subcommands=( + "deploy:Deploy a new stack or update an existing stack" + "ls:List stacks" + "ps:List the tasks in the stack" + "rm:Remove the stack" + "services:List the services in the stack" + ) + _describe -t docker-stack-commands "docker stack command" _docker_stack_subcommands +} + +__docker_stack_subcommand() { + local -a _command_args opts_help + local expl help="--help" + integer ret=1 + + opts_help=("(: -)--help[Print usage]") + + case "$words[1]" in + (deploy|up) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help)--bundle-file=[Path to a Distributed Application Bundle file]:dab:_files -g \"*.dab\"" \ + "($help -c --compose-file)"{-c=,--compose-file=}"[Path to a Compose file]:compose file:_files -g \"*.(yml|yaml)\"" \ + "($help)--with-registry-auth[Send registry authentication details to Swarm agents]" \ + "($help -):stack:__docker_complete_stacks" && ret=0 + ;; + (ls|list) + _arguments $(__docker_arguments) \ + $opts_help && ret=0 + ;; + (ps) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -a --all)"{-a,--all}"[Display all tasks]" \ + "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_stack_complete_ps_filters" \ + "($help)--no-resolve[Do not map IDs to Names]" \ + "($help)--no-trunc[Do not truncate output]" \ + "($help -):stack:__docker_complete_stacks" && ret=0 + ;; + (rm|remove|down) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -):stack:__docker_complete_stacks" && ret=0 + ;; + (services) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_stack_complete_services_filters" \ + "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" \ + "($help -):stack:__docker_complete_stacks" && ret=0 + ;; + (help) + _arguments $(__docker_arguments) ":subcommand:__docker_stack_commands" && ret=0 + ;; + esac + + return ret +} + +# EO stack + # BO swarm __docker_swarm_commands() { @@ -1229,7 +2054,10 @@ __docker_swarm_subcommand() { "($help)--advertise-addr[Advertised address]:ip\:port: " \ "($help)*--external-ca=[Specifications of one or more certificate signing endpoints]:endpoint: " \ "($help)--force-new-cluster[Force create a new cluster from current state]" \ - "($help)--listen-addr=[Listen address]:ip\:port: " && ret=0 + "($help)--listen-addr=[Listen address]:ip\:port: " \ + "($help)--max-snapshots[Number of additional Raft snapshots to retain]" \ + "($help)--snapshot-interval[Number of log entries between Raft snapshots]" \ + "($help)--task-history-limit=[Task history retention limit]:limit: " && ret=0 ;; (join) _arguments $(__docker_arguments) \ @@ -1248,13 +2076,17 @@ __docker_swarm_subcommand() { ;; (leave) _arguments $(__docker_arguments) \ - $opts_help && ret=0 + $opts_help \ + "($help -f --force)"{-f,--force}"[Force this node to leave the swarm, ignoring warnings]" && ret=0 ;; (update) _arguments $(__docker_arguments) \ $opts_help \ "($help)--cert-expiry=[Validity period for node certificates]:duration: " \ + "($help)*--external-ca=[Specifications of one or more certificate signing endpoints]:endpoint: " \ "($help)--dispatcher-heartbeat=[Dispatcher heartbeat period]:duration: " \ + "($help)--max-snapshots[Number of additional Raft snapshots to retain]" \ + "($help)--snapshot-interval[Number of log entries between Raft snapshots]" \ "($help)--task-history-limit=[Task history retention limit]:limit: " && ret=0 ;; (help) @@ -1267,6 +2099,61 @@ __docker_swarm_subcommand() { # EO swarm +# BO system + +__docker_system_commands() { + local -a _docker_system_subcommands + _docker_system_subcommands=( + "df:Show docker filesystem usage" + "events:Get real time events from the server" + "info:Display system-wide information" + "prune:Remove unused data" + ) + _describe -t docker-system-commands "docker system command" _docker_system_subcommands +} + +__docker_system_subcommand() { + local -a _command_args opts_help + local expl help="--help" + integer ret=1 + + opts_help=("(: -)--help[Print usage]") + + case "$words[1]" in + (df) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -v --verbose)"{-v,--verbose}"[Show detailed information on space usage]" && ret=0 + ;; + (events) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_events_filter" \ + "($help)--since=[Events created since this timestamp]:timestamp: " \ + "($help)--until=[Events created until this timestamp]:timestamp: " \ + "($help)--format=[Format the output using the given go template]:template: " && ret=0 + ;; + (info) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " && ret=0 + ;; + (prune) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -a --all)"{-a,--all}"[Remove all unused data, not just dangling ones]" \ + "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0 + ;; + (help) + _arguments $(__docker_arguments) ":subcommand:__docker_volume_commands" && ret=0 + ;; + esac + + return ret +} + +# EO system + # BO volume __docker_volume_complete_ls_filters() { @@ -1283,7 +2170,7 @@ __docker_volume_complete_ls_filters() { __docker_complete_info_plugins Volume && ret=0 ;; (name) - __docker_volumes && ret=0 + __docker_complete_volumes && ret=0 ;; *) _message 'value' && ret=0 @@ -1297,7 +2184,7 @@ __docker_volume_complete_ls_filters() { return ret } -__docker_volumes() { +__docker_complete_volumes() { [[ $PREFIX = -* ]] && return 1 integer ret=1 declare -a lines volumes @@ -1335,6 +2222,7 @@ __docker_volume_commands() { "create:Create a volume" "inspect:Display detailed information on one or more volumes" "ls:List volumes" + "prune:Remove all unused volumes" "rm:Remove one or more volumes" ) _describe -t docker-volume-commands "docker volume command" _docker_volume_subcommands @@ -1360,7 +2248,7 @@ __docker_volume_subcommand() { _arguments $(__docker_arguments) \ $opts_help \ "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \ - "($help -)1:volume:__docker_volumes" && ret=0 + "($help -)1:volume:__docker_complete_volumes" && ret=0 ;; (ls) _arguments $(__docker_arguments) \ @@ -1374,11 +2262,16 @@ __docker_volume_subcommand() { ;; esac ;; + (prune) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0 + ;; (rm) _arguments $(__docker_arguments) \ $opts_help \ "($help -f --force)"{-f,--force}"[Force the removal of one or more volumes]" \ - "($help -):volume:__docker_volumes" && ret=0 + "($help -):volume:__docker_complete_volumes" && ret=0 ;; (help) _arguments $(__docker_arguments) ":subcommand:__docker_volume_commands" && ret=0 @@ -1408,7 +2301,7 @@ __docker_commands() { then local -a lines lines=(${(f)"$(_call_program commands docker 2>&1)"}) - _docker_subcommands=(${${${lines[$((${lines[(i)Commands:]} + 1)),${lines[(I) *]}]}## #}/ ##/:}) + _docker_subcommands=(${${${(M)${lines[$((${lines[(i)*Commands:]} + 1)),-1]}:# *}## #}/ ##/:}) _docker_subcommands=($_docker_subcommands 'daemon:Enable daemon mode' 'help:Show help for a command') (( $#_docker_subcommands > 2 )) && _store_cache docker_subcommands _docker_subcommands fi @@ -1416,188 +2309,61 @@ __docker_commands() { } __docker_subcommand() { - local -a _command_args opts_help opts_build_create_run opts_build_create_run_update opts_create_run opts_create_run_update + local -a _command_args opts_help local expl help="--help" integer ret=1 opts_help=("(: -)--help[Print usage]") - opts_build_create_run=( - "($help)--cgroup-parent=[Parent cgroup for the container]:cgroup: " - "($help)--isolation=[Container isolation technology]:isolation:(default hyperv process)" - "($help)--disable-content-trust[Skip image verification]" - "($help)*--shm-size=[Size of '/dev/shm' (format is '')]:shm size: " - "($help)*--ulimit=[ulimit options]:ulimit: " - "($help)--userns=[Container user namespace]:user namespace:(host)" - ) - opts_build_create_run_update=( - "($help -c --cpu-shares)"{-c=,--cpu-shares=}"[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)" - "($help)--cpu-period=[Limit the CPU CFS (Completely Fair Scheduler) period]:CPU period: " - "($help)--cpu-quota=[Limit the CPU CFS (Completely Fair Scheduler) quota]:CPU quota: " - "($help)--cpuset-cpus=[CPUs in which to allow execution]:CPUs: " - "($help)--cpuset-mems=[MEMs in which to allow execution]:MEMs: " - "($help -m --memory)"{-m=,--memory=}"[Memory limit]:Memory limit: " - "($help)--memory-swap=[Total memory limit with swap]:Memory limit: " - ) - opts_create_run=( - "($help -a --attach)"{-a=,--attach=}"[Attach to stdin, stdout or stderr]:device:(STDIN STDOUT STDERR)" - "($help)*--add-host=[Add a custom host-to-IP mapping]:host\:ip mapping: " - "($help)*--blkio-weight-device=[Block IO (relative device weight)]:device:Block IO weight: " - "($help)*--cap-add=[Add Linux capabilities]:capability: " - "($help)*--cap-drop=[Drop Linux capabilities]:capability: " - "($help)--cidfile=[Write the container ID to the file]:CID file:_files" - "($help)*--device=[Add a host device to the container]:device:_files" - "($help)*--device-read-bps=[Limit the read rate (bytes per second) from a device]:device:IO rate: " - "($help)*--device-read-iops=[Limit the read rate (IO per second) from a device]:device:IO rate: " - "($help)*--device-write-bps=[Limit the write rate (bytes per second) to a device]:device:IO rate: " - "($help)*--device-write-iops=[Limit the write rate (IO per second) to a device]:device:IO rate: " - "($help)*--dns=[Custom DNS servers]:DNS server: " - "($help)*--dns-opt=[Custom DNS options]:DNS option: " - "($help)*--dns-search=[Custom DNS search domains]:DNS domains: " - "($help)*"{-e=,--env=}"[Environment variables]:environment variable: " - "($help)--entrypoint=[Overwrite the default entrypoint of the image]:entry point: " - "($help)*--env-file=[Read environment variables from a file]:environment file:_files" - "($help)*--expose=[Expose a port from the container without publishing it]: " - "($help)*--group-add=[Add additional groups to run as]:group:_groups" - "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts" - "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" - "($help)--ip=[Container IPv4 address]:IPv4: " - "($help)--ip6=[Container IPv6 address]:IPv6: " - "($help)--ipc=[IPC namespace to use]:IPC namespace: " - "($help)*--link=[Add link to another container]:link:->link" - "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: " - "($help)*"{-l=,--label=}"[Container metadata]:label: " - "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_log_drivers" - "($help)*--log-opt=[Log driver specific options]:log driver options:__docker_log_options" - "($help)--mac-address=[Container MAC address]:MAC address: " - "($help)--name=[Container name]:name: " - "($help)--network=[Connect a container to a network]:network mode:(bridge none container host)" - "($help)*--network-alias=[Add network-scoped alias for the container]:alias: " - "($help)--oom-kill-disable[Disable OOM Killer]" - "($help)--oom-score-adj[Tune the host's OOM preferences for containers (accepts -1000 to 1000)]" - "($help)--pids-limit[Tune container pids limit (set -1 for unlimited)]" - "($help -P --publish-all)"{-P,--publish-all}"[Publish all exposed ports]" - "($help)*"{-p=,--publish=}"[Expose a container's port to the host]:port:_ports" - "($help)--pid=[PID namespace to use]:PID namespace:__docker_complete_pid" - "($help)--privileged[Give extended privileges to this container]" - "($help)--read-only[Mount the container's root filesystem as read only]" - "($help)*--security-opt=[Security options]:security option: " - "($help)*--sysctl=-[sysctl options]:sysctl: " - "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" - "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" - "($help)--tmpfs[mount tmpfs]" - "($help)*-v[Bind mount a volume]:volume: " - "($help)--volume-driver=[Optional volume driver for the container]:volume driver:(local)" - "($help)*--volumes-from=[Mount volumes from the specified container]:volume: " - "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories" - ) - opts_create_run_update=( - "($help)--blkio-weight=[Block IO (relative weight), between 10 and 1000]:Block IO weight:(10 100 500 1000)" - "($help)--kernel-memory=[Kernel memory limit in bytes]:Memory limit: " - "($help)--memory-reservation=[Memory soft limit]:Memory limit: " - "($help)--restart=[Restart policy]:restart policy:(no on-failure always unless-stopped)" - ) - opts_attach_exec_run_start=( - "($help)--detach-keys=[Escape key sequence used to detach a container]:sequence:__docker_complete_detach_keys" - ) case "$words[1]" in - (attach) - _arguments $(__docker_arguments) \ - $opts_help \ - $opts_attach_exec_run_start \ - "($help)--no-stdin[Do not attach stdin]" \ - "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \ - "($help -):containers:__docker_runningcontainers" && ret=0 + (attach|commit|cp|create|diff|exec|export|kill|logs|pause|unpause|port|rename|restart|rm|run|start|stats|stop|top|update|wait) + __docker_container_subcommand && ret=0 ;; - (build) - _arguments $(__docker_arguments) \ - $opts_help \ - $opts_build_create_run \ - $opts_build_create_run_update \ - "($help)*--build-arg[Build-time variables]:=: " \ - "($help)--compress[Compress the build context using gzip]" \ - "($help -f --file)"{-f=,--file=}"[Name of the Dockerfile]:Dockerfile:_files" \ - "($help)--force-rm[Always remove intermediate containers]" \ - "($help)*--label=[Set metadata for an image]:label=value: " \ - "($help)--no-cache[Do not use cache when building the image]" \ - "($help)--pull[Attempt to pull a newer version of the image]" \ - "($help -q --quiet)"{-q,--quiet}"[Suppress verbose build output]" \ - "($help)--rm[Remove intermediate containers after a successful build]" \ - "($help -t --tag)*"{-t=,--tag=}"[Repository, name and tag for the image]: :__docker_repositories_with_tags" \ - "($help -):path or URL:_directories" && ret=0 + (build|history|import|load|pull|push|save|tag) + __docker_image_subcommand && ret=0 ;; - (commit) + (container) + local curcontext="$curcontext" state _arguments $(__docker_arguments) \ $opts_help \ - "($help -a --author)"{-a=,--author=}"[Author]:author: " \ - "($help)*"{-c=,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \ - "($help -m --message)"{-m=,--message=}"[Commit message]:message: " \ - "($help -p --pause)"{-p,--pause}"[Pause container during commit]" \ - "($help -):container:__docker_containers" \ - "($help -): :__docker_repositories_with_tags" && ret=0 - ;; - (cp) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -L --follow-link)"{-L,--follow-link}"[Always follow symbol link]" \ - "($help -)1:container:->container" \ - "($help -)2:hostpath:_files" && ret=0 - case $state in - (container) - if compset -P "*:"; then - _files && ret=0 - else - __docker_containers -qS ":" && ret=0 - fi - ;; - esac - ;; - (create) - _arguments $(__docker_arguments) \ - $opts_help \ - $opts_build_create_run \ - $opts_build_create_run_update \ - $opts_create_run \ - $opts_create_run_update \ - "($help -): :__docker_images" \ - "($help -):command: _command_names -e" \ - "($help -)*::arguments: _normal" && ret=0 + "($help -): :->command" \ + "($help -)*:: :->option-or-argument" && ret=0 case $state in - (link) - if compset -P "*:"; then - _wanted alias expl "Alias" compadd -E "" && ret=0 - else - __docker_runningcontainers -qS ":" && ret=0 - fi + (command) + __docker_container_commands && ret=0 + ;; + (option-or-argument) + curcontext=${curcontext%:*:*}:docker-${words[-1]}: + __docker_container_subcommand && ret=0 ;; esac - ;; (daemon) _arguments $(__docker_arguments) \ $opts_help \ "($help)*--add-runtime=[Register an additional OCI compatible runtime]:runtime:__docker_complete_runtimes" \ - "($help)--api-cors-header=[CORS headers in the remote API]:CORS headers: " \ + "($help)--api-cors-header=[CORS headers in the Engine API]:CORS headers: " \ "($help)*--authorization-plugin=[Authorization plugins to load]" \ "($help -b --bridge)"{-b=,--bridge=}"[Attach containers to a network bridge]:bridge:_net_interfaces" \ "($help)--bip=[Network bridge IP]:IP address: " \ "($help)--cgroup-parent=[Parent cgroup for all containers]:cgroup: " \ + "($help)--cluster-advertise=[Address or interface name to advertise]:Instance to advertise (host\:port): " \ + "($help)--cluster-store=[URL of the distributed storage backend]:Cluster Store:->cluster-store" \ + "($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \ "($help)--config-file=[Path to daemon configuration file]:Config File:_files" \ "($help)--containerd=[Path to containerd socket]:socket:_files -g \"*.sock\"" \ "($help -D --debug)"{-D,--debug}"[Enable debug mode]" \ "($help)--default-gateway[Container default gateway IPv4 address]:IPv4 address: " \ "($help)--default-gateway-v6[Container default gateway IPv6 address]:IPv6 address: " \ - "($help)--cluster-store=[URL of the distributed storage backend]:Cluster Store:->cluster-store" \ - "($help)--cluster-advertise=[Address or interface name to advertise]:Instance to advertise (host\:port): " \ - "($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \ - "($help)*--dns=[DNS server to use]:DNS: " \ - "($help)*--dns-search=[DNS search domains to use]:DNS search: " \ - "($help)*--dns-opt=[DNS options to use]:DNS option: " \ "($help)*--default-ulimit=[Default ulimits for containers]:ulimit: " \ "($help)--disable-legacy-registry[Disable contacting legacy registries]" \ + "($help)*--dns=[DNS server to use]:DNS: " \ + "($help)*--dns-opt=[DNS options to use]:DNS option: " \ + "($help)*--dns-search=[DNS search domains to use]:DNS search: " \ "($help)*--exec-opt=[Runtime execution options]:runtime execution options: " \ "($help)--exec-root=[Root directory for execution state files]:path:_directories" \ + "($help)--experimental[Enable experimental features]" \ "($help)--fixed-cidr=[IPv4 subnet for fixed IPs]:IPv4 subnet: " \ "($help)--fixed-cidr-v6=[IPv6 subnet for fixed IPs]:IPv6 subnet: " \ "($help -G --group)"{-G=,--group=}"[Group for the unix socket]:group:_groups" \ @@ -1614,8 +2380,8 @@ __docker_subcommand() { "($help -l --log-level)"{-l=,--log-level=}"[Logging level]:level:(debug info warn error fatal)" \ "($help)*--label=[Key=value labels]:label: " \ "($help)--live-restore[Enable live restore of docker when containers are still running]" \ - "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_log_drivers" \ - "($help)*--log-opt=[Default log driver options for containers]:log driver options:__docker_log_options" \ + "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_complete_log_drivers" \ + "($help)*--log-opt=[Default log driver options for containers]:log driver options:__docker_complete_log_options" \ "($help)--max-concurrent-downloads[Set the max concurrent downloads for each pull]" \ "($help)--max-concurrent-uploads[Set the max concurrent uploads for each push]" \ "($help)--mtu=[Network MTU]:mtu:(0 576 1420 1500 9000)" \ @@ -1623,8 +2389,10 @@ __docker_subcommand() { "($help -p --pidfile)"{-p=,--pidfile=}"[Path to use for daemon PID file]:PID file:_files" \ "($help)--raw-logs[Full timestamps without ANSI coloring]" \ "($help)*--registry-mirror=[Preferred Docker registry mirror]:registry mirror: " \ + "($help)--seccomp-profile=[Path to seccomp profile]:path:_files -g \"*.json\"" \ "($help -s --storage-driver)"{-s=,--storage-driver=}"[Storage driver to use]:driver:(aufs btrfs devicemapper overlay overlay2 vfs zfs)" \ "($help)--selinux-enabled[Enable selinux support]" \ + "($help)--shutdown-timeout=[Set the shutdown timeout value in seconds]:time: " \ "($help)*--storage-opt=[Storage driver options]:storage driver options: " \ "($help)--tls[Use TLS]" \ "($help)--tlscacert=[Trust certs signed only by this CA]:PEM file:_files -g \"*.(pem|crt)\"" \ @@ -1632,7 +2400,8 @@ __docker_subcommand() { "($help)--tlskey=[Path to TLS key file]:Key file:_files -g \"*.(pem|key)\"" \ "($help)--tlsverify[Use TLS and verify the remote]" \ "($help)--userns-remap=[User/Group setting for user namespaces]:user\:group:->users-groups" \ - "($help)--userland-proxy[Use userland proxy for loopback traffic]" && ret=0 + "($help)--userland-proxy[Use userland proxy for loopback traffic]" \ + "($help)--userland-proxy-path=[Path to the userland proxy binary]:binary:_files" && ret=0 case $state in (cluster-store) @@ -1661,84 +2430,29 @@ __docker_subcommand() { ;; esac ;; - (diff) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -)*:containers:__docker_containers" && ret=0 + (events|info) + __docker_system_subcommand && ret=0 ;; - (events) + (image) + local curcontext="$curcontext" state _arguments $(__docker_arguments) \ $opts_help \ - "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_events_filter" \ - "($help)--since=[Events created since this timestamp]:timestamp: " \ - "($help)--until=[Events created until this timestamp]:timestamp: " \ - "($help)--format=[Format the output using the given go template]:template: " && ret=0 - ;; - (exec) - local state - _arguments $(__docker_arguments) \ - $opts_help \ - $opts_attach_exec_run_start \ - "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \ - "($help -e --env)"{-e,--env}"[Set environment variables]" \ - "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" \ - "($help)--privileged[Give extended Linux capabilities to the command]" \ - "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \ - "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" \ - "($help -):containers:__docker_runningcontainers" \ - "($help -)*::command:->anycommand" && ret=0 + "($help -): :->command" \ + "($help -)*:: :->option-or-argument" && ret=0 case $state in - (anycommand) - shift 1 words - (( CURRENT-- )) - _normal && ret=0 + (command) + __docker_image_commands && ret=0 + ;; + (option-or-argument) + curcontext=${curcontext%:*:*}:docker-${words[-1]}: + __docker_image_subcommand && ret=0 ;; esac ;; - (export) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -o --output)"{-o=,--output=}"[Write to a file, instead of stdout]:output file:_files" \ - "($help -)*:containers:__docker_containers" && ret=0 - ;; - (history) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -H --human)"{-H,--human}"[Print sizes and dates in human readable format]" \ - "($help)--no-trunc[Do not truncate output]" \ - "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \ - "($help -)*: :__docker_images" && ret=0 - ;; (images) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -a --all)"{-a,--all}"[Show all images]" \ - "($help)--digests[Show digests]" \ - "($help)*"{-f=,--filter=}"[Filter values]:filter:->filter-options" \ - "($help)--format=[Pretty-print images using a Go template]:template: " \ - "($help)--no-trunc[Do not truncate output]" \ - "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \ - "($help -): :__docker_repositories" && ret=0 - - case $state in - (filter-options) - __docker_complete_images_filters && ret=0 - ;; - esac - ;; - (import) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help)*"{-c=,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \ - "($help -m --message)"{-m=,--message=}"[Commit message for imported image]:message: " \ - "($help -):URL:(- http:// file://)" \ - "($help -): :__docker_repositories_with_tags" && ret=0 - ;; - (info|version) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " && ret=0 + words[1]='ls' + __docker_image_subcommand && ret=0 ;; (inspect) local state @@ -1746,33 +2460,37 @@ __docker_subcommand() { $opts_help \ "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \ "($help -s --size)"{-s,--size}"[Display total file sizes if the type is container]" \ - "($help)--type=[Return JSON for specified type]:type:(image container)" \ + "($help)--type=[Return JSON for specified type]:type:(container image network node plugin service volume)" \ "($help -)*: :->values" && ret=0 case $state in (values) if [[ ${words[(r)--type=container]} == --type=container ]]; then - __docker_containers && ret=0 + __docker_complete_containers && ret=0 elif [[ ${words[(r)--type=image]} == --type=image ]]; then - __docker_images && ret=0 + __docker_complete_images && ret=0 + elif [[ ${words[(r)--type=network]} == --type=network ]]; then + __docker_complete_networks && ret=0 + elif [[ ${words[(r)--type=node]} == --type=node ]]; then + __docker_complete_nodes && ret=0 + elif [[ ${words[(r)--type=plugin]} == --type=plugin ]]; then + __docker_complete_plugins && ret=0 + elif [[ ${words[(r)--type=service]} == --type=service ]]; then + __docker_complete_services && ret=0 + elif [[ ${words[(r)--type=volume]} == --type=volume ]]; then + __docker_complete_volumes && ret=0 else - __docker_images && __docker_containers && ret=0 + __docker_complete_containers + __docker_complete_images + __docker_complete_networks + __docker_complete_nodes + __docker_complete_plugins + __docker_complete_services + __docker_complete_volumes && ret=0 fi ;; esac ;; - (kill) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -s --signal)"{-s=,--signal=}"[Signal to send]:signal:_signals" \ - "($help -)*:containers:__docker_runningcontainers" && ret=0 - ;; - (load) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -i --input)"{-i=,--input=}"[Read from tar archive file]:archive file:_files -g \"*.((tar|TAR)(.gz|.GZ|.Z|.bz2|.lzma|.xz|)|(tbz|tgz|txz))(-.)\"" \ - "($help -q --quiet)"{-q,--quiet}"[Suppress the load output]" && ret=0 - ;; (login) _arguments $(__docker_arguments) \ $opts_help \ @@ -1785,16 +2503,6 @@ __docker_subcommand() { $opts_help \ "($help -)1:server: " && ret=0 ;; - (logs) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help)--details[Show extra details provided to logs]" \ - "($help -f --follow)"{-f,--follow}"[Follow log output]" \ - "($help -s --since)"{-s=,--since=}"[Show logs since this timestamp]:timestamp: " \ - "($help -t --timestamps)"{-t,--timestamps}"[Show timestamps]" \ - "($help)--tail=[Output the last K lines]:lines:(1 10 20 50 all)" \ - "($help -)*:containers:__docker_containers" && ret=0 - ;; (network) local curcontext="$curcontext" state _arguments $(__docker_arguments) \ @@ -1829,11 +2537,6 @@ __docker_subcommand() { ;; esac ;; - (pause|unpause) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -)*:containers:__docker_runningcontainers" && ret=0 - ;; (plugin) local curcontext="$curcontext" state _arguments $(__docker_arguments) \ @@ -1851,128 +2554,13 @@ __docker_subcommand() { ;; esac ;; - (port) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -)1:containers:__docker_runningcontainers" \ - "($help -)2:port:_ports" && ret=0 - ;; (ps) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -a --all)"{-a,--all}"[Show all containers]" \ - "($help)--before=[Show only container created before...]:containers:__docker_containers" \ - "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_ps_filters" \ - "($help)--format=[Pretty-print containers using a Go template]:template: " \ - "($help -l --latest)"{-l,--latest}"[Show only the latest created container]" \ - "($help -n --last)"{-n=,--last=}"[Show n last created containers (includes all states)]:n:(1 5 10 25 50)" \ - "($help)--no-trunc[Do not truncate output]" \ - "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \ - "($help -s --size)"{-s,--size}"[Display total file sizes]" \ - "($help)--since=[Show only containers created since...]:containers:__docker_containers" && ret=0 - ;; - (pull) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -a --all-tags)"{-a,--all-tags}"[Download all tagged images]" \ - "($help)--disable-content-trust[Skip image verification]" \ - "($help -):name:__docker_search" && ret=0 - ;; - (push) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help)--disable-content-trust[Skip image signing]" \ - "($help -): :__docker_images" && ret=0 - ;; - (rename) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -):old name:__docker_containers" \ - "($help -):new name: " && ret=0 - ;; - (stop) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \ - "($help -)*:containers:__docker_runningcontainers" && ret=0 - ;; - (restart) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \ - "($help -)*:containers:__docker_containers_ids" && ret=0 - ;; - (rm) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -f --force)"{-f,--force}"[Force removal]" \ - "($help -l --link)"{-l,--link}"[Remove the specified link and not the underlying container]" \ - "($help -v --volumes)"{-v,--volumes}"[Remove the volumes associated to the container]" \ - "($help -)*:containers:->values" && ret=0 - case $state in - (values) - if [[ ${words[(r)-f]} == -f || ${words[(r)--force]} == --force ]]; then - __docker_containers && ret=0 - else - __docker_stoppedcontainers && ret=0 - fi - ;; - esac + words[1]='ls' + __docker_container_subcommand && ret=0 ;; (rmi) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -f --force)"{-f,--force}"[Force removal]" \ - "($help)--no-prune[Do not delete untagged parents]" \ - "($help -)*: :__docker_images" && ret=0 - ;; - (run) - _arguments $(__docker_arguments) \ - $opts_help \ - $opts_build_create_run \ - $opts_build_create_run_update \ - $opts_create_run \ - $opts_create_run_update \ - $opts_attach_exec_run_start \ - "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \ - "($help)--health-cmd=[Command to run to check health]:command: " \ - "($help)--health-interval=[Time between running the check]:time: " \ - "($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)" \ - "($help)--health-timeout=[Maximum time to allow one check to run]:time: " \ - "($help)--no-healthcheck[Disable any container-specified HEALTHCHECK]" \ - "($help)--rm[Remove intermediate containers when it exits]" \ - "($help)--runtime=[Name of the runtime to be used for that container]:runtime:__docker_complete_runtimes" \ - "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \ - "($help)--stop-signal=[Signal to kill a container]:signal:_signals" \ - "($help)--storage-opt=[Storage driver options for the container]:storage options:->storage-opt" \ - "($help -): :__docker_images" \ - "($help -):command: _command_names -e" \ - "($help -)*::arguments: _normal" && ret=0 - - case $state in - (link) - if compset -P "*:"; then - _wanted alias expl "Alias" compadd -E "" && ret=0 - else - __docker_runningcontainers -qS ":" && ret=0 - fi - ;; - (storage-opt) - if compset -P "*="; then - _message "value" && ret=0 - else - opts=('size') - _describe -t filter-opts "storage options" opts -qS "=" && ret=0 - fi - ;; - esac - - ;; - (save) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -o --output)"{-o=,--output=}"[Write to file]:file:_files" \ - "($help -)*: :__docker_images" && ret=0 + words[1]='rm' + __docker_image_subcommand && ret=0 ;; (search) _arguments $(__docker_arguments) \ @@ -1988,6 +2576,23 @@ __docker_subcommand() { ;; esac ;; + (secret) + local curcontext="$curcontext" state + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -): :->command" \ + "($help -)*:: :->option-or-argument" && ret=0 + + case $state in + (command) + __docker_secret_commands && ret=0 + ;; + (option-or-argument) + curcontext=${curcontext%:*:*}:docker-${words[-1]}: + __docker_secret_subcommand && ret=0 + ;; + esac + ;; (service) local curcontext="$curcontext" state _arguments $(__docker_arguments) \ @@ -2005,21 +2610,22 @@ __docker_subcommand() { ;; esac ;; - (start) + (stack) + local curcontext="$curcontext" state _arguments $(__docker_arguments) \ $opts_help \ - $opts_attach_exec_run_start \ - "($help -a --attach)"{-a,--attach}"[Attach container's stdout/stderr and forward all signals]" \ - "($help -i --interactive)"{-i,--interactive}"[Attach container's stding]" \ - "($help -)*:containers:__docker_stoppedcontainers" && ret=0 - ;; - (stats) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -a --all)"{-a,--all}"[Show all containers (default shows just running)]" \ - "($help)--format=[Pretty-print images using a Go template]:template: " \ - "($help)--no-stream[Disable streaming stats and only pull the first result]" \ - "($help -)*:containers:__docker_runningcontainers" && ret=0 + "($help -): :->command" \ + "($help -)*:: :->option-or-argument" && ret=0 + + case $state in + (command) + __docker_stack_commands && ret=0 + ;; + (option-or-argument) + curcontext=${curcontext%:*:*}:docker-${words[-1]}: + __docker_stack_subcommand && ret=0 + ;; + esac ;; (swarm) local curcontext="$curcontext" state @@ -2038,41 +2644,28 @@ __docker_subcommand() { ;; esac ;; - (tag) + (system) + local curcontext="$curcontext" state _arguments $(__docker_arguments) \ $opts_help \ - "($help -):source:__docker_images"\ - "($help -):destination:__docker_repositories_with_tags" && ret=0 - ;; - (top) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -)1:containers:__docker_runningcontainers" \ - "($help -)*:: :->ps-arguments" && ret=0 - case $state in - (ps-arguments) - _ps && ret=0 - ;; - esac - - ;; - (update) - _arguments $(__docker_arguments) \ - $opts_help \ - $opts_create_run_update \ - $opts_build_create_run_update \ - "($help -)*: :->values" && ret=0 + "($help -): :->command" \ + "($help -)*:: :->option-or-argument" && ret=0 case $state in - (values) - if [[ ${words[(r)--kernel-memory*]} = (--kernel-memory*) ]]; then - __docker_stoppedcontainers && ret=0 - else - __docker_containers && ret=0 - fi + (command) + __docker_system_commands && ret=0 + ;; + (option-or-argument) + curcontext=${curcontext%:*:*}:docker-${words[-1]}: + __docker_system_subcommand && ret=0 ;; esac ;; + (version) + _arguments $(__docker_arguments) \ + $opts_help \ + "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " && ret=0 + ;; (volume) local curcontext="$curcontext" state _arguments $(__docker_arguments) \ @@ -2090,11 +2683,6 @@ __docker_subcommand() { ;; esac ;; - (wait) - _arguments $(__docker_arguments) \ - $opts_help \ - "($help -)*:containers:__docker_runningcontainers" && ret=0 - ;; (help) _arguments $(__docker_arguments) ":subcommand:__docker_commands" && ret=0 ;; diff --git a/.oh-my-zsh/plugins/dotenv/README.md b/.oh-my-zsh/plugins/dotenv/README.md new file mode 100644 index 0000000..ade09fb --- /dev/null +++ b/.oh-my-zsh/plugins/dotenv/README.md @@ -0,0 +1,34 @@ +# dotenv + +Automatically load your project ENV variables from `.env` file when you `cd` into project root directory. + +Storing configuration in the environment is one of the tenets of a [twelve-factor app](http://www.12factor.net). Anything that is likely to change between deployment environments–such as resource handles for databases or credentials for external services–should be extracted from the code into environment variables. + +## Installation + +Just add the plugin to your `.zshrc`: + +```sh +plugins=(git man dotenv) +``` + +## Usage + +Create `.env` file inside your project directory and put your local ENV variables there. + +For example: +```sh +export AWS_S3_TOKEN=d84a83539134f28f412c652b09f9f98eff96c9a +export SECRET_KEY=7c6c72d959416d5aa368a409362ec6e2ac90d7f +export MONGO_URI=mongodb://127.0.0.1:27017 +export PORT=3001 +``` +`export` is optional. This format works as well: +```sh +AWS_S3_TOKEN=d84a83539134f28f412c652b09f9f98eff96c9a +SECRET_KEY=7c6c72d959416d5aa368a409362ec6e2ac90d7f +MONGO_URI=mongodb://127.0.0.1:27017 +PORT=3001 +``` + +**It's strongly recommended to add `.env` file to `.gitignore`**, because usually it contains sensitive information such as your credentials, secret keys, passwords etc. You don't want to commit this file, it supposed to be local only. diff --git a/.oh-my-zsh/plugins/dotenv/dotenv.plugin.zsh b/.oh-my-zsh/plugins/dotenv/dotenv.plugin.zsh new file mode 100644 index 0000000..9dd7842 --- /dev/null +++ b/.oh-my-zsh/plugins/dotenv/dotenv.plugin.zsh @@ -0,0 +1,10 @@ +#!/bin/zsh + +source_env() { + if [[ -f .env ]]; then + source .env + fi +} + +autoload -U add-zsh-hook +add-zsh-hook chpwd source_env diff --git a/.oh-my-zsh/plugins/droplr/README.md b/.oh-my-zsh/plugins/droplr/README.md old mode 100755 new mode 100644 index cfbec25..25cf61d --- a/.oh-my-zsh/plugins/droplr/README.md +++ b/.oh-my-zsh/plugins/droplr/README.md @@ -1,6 +1,6 @@ # droplr -Use [Droplr](https://droplr.com/) from the comand line to upload files and shorten +Use [Droplr](https://droplr.com/) from the command line to upload files and shorten links. It needs to have [Droplr.app](https://droplr.com/apps) installed and logged in. MacOS only. diff --git a/.oh-my-zsh/plugins/droplr/droplr.plugin.zsh b/.oh-my-zsh/plugins/droplr/droplr.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emacs/emacs.plugin.zsh b/.oh-my-zsh/plugins/emacs/emacs.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/ember-cli/README.md b/.oh-my-zsh/plugins/ember-cli/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/ember-cli/ember-cli.plugin.zsh b/.oh-my-zsh/plugins/ember-cli/ember-cli.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emoji-clock/emoji-clock.plugin.zsh b/.oh-my-zsh/plugins/emoji-clock/emoji-clock.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emoji/README.md b/.oh-my-zsh/plugins/emoji/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emoji/emoji-char-definitions.zsh b/.oh-my-zsh/plugins/emoji/emoji-char-definitions.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emoji/emoji-data.txt b/.oh-my-zsh/plugins/emoji/emoji-data.txt old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emoji/emoji.plugin.zsh b/.oh-my-zsh/plugins/emoji/emoji.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emoji/update_emoji.pl b/.oh-my-zsh/plugins/emoji/update_emoji.pl old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emotty/emotty.plugin.zsh b/.oh-my-zsh/plugins/emotty/emotty.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emotty/emotty_emoji_set.zsh b/.oh-my-zsh/plugins/emotty/emotty_emoji_set.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emotty/emotty_floral_set.zsh b/.oh-my-zsh/plugins/emotty/emotty_floral_set.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emotty/emotty_love_set.zsh b/.oh-my-zsh/plugins/emotty/emotty_love_set.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emotty/emotty_nature_set.zsh b/.oh-my-zsh/plugins/emotty/emotty_nature_set.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emotty/emotty_stellar_set.zsh b/.oh-my-zsh/plugins/emotty/emotty_stellar_set.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/emotty/emotty_zodiac_set.zsh b/.oh-my-zsh/plugins/emotty/emotty_zodiac_set.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/encode64/encode64.plugin.zsh b/.oh-my-zsh/plugins/encode64/encode64.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/extract/README.md b/.oh-my-zsh/plugins/extract/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/extract/_extract b/.oh-my-zsh/plugins/extract/_extract old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/extract/extract.plugin.zsh b/.oh-my-zsh/plugins/extract/extract.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/fabric/_fab b/.oh-my-zsh/plugins/fabric/_fab old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/fabric/fabric.plugin.zsh b/.oh-my-zsh/plugins/fabric/fabric.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/fancy-ctrl-z/README.md b/.oh-my-zsh/plugins/fancy-ctrl-z/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh b/.oh-my-zsh/plugins/fancy-ctrl-z/fancy-ctrl-z.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/fasd/fasd.plugin.zsh b/.oh-my-zsh/plugins/fasd/fasd.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/fastfile/fastfile.plugin.zsh b/.oh-my-zsh/plugins/fastfile/fastfile.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/fbterm/fbterm.plugin.zsh b/.oh-my-zsh/plugins/fbterm/fbterm.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/fedora/README.md b/.oh-my-zsh/plugins/fedora/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/fedora/fedora.plugin.zsh b/.oh-my-zsh/plugins/fedora/fedora.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/firewalld/firewalld.plugin.zsh b/.oh-my-zsh/plugins/firewalld/firewalld.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/firewalld/readme.md b/.oh-my-zsh/plugins/firewalld/readme.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/forklift/README.md b/.oh-my-zsh/plugins/forklift/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/forklift/forklift.plugin.zsh b/.oh-my-zsh/plugins/forklift/forklift.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/fossil/README.md b/.oh-my-zsh/plugins/fossil/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/fossil/fossil.plugin.zsh b/.oh-my-zsh/plugins/fossil/fossil.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/frontend-search/README.md b/.oh-my-zsh/plugins/frontend-search/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/frontend-search/_frontend-search.sh b/.oh-my-zsh/plugins/frontend-search/_frontend-search.sh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/frontend-search/frontend-search.plugin.zsh b/.oh-my-zsh/plugins/frontend-search/frontend-search.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gas/_gas b/.oh-my-zsh/plugins/gas/_gas old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gb/README.md b/.oh-my-zsh/plugins/gb/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gb/_gb b/.oh-my-zsh/plugins/gb/_gb old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/geeknote/README.md b/.oh-my-zsh/plugins/geeknote/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/geeknote/_geeknote b/.oh-my-zsh/plugins/geeknote/_geeknote old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/geeknote/geeknote.plugin.zsh b/.oh-my-zsh/plugins/geeknote/geeknote.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gem/_gem b/.oh-my-zsh/plugins/gem/_gem old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gem/gem.plugin.zsh b/.oh-my-zsh/plugins/gem/gem.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/git-extras/README.md b/.oh-my-zsh/plugins/git-extras/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/git-extras/git-extras.plugin.zsh b/.oh-my-zsh/plugins/git-extras/git-extras.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/git-flow-avh/git-flow-avh.plugin.zsh b/.oh-my-zsh/plugins/git-flow-avh/git-flow-avh.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/git-flow/README.md b/.oh-my-zsh/plugins/git-flow/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/git-flow/git-flow.plugin.zsh b/.oh-my-zsh/plugins/git-flow/git-flow.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/git-hubflow/git-hubflow.plugin.zsh b/.oh-my-zsh/plugins/git-hubflow/git-hubflow.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/git-prompt/git-prompt.plugin.zsh b/.oh-my-zsh/plugins/git-prompt/git-prompt.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/git-prompt/gitstatus.py b/.oh-my-zsh/plugins/git-prompt/gitstatus.py old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/git-remote-branch/git-remote-branch.plugin.zsh b/.oh-my-zsh/plugins/git-remote-branch/git-remote-branch.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/git/README.md b/.oh-my-zsh/plugins/git/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/git/git.plugin.zsh b/.oh-my-zsh/plugins/git/git.plugin.zsh old mode 100755 new mode 100644 index 9d8e417..34942d3 --- a/.oh-my-zsh/plugins/git/git.plugin.zsh +++ b/.oh-my-zsh/plugins/git/git.plugin.zsh @@ -43,6 +43,7 @@ alias g='git' alias ga='git add' alias gaa='git add --all' alias gapa='git add --patch' +alias gau='git add --update' alias gb='git branch' alias gba='git branch -a' diff --git a/.oh-my-zsh/plugins/gitfast/_git b/.oh-my-zsh/plugins/gitfast/_git old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gitfast/git-completion.bash b/.oh-my-zsh/plugins/gitfast/git-completion.bash old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gitfast/git-prompt.sh b/.oh-my-zsh/plugins/gitfast/git-prompt.sh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gitfast/gitfast.plugin.zsh b/.oh-my-zsh/plugins/gitfast/gitfast.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/github/README.md b/.oh-my-zsh/plugins/github/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/github/_hub b/.oh-my-zsh/plugins/github/_hub old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/github/github.plugin.zsh b/.oh-my-zsh/plugins/github/github.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gitignore/gitignore.plugin.zsh b/.oh-my-zsh/plugins/gitignore/gitignore.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/glassfish/_asadmin b/.oh-my-zsh/plugins/glassfish/_asadmin old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/glassfish/glassfish.plugin.zsh b/.oh-my-zsh/plugins/glassfish/glassfish.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/globalias/README.md b/.oh-my-zsh/plugins/globalias/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/globalias/globalias.plugin.zsh b/.oh-my-zsh/plugins/globalias/globalias.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gnu-utils/gnu-utils.plugin.zsh b/.oh-my-zsh/plugins/gnu-utils/gnu-utils.plugin.zsh old mode 100755 new mode 100644 index de95f7e..b66e25d --- a/.oh-my-zsh/plugins/gnu-utils/gnu-utils.plugin.zsh +++ b/.oh-my-zsh/plugins/gnu-utils/gnu-utils.plugin.zsh @@ -52,7 +52,7 @@ if [[ -x "${commands[gwhoami]}" ]]; then # # This method is inflexible since the aliases are at risk of being - # overriden resulting in the BSD coreutils being called. + # overridden resulting in the BSD coreutils being called. # # (( ${+commands[$gcmd]} )) && \ # alias "$gcmd[2,-1]"="${prefix}/${gcmd//"["/"\\["}" diff --git a/.oh-my-zsh/plugins/golang/golang.plugin.zsh b/.oh-my-zsh/plugins/golang/golang.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/golang/templates/package.txt b/.oh-my-zsh/plugins/golang/templates/package.txt old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/golang/templates/search.txt b/.oh-my-zsh/plugins/golang/templates/search.txt old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gpg-agent/gpg-agent.plugin.zsh b/.oh-my-zsh/plugins/gpg-agent/gpg-agent.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gradle/gradle.plugin.zsh b/.oh-my-zsh/plugins/gradle/gradle.plugin.zsh old mode 100755 new mode 100644 index b2015a3..0adc04a --- a/.oh-my-zsh/plugins/gradle/gradle.plugin.zsh +++ b/.oh-my-zsh/plugins/gradle/gradle.plugin.zsh @@ -24,29 +24,60 @@ function _gradle_core_commands() { function _gradle_arguments() { _arguments -C \ '-a[Do not rebuild project dependencies]' \ - '-h[Help]' \ - '-D[System property]' \ + '-b[Specifies the build file]' \ + '-c[Specifies the settings file]' \ '-d[Log at the debug level]' \ - '--gui[Launches the Gradle GUI app]' \ - '--stop[Stop the Gradle daemon]' \ - '--daemon[Use the Gradle daemon]' \ - '--no-daemon[Do not use the Gradle daemon]' \ - '--rerun-task [Specifies that any task optimization is ignored.]' \ - '-i[Log at the info level]' \ - '-m[Dry run]' \ - '-P[Set a project property]' \ - '-p[Specifies the start directory]' \ - '--profile[Profile the build time]' \ - '-q[Log at the quiet level (only show errors)]' \ - '-v[Print the Gradle version info]' \ + '-g[Specifies the Gradle user home directory]' \ + '-h[Shows a help message]' \ + '-i[Set log level to INFO]' \ + '-m[Runs the build with all task actions disabled]' \ + '-p[Specifies the start directory for Gradle]' \ + '-q[Log errors only]' \ + '-s[Print out the stacktrace also for user exceptions]' \ + '-t[Continuous mode. Automatically re-run build after changes]' \ + '-u[Don''t search in parent directories for a settings.gradle file]' \ + '-v[Prints Gradle version info]' \ '-x[Specify a task to be excluded]' \ - '-b[Specifies the build file.]' \ - '-c[Specifies the settings file.]' \ - '--continue[Continues task execution after a task failure.]' \ - '-g[Specifies the Gradle user home directory.]' \ - '-I[Specifies an initialization script.]' \ - '--refresh-dependencies[Refresh the state of dependencies.]' \ - '-u[Don''t search in parent directories for a settings.gradle file.]' \ + '-D[Set a system property]' \ + '-I[Specifies an initialization script]' \ + '-P[Sets a project property of the root project]' \ + '-S[Print out the full (very verbose) stacktrace]' \ + '--build-file[Specifies the build file]' \ + '--configure-on-demand[Only relevant projects are configured]' \ + '--console[Type of console output to generate (plain, auto, or rich)]' \ + '--continue[Continues task execution after a task failure]' \ + '--continuous[Continuous mode. Automatically re-run build after changes]' \ + '--daemon[Use the Gradle Daemon]' \ + '--debug[Log at the debug level]' \ + '--dry-run[Runs the build with all task actions disabled]' \ + '--exclude-task[Specify a task to be excluded]' \ + '--full-stacktrace[Print out the full (very verbose) stacktrace]' \ + '--gradle-user-home[Specifies the Gradle user home directory]' \ + '--gui[Launches the Gradle GUI app (Deprecated)]' \ + '--help[Shows a help message]' \ + '--include-build[Run the build as a composite, including the specified build]' \ + '--info[Set log level to INFO]' \ + '--init-script[Specifies an initialization script]' \ + '--max-workers[Set the maximum number of workers that Gradle may use]' \ + '--no-daemon[Do not use the Gradle Daemon]' \ + '--no-rebuild[Do not rebuild project dependencies]' \ + '--no-search-upwards[Don''t search in parent directories for a settings.gradle file]' \ + '--offline[Build without accessing network resources]' \ + '--parallel[Build projects in parallel]' \ + '--profile[Profile build time and create report]' \ + '--project-cache-dir[Specifies the project-specific cache directory]' \ + '--project-dir[Specifies the start directory for Gradle]' \ + '--project-prop[Sets a project property of the root project]' \ + '--quiet[Log errors only]' \ + '--recompile-scripts[Forces scripts to be recompiled, bypassing caching]' \ + '--refresh-dependencies[Refresh the state of dependencies]' \ + '--rerun-task[Specifies that any task optimization is ignored]' \ + '--settings-file[Specifies the settings file]' \ + '--stacktrace[Print out the stacktrace also for user exceptions]' \ + '--status[Print Gradle Daemon status]' \ + '--stop[Stop all Gradle Daemons]' \ + '--system-prop[Set a system property]' \ + '--version[Prints Gradle version info]' \ '*::command:->command' \ && return 0 } @@ -61,7 +92,7 @@ _gradle_does_task_list_need_generating () { } ############## -# Parse the tasks from `gradle(w) tasks --all` into .gradletasknamecache +# Parse the tasks from `gradle(w) tasks --all` and return them to the calling function. # All lines in the output from gradle(w) that are between /^-+$/ and /^\s*$/ # are considered to be tasks. If and when gradle adds support for listing tasks # for programmatic parsing, this method can be deprecated. @@ -76,7 +107,7 @@ _gradle_parse_tasks () { task_name_buffer="" elif [[ $line =~ ^\s*$ ]]; then if [[ "$lines_might_be_tasks" = true ]]; then - # If a newline is found, send the buffer to .gradletasknamecache + # If a newline is found, echo the buffer to the calling function while read -r task; do echo $task | awk '/[a-zA-Z0-9:-]+/ {print $1}' done <<< "$task_name_buffer" @@ -90,6 +121,25 @@ _gradle_parse_tasks () { done <<< "$1" } + +############## +# Gradle tasks from subprojects are allowed to be executed without specifying +# the subproject; that task will then be called on all subprojects. +# gradle(w) tasks --all only lists tasks per subproject, but when autocompleting +# we often want to be able to run a specific task on all subprojects, e.g. +# "gradle clean". +# This function uses the list of tasks from "gradle tasks --all", and for each +# line grabs everything after the last ":" and combines that output with the original +# output. The combined list is returned as the result of this function. +############## +_gradle_parse_and_extract_tasks () { + # All tasks + tasks=$(_gradle_parse_tasks "$1") + # Task name without sub project(s) prefix + simple_tasks=$(echo $tasks | awk 'BEGIN { FS = ":" } { print $NF }') + echo "$tasks\n$simple_tasks" +} + ############################################################################## # Discover the gradle tasks by running "gradle tasks --all" ############################################################################ @@ -97,7 +147,7 @@ _gradle_tasks () { if [[ -f build.gradle ]]; then _gradle_arguments if _gradle_does_task_list_need_generating; then - _gradle_parse_tasks "$(gradle tasks --all)" > .gradletasknamecache + _gradle_parse_and_extract_tasks "$(gradle tasks --all)" > .gradletasknamecache fi compadd -X "==== Gradle Tasks ====" $(cat .gradletasknamecache) fi @@ -107,7 +157,7 @@ _gradlew_tasks () { if [[ -f build.gradle ]]; then _gradle_arguments if _gradle_does_task_list_need_generating; then - _gradle_parse_tasks "$(./gradlew tasks --all)" > .gradletasknamecache + _gradle_parse_and_extract_tasks "$(./gradlew tasks --all)" > .gradletasknamecache fi compadd -X "==== Gradlew Tasks ====" $(cat .gradletasknamecache) fi diff --git a/.oh-my-zsh/plugins/grails/grails.plugin.zsh b/.oh-my-zsh/plugins/grails/grails.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/grunt/grunt.plugin.zsh b/.oh-my-zsh/plugins/grunt/grunt.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/gulp/gulp.plugin.zsh b/.oh-my-zsh/plugins/gulp/gulp.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/heroku/_heroku b/.oh-my-zsh/plugins/heroku/_heroku old mode 100755 new mode 100644 index fd72e53..878d3ce --- a/.oh-my-zsh/plugins/heroku/_heroku +++ b/.oh-my-zsh/plugins/heroku/_heroku @@ -31,6 +31,10 @@ _1st_arguments=( "domains\:add":"add a custom domain to an app" "domains\:remove":"remove a custom domain from an app" "domains\:clear":"remove all custom domains from an app" + "features":"list available app features" + "features\:disable":"disables a feature" + "features\:enable":"enables an feature" + "features\:info":"displays additional information about feature" "help":"list available commands or display help for a specific command" "keys":"display keys for the current user" "keys\:add":"add a key for the current user" @@ -144,5 +148,4 @@ _arguments \ '(--app)--app[the app name]' \ '(--remote)--remote[the remote name]' \ '(--help)--help[help about the current command]' \ - && return 0 - + && return 0 diff --git a/.oh-my-zsh/plugins/history-substring-search/README.md b/.oh-my-zsh/plugins/history-substring-search/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/history-substring-search/history-substring-search.plugin.zsh b/.oh-my-zsh/plugins/history-substring-search/history-substring-search.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/history-substring-search/history-substring-search.zsh b/.oh-my-zsh/plugins/history-substring-search/history-substring-search.zsh old mode 100755 new mode 100644 index ad316ac..3b8afd3 --- a/.oh-my-zsh/plugins/history-substring-search/history-substring-search.zsh +++ b/.oh-my-zsh/plugins/history-substring-search/history-substring-search.zsh @@ -244,7 +244,7 @@ _history-substring-search-end() { _history_substring_search_result=$BUFFER - # the search was succesful so display the result properly by clearing away + # the search was successful so display the result properly by clearing away # existing highlights and moving the cursor to the end of the result buffer if [[ $_history_substring_search_refresh_display -eq 1 ]]; then region_highlight=() diff --git a/.oh-my-zsh/plugins/history/README.md b/.oh-my-zsh/plugins/history/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/history/history.plugin.zsh b/.oh-my-zsh/plugins/history/history.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/httpie/README.md b/.oh-my-zsh/plugins/httpie/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/httpie/httpie.plugin.zsh b/.oh-my-zsh/plugins/httpie/httpie.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/iwhois/iwhois.plugin.zsh b/.oh-my-zsh/plugins/iwhois/iwhois.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/jake-node/jake-node.plugin.zsh b/.oh-my-zsh/plugins/jake-node/jake-node.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/jhbuild/README.md b/.oh-my-zsh/plugins/jhbuild/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/jhbuild/jhbuild.plugin.zsh b/.oh-my-zsh/plugins/jhbuild/jhbuild.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/jira/README.md b/.oh-my-zsh/plugins/jira/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/jira/_jira b/.oh-my-zsh/plugins/jira/_jira old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/jira/jira.plugin.zsh b/.oh-my-zsh/plugins/jira/jira.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/jruby/jruby.plugin.zsh b/.oh-my-zsh/plugins/jruby/jruby.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/jsontools/README.md b/.oh-my-zsh/plugins/jsontools/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/jsontools/jsontools.plugin.zsh b/.oh-my-zsh/plugins/jsontools/jsontools.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/jump/jump.plugin.zsh b/.oh-my-zsh/plugins/jump/jump.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/kate/kate.plugin.zsh b/.oh-my-zsh/plugins/kate/kate.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/kitchen/_kitchen b/.oh-my-zsh/plugins/kitchen/_kitchen old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/knife/_knife b/.oh-my-zsh/plugins/knife/_knife old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/knife_ssh/knife_ssh.plugin.zsh b/.oh-my-zsh/plugins/knife_ssh/knife_ssh.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/kubectl/kubectl.plugin.zsh b/.oh-my-zsh/plugins/kubectl/kubectl.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/laravel/_artisan b/.oh-my-zsh/plugins/laravel/_artisan old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/laravel/laravel.plugin.zsh b/.oh-my-zsh/plugins/laravel/laravel.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/laravel4/laravel4.plugin.zsh b/.oh-my-zsh/plugins/laravel4/laravel4.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/laravel5/laravel5.plugin.zsh b/.oh-my-zsh/plugins/laravel5/laravel5.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/last-working-dir/README.md b/.oh-my-zsh/plugins/last-working-dir/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/last-working-dir/last-working-dir.plugin.zsh b/.oh-my-zsh/plugins/last-working-dir/last-working-dir.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/lein/lein.plugin.zsh b/.oh-my-zsh/plugins/lein/lein.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/lighthouse/lighthouse.plugin.zsh b/.oh-my-zsh/plugins/lighthouse/lighthouse.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/lol/lol.plugin.zsh b/.oh-my-zsh/plugins/lol/lol.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/macports/_port b/.oh-my-zsh/plugins/macports/_port old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/macports/macports.plugin.zsh b/.oh-my-zsh/plugins/macports/macports.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/man/man.zsh b/.oh-my-zsh/plugins/man/man.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/marked2/README.md b/.oh-my-zsh/plugins/marked2/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/marked2/marked2.plugin.zsh b/.oh-my-zsh/plugins/marked2/marked2.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/mercurial/README.md b/.oh-my-zsh/plugins/mercurial/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/mercurial/mercurial.plugin.zsh b/.oh-my-zsh/plugins/mercurial/mercurial.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/meteor/README.md b/.oh-my-zsh/plugins/meteor/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/meteor/_meteor b/.oh-my-zsh/plugins/meteor/_meteor old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/meteor/meteor.plugin.zsh b/.oh-my-zsh/plugins/meteor/meteor.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/mix-fast/README.md b/.oh-my-zsh/plugins/mix-fast/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/mix-fast/mix-fast.plugin.zsh b/.oh-my-zsh/plugins/mix-fast/mix-fast.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/mix/_mix b/.oh-my-zsh/plugins/mix/_mix old mode 100755 new mode 100644 index 57fdf80..cfeb470 --- a/.oh-my-zsh/plugins/mix/_mix +++ b/.oh-my-zsh/plugins/mix/_mix @@ -86,6 +86,9 @@ case $state in (test) _files ;; + (run) + _files + ;; esac ;; esac diff --git a/.oh-my-zsh/plugins/mosh/mosh.plugin.zsh b/.oh-my-zsh/plugins/mosh/mosh.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/mvn/README.md b/.oh-my-zsh/plugins/mvn/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/mvn/mvn.plugin.zsh b/.oh-my-zsh/plugins/mvn/mvn.plugin.zsh old mode 100755 new mode 100644 index 04bd186..f1e4d3e --- a/.oh-my-zsh/plugins/mvn/mvn.plugin.zsh +++ b/.oh-my-zsh/plugins/mvn/mvn.plugin.zsh @@ -1,43 +1,42 @@ # mvn-color based on https://gist.github.com/1027800 -BOLD=`tput bold` -UNDERLINE_ON=`tput smul` -UNDERLINE_OFF=`tput rmul` -TEXT_BLACK=`tput setaf 0` -TEXT_RED=`tput setaf 1` -TEXT_GREEN=`tput setaf 2` -TEXT_YELLOW=`tput setaf 3` -TEXT_BLUE=`tput setaf 4` -TEXT_MAGENTA=`tput setaf 5` -TEXT_CYAN=`tput setaf 6` -TEXT_WHITE=`tput setaf 7` -BACKGROUND_BLACK=`tput setab 0` -BACKGROUND_RED=`tput setab 1` -BACKGROUND_GREEN=`tput setab 2` -BACKGROUND_YELLOW=`tput setab 3` -BACKGROUND_BLUE=`tput setab 4` -BACKGROUND_MAGENTA=`tput setab 5` -BACKGROUND_CYAN=`tput setab 6` -BACKGROUND_WHITE=`tput setab 7` -RESET_FORMATTING=`tput sgr0` +BOLD=$(tput bold) +UNDERLINE_ON=$(tput smul) +UNDERLINE_OFF=$(tput rmul) +TEXT_BLACK=$(tput setaf 0) +TEXT_RED=$(tput setaf 1) +TEXT_GREEN=$(tput setaf 2) +TEXT_YELLOW=$(tput setaf 3) +TEXT_BLUE=$(tput setaf 4) +TEXT_MAGENTA=$(tput setaf 5) +TEXT_CYAN=$(tput setaf 6) +TEXT_WHITE=$(tput setaf 7) +BACKGROUND_BLACK=$(tput setab 0) +BACKGROUND_RED=$(tput setab 1) +BACKGROUND_GREEN=$(tput setab 2) +BACKGROUND_YELLOW=$(tput setab 3) +BACKGROUND_BLUE=$(tput setab 4) +BACKGROUND_MAGENTA=$(tput setab 5) +BACKGROUND_CYAN=$(tput setab 6) +BACKGROUND_WHITE=$(tput setab 7) +RESET_FORMATTING=$(tput sgr0) + - # Wrapper function for Maven's mvn command. -mvn-color() -{ +mvn-color() { ( # Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations unset LANG - LC_CTYPE=C mvn $@ | sed -e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \ + LC_CTYPE=C mvn "$@" | sed -e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \ -e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \ -e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \ -e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \ -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g" # Make sure formatting is reset - echo -ne ${RESET_FORMATTING} - ) + echo -ne "${RESET_FORMATTING}" + ) } - + # Override the mvn command with the colorized one. #alias mvn="mvn-color" @@ -65,30 +64,30 @@ alias mvnsrc='mvn dependency:sources' alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc' function listMavenCompletions { - reply=( + reply=( # common lifecycle clean process-resources compile process-test-resources test-compile test integration-test package verify install deploy site - + # common plugins deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt - + # deploy deploy:deploy-file # failsafe failsafe:integration-test failsafe:verify # install - install:install-file + install:install-file install:help # site - site:site site:deploy site:run site:stage site:stage-deploy + site:site site:deploy site:run site:stage site:stage-deploy site:attach-descriptor site:jar site:effective-site # surefire surefire:test - + # checkstyle - checkstyle:checkstyle checkstyle:check + checkstyle:checkstyle checkstyle:check checkstyle:checkstyle-aggregate # javadoc - javadoc:javadoc javadoc:jar javadoc:aggregate + javadoc:javadoc javadoc:test-javadoc javadoc:javadoc-no-fork javadoc:test-javadoc-no-fork javadoc:aggregate javadoc:test-aggregate javadoc:jar javadoc:test-jar javadoc:aggregate-jar javadoc:test-aggregate-jar javadoc:fix javadoc:test-fix javadoc:resource-bundle javadoc:test-resource-bundle # jxr - jxr:jxr + jxr:jxr jxr:aggregate jxr:test-jxr jxr:test-aggregate # pmd pmd:pmd pmd:cpd pmd:check pmd:cpd-check @@ -101,27 +100,27 @@ function listMavenCompletions { # assembly assembly:single assembly:assembly # dependency - dependency:analyze dependency:analyze-dep-mgt dependency:analyze-only dependency:analyze-report dependency:build-classpath dependency:copy dependency:copy-dependencies dependency:get dependency:go-offline dependency:list dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree dependency:unpack dependency:unpack-dependencies + dependency:analyze dependency:analyze-dep-mgt dependency:analyze-only dependency:analyze-report dependency:analyze-duplicate dependency:build-classpath dependency:copy dependency:copy-dependencies dependency:display-ancestors dependency:get dependency:go-offline dependency:list dependency:list-repositories dependency:properties dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree dependency:unpack dependency:unpack-dependencies # enforcer - enforcer:enforce + enforcer:enforce enforcer:display-info # gpg gpg:sign gpg:sign-and-deploy-file # help help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system # release - release:clean release:prepare release:rollback release:perform release:stage release:branch release:update-versions - # jgitflow - jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number + release:clean release:prepare release:prepare-with-pom release:rollback release:perform release:stage release:branch release:update-versions + # jgitflow + jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number # repository repository:bundle-create repository:bundle-pack # source - source:aggregate source:jar source:jar-no-fork - + source:aggregate source:jar source:jar-no-fork source:test-jar source:test-jar-no-fork + # eclipse eclipse:clean eclipse:eclipse # idea idea:clean idea:idea - + # jetty jetty:run jetty:run-exploded # cargo @@ -134,7 +133,7 @@ function listMavenCompletions { tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy # tomcat7 tomcat7:run tomcat7:run-war tomcat7:run-war-only tomcat7:deploy - # tomee + # tomee tomee:run tomee:run-war tomee:run-war-only tomee:stop tomee:deploy tomee:undeploy # spring-boot spring-boot:run spring-boot:repackage @@ -143,7 +142,7 @@ function listMavenCompletions { # versions versions:display-dependency-updates versions:display-plugin-updates versions:display-property-updates versions:update-parent versions:update-properties versions:update-child-modules versions:lock-snapshots versions:unlock-snapshots versions:resolve-ranges versions:set versions:use-releases versions:use-next-releases versions:use-latest-releases versions:use-next-snapshots versions:use-latest-snapshots versions:use-next-versions versions:use-latest-versions versions:commit versions:revert # scm - scm:add scm:checkin scm:checkout scm:update scm:status + scm:add scm:bootstrap scm:branch scm:changelog scm:check-local-modification scm:checkin scm:checkout scm:diff scm:edit scm:export scm:list scm:remove scm:status scm:tag scm:unedit scm:update scm:update-subprojects scm:validate # buildnumber buildnumber:create buildnumber:create-timestamp buildnumber:help buildnumber:hgchangeset @@ -172,18 +171,104 @@ function listMavenCompletions { flyway:clean flyway:history flyway:init flyway:migrate flyway:status flyway:validate # gwt gwt:browser gwt:clean gwt:compile gwt:compile-report gwt:css gwt:debug gwt:eclipse gwt:eclipseTest gwt:generateAsync gwt:help gwt:i18n gwt:mergewebxml gwt:resources gwt:run gwt:sdkInstall gwt:source-jar gwt:soyc gwt:test - + # asciidoctor + asciidoctor:process-asciidoc asciidoctor:auto-refresh asciidoctor:http asciidoctor:zip + # compiler + compiler:compile compiler:testCompile + # resources + resources:resources resources:testResources resources:copy-resources + # verifier + verifier:verify + # jar + jar:jar jar:test-jar + # rar + rar:rar + # acr + acr:acr + # shade + shade:shade + # changelog + changelog:changelog changelog:dev-activity changelog:file-activity + # changes + changes:announcement-mail changes:announcement-generate changes:changes-check changes:changes-validate changes:changes-report changes:jira-report changes:trac-report changes:github-report + # doap + doap:generate + # docck + docck:check + # jdeps + jdeps:jdkinternals jdeps:test-jdkinternals + # linkcheck + linkcheck:linkcheck + # project-info-reports + project-info-reports:cim project-info-reports:dependencies project-info-reports:dependency-convergence project-info-reports:dependency-info project-info-reports:dependency-management project-info-reports:distribution-management project-info-reports:help project-info-reports:index project-info-reports:issue-tracking project-info-reports:license project-info-reports:mailing-list project-info-reports:modules project-info-reports:plugin-management project-info-reports:plugins project-info-reports:project-team project-info-reports:scm project-info-reports:summary + # surefire-report + surefire-report:failsafe-report-only surefire-report:report surefire-report:report-only + # invoker + invoker:install invoker:integration-test invoker:verify invoker:run + # jarsigner + jarsigner:sign jarsigner:verify + # patch + patch:apply + # pdf + pdf:pdf + # plugin + plugin:descriptor plugin:report plugin:updateRegistry plugin:addPluginArtifactMetadata plugin:helpmojo + # remote-resources + remote-resources:bundle remote-resources:process + # scm-publish + scm-publish:help scm-publish:publish-scm scm-publish:scmpublish + # stage + stage:copy + # toolchain + toolchain:toolchain + # options - -Dmaven.test.skip=true -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile -Dpmd.skip=true -Dcheckstyle.skip=true -Dtycho.mode=maven -Dmaven.test.failure.ignore=true -DgroupId= -DartifactId= -Dversion= -Dpackaging=jar -Dfile= + "-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile=" # arguments - -am -amd -B -C -c -cpu -D -e -emp -ep -f -fae -ff -fn -gs -h -l -N -npr -npu -nsu -o -P -pl -q -rf -s -T -t -U -up -V -v -X + -am --also-make + -amd --also-make-dependents-am + -B --batch-mode + -b --builder + -C --strict-checksums + -c --lax-checksums + -cpu --check-plugin-updates + -D --define + -e --errors + -emp --encrypt-master-password + -ep --encrypt-password + -f --file + -fae --fail-at-end + -ff --fail-fast + -fn --fail-never + -gs --global-settings + -gt --global-toolchains + -h --help + -l --log-file + -llr --legacy-local-repository + -N --non-recursive + -npr --no-plugin-registry + -npu --no-plugin-updates + -nsu --no-snapshot-updates + -o --offline + -P --activate-profiles + -pl --projects + -q --quiet + -rf --resume-from + -s --settings + -t --toolchains + -T --threads + -U --update-snapshots + -up --update-plugins + -v --version + -V --show-version + -X --debug cli:execute cli:execute-phase archetype:generate generate-sources cobertura:cobertura - -Dtest= `if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi` - -Dit.test= `if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi` + -Dtest=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi) + -Dit.test=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi) ); } diff --git a/.oh-my-zsh/plugins/mysql-macports/mysql-macports.plugin.zsh b/.oh-my-zsh/plugins/mysql-macports/mysql-macports.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/nanoc/_nanoc b/.oh-my-zsh/plugins/nanoc/_nanoc old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/nanoc/nanoc.plugin.zsh b/.oh-my-zsh/plugins/nanoc/nanoc.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/ng/README.md b/.oh-my-zsh/plugins/ng/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/ng/ng.plugin.zsh b/.oh-my-zsh/plugins/ng/ng.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/nmap/README.md b/.oh-my-zsh/plugins/nmap/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/nmap/nmap.plugin.zsh b/.oh-my-zsh/plugins/nmap/nmap.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/node/node.plugin.zsh b/.oh-my-zsh/plugins/node/node.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/nomad/README.md b/.oh-my-zsh/plugins/nomad/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/nomad/_nomad b/.oh-my-zsh/plugins/nomad/_nomad old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/npm/npm.plugin.zsh b/.oh-my-zsh/plugins/npm/npm.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/nvm/_nvm b/.oh-my-zsh/plugins/nvm/_nvm old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/nvm/nvm.plugin.zsh b/.oh-my-zsh/plugins/nvm/nvm.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/nyan/nyan.plugin.zsh b/.oh-my-zsh/plugins/nyan/nyan.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/osx/README.md b/.oh-my-zsh/plugins/osx/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/osx/osx.plugin.zsh b/.oh-my-zsh/plugins/osx/osx.plugin.zsh old mode 100755 new mode 100644 index d7baa11..e8488eb --- a/.oh-my-zsh/plugins/osx/osx.plugin.zsh +++ b/.oh-my-zsh/plugins/osx/osx.plugin.zsh @@ -184,6 +184,7 @@ function vncviewer() { # iTunes control function function itunes() { local opt=$1 + local playlist=$2 shift case "$opt" in launch|play|pause|stop|rewind|resume|quit) @@ -200,6 +201,19 @@ function itunes() { vol) opt="set sound volume to $1" #$1 Due to the shift ;; + playlist) + # Inspired by: https://gist.github.com/nakajijapan/ac8b45371064ae98ea7f +if [[ ! -z "$playlist" ]]; then + osascript -e 'tell application "iTunes"' -e "set new_playlist to \"$playlist\" as string" -e "play playlist new_playlist" -e "end tell" 2>/dev/null; + if [[ $? -eq 0 ]]; then + opt="play" + else + opt="stop" + fi + else + opt="set allPlaylists to (get name of every playlist)" + fi + ;; playing|status) local state=`osascript -e 'tell application "iTunes" to player state as string'` if [[ "$state" = "playing" ]]; then @@ -250,6 +264,7 @@ EOF echo "\tshuf|shuffle [on|off|toggle]\tSet shuffled playback. Default: toggle. Note: toggle doesn't support the MiniPlayer." echo "\tvol\tSet the volume, takes an argument from 0 to 100" echo "\tplaying|status\tShow what song is currently playing in iTunes." + echo "\tplaylist [playlist name]\t Play specific playlist" echo "\thelp\tshow this message and exit" return 0 ;; @@ -323,7 +338,7 @@ function spotify() { if [ $# = 0 ]; then showHelp; else - if [ "$(osascript -e 'application "Spotify" is running')" = "false" ]; then + if [ "$1" != "quit" ] && [ "$(osascript -e 'application "Spotify" is running')" = "false" ]; then osascript -e 'tell application "Spotify" to activate' sleep 2 fi @@ -413,9 +428,13 @@ function spotify() { break ;; "quit" ) - cecho "Quitting Spotify."; - osascript -e 'tell application "Spotify" to quit'; - exit 1 ;; + if [ "$(osascript -e 'application "Spotify" is running')" = "false" ]; then + cecho "Spotify was not running." + else + cecho "Closing Spotify."; + osascript -e 'tell application "Spotify" to quit'; + fi + break ;; "next" ) cecho "Going to next track." ; @@ -470,7 +489,7 @@ function spotify() { "pos" ) cecho "Adjusting Spotify play position." osascript -e "tell application \"Spotify\" to set player position to $2"; - break;; + break ;; "status" ) showStatus; diff --git a/.oh-my-zsh/plugins/pass/_pass b/.oh-my-zsh/plugins/pass/_pass old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/paver/paver.plugin.zsh b/.oh-my-zsh/plugins/paver/paver.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/pep8/_pep8 b/.oh-my-zsh/plugins/pep8/_pep8 old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/per-directory-history/README.md b/.oh-my-zsh/plugins/per-directory-history/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/per-directory-history/per-directory-history.zsh b/.oh-my-zsh/plugins/per-directory-history/per-directory-history.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/perl/perl.plugin.zsh b/.oh-my-zsh/plugins/perl/perl.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/perms/README.md b/.oh-my-zsh/plugins/perms/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/perms/perms.plugin.zsh b/.oh-my-zsh/plugins/perms/perms.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/phing/phing.plugin.zsh b/.oh-my-zsh/plugins/phing/phing.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/pip/_pip b/.oh-my-zsh/plugins/pip/_pip old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/pip/pip.plugin.zsh b/.oh-my-zsh/plugins/pip/pip.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/pj/README.md b/.oh-my-zsh/plugins/pj/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/pj/pj.plugin.zsh b/.oh-my-zsh/plugins/pj/pj.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/pod/_pod b/.oh-my-zsh/plugins/pod/_pod old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/postgres/postgres.plugin.zsh b/.oh-my-zsh/plugins/postgres/postgres.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/pow/pow.plugin.zsh b/.oh-my-zsh/plugins/pow/pow.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/powder/_powder b/.oh-my-zsh/plugins/powder/_powder old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/powify/_powify b/.oh-my-zsh/plugins/powify/_powify old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/profiles/profiles.plugin.zsh b/.oh-my-zsh/plugins/profiles/profiles.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/pyenv/pyenv.plugin.zsh b/.oh-my-zsh/plugins/pyenv/pyenv.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/pylint/_pylint b/.oh-my-zsh/plugins/pylint/_pylint old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/pylint/pylint.plugin.zsh b/.oh-my-zsh/plugins/pylint/pylint.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/python/_python b/.oh-my-zsh/plugins/python/_python old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/python/python.plugin.zsh b/.oh-my-zsh/plugins/python/python.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/rails/_rails b/.oh-my-zsh/plugins/rails/_rails old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/rails/rails.plugin.zsh b/.oh-my-zsh/plugins/rails/rails.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/rake-fast/README.md b/.oh-my-zsh/plugins/rake-fast/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/rake-fast/rake-fast.plugin.zsh b/.oh-my-zsh/plugins/rake-fast/rake-fast.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/rake/rake.plugin.zsh b/.oh-my-zsh/plugins/rake/rake.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/rand-quote/rand-quote.plugin.zsh b/.oh-my-zsh/plugins/rand-quote/rand-quote.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/rbenv/rbenv.plugin.zsh b/.oh-my-zsh/plugins/rbenv/rbenv.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/rbfu/rbfu.plugin.zsh b/.oh-my-zsh/plugins/rbfu/rbfu.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/react-native/README.md b/.oh-my-zsh/plugins/react-native/README.md old mode 100755 new mode 100644 index 78bfb68..980246c --- a/.oh-my-zsh/plugins/react-native/README.md +++ b/.oh-my-zsh/plugins/react-native/README.md @@ -1,14 +1,29 @@ -# React Native +# React Native plugin -**Maintainer:** [BilalBudhani](https://github.com/BilalBudhani) +This plugin adds completion for [`react-native`](https://facebook.github.io/react-native/). +It also defines a few [aliases](#aliases) for the commands more frequently used. -### List of Aliases +To enable, add `react-native` to your `plugins` array in your zshrc file: -Alias | React Native command -------|--------------------- -**rnand** | *react-native run-android* -**rnios** | *react-native run-ios* -**rnios4s** | *react-native run-ios --simulator "iPhone 4s"* -**rnios5** | *react-native run-ios --simulator "iPhone 5"* -**rnios5s** | *react-native run-ios --simulator "iPhone 5s"* +```zsh +plugins=(... react-native) +``` +## Aliases + +| Alias | React Native command | +|:------------|:-----------------------------------------------| +| **rn** | `react-native` | +| **rns** | `react-native start` | +| **rnlink** | `react-native link` | +| _App testing_ | +| **rnand** | `react-native run-android` | +| **rnios** | `react-native run-ios` | +| **rnios4s** | `react-native run-ios --simulator "iPhone 4s"` | +| **rnios5** | `react-native run-ios --simulator "iPhone 5"` | +| **rnios5s** | `react-native run-ios --simulator "iPhone 5s"` | +| **rnios6** | `react-native run-ios --simulator "iPhone 6"` | +| **rnios6s** | `react-native run-ios --simulator "iPhone 6s"` | +| _Logging_ | +| **rnland** | `react-native log-android` | +| **rnlios** | `react-native log-ios` | diff --git a/.oh-my-zsh/plugins/react-native/_react-native b/.oh-my-zsh/plugins/react-native/_react-native old mode 100755 new mode 100644 index 47ee8c3..893ac04 --- a/.oh-my-zsh/plugins/react-native/_react-native +++ b/.oh-my-zsh/plugins/react-native/_react-native @@ -3,12 +3,21 @@ local -a _1st_arguments _1st_arguments=( + 'init: generates a new project and installs its dependencies' + 'android:creates an empty android project' 'start:starts the webserver' - 'bundle:builds the javascript bundle for offline use' - 'new-library:generates a native library bridge' - 'android:generates an Android project for your app' + 'run-ios:builds your app and starts it on iOS simulator' 'run-android:builds your app and starts it on a connected Android emulator or device' - 'upgrade:upgrade your apps template files to the latest version; run this after updating the react-native version in your package.json and running npm install' + 'new-library:generates a native library bridge' + 'bundle:builds the javascript bundle for offline use' + 'unbundle:builds javascript as "unbundle" for offline use' + 'link:[options] links all native dependencies' + 'unlink:[options] unlink native dependency' + 'install:[options] install and link native dependencies' + 'uninstall:[options] uninstall and unlink native dependencies' + "upgrade:upgrade your app's template files to the latest version; run this after updating the react-native version in your package.json and running npm install" + 'log-android:starts adb logcat' + 'log-ios:starts iOS device syslog tail' ) diff --git a/.oh-my-zsh/plugins/react-native/react-native.plugin.zsh b/.oh-my-zsh/plugins/react-native/react-native.plugin.zsh old mode 100755 new mode 100644 index f19cba8..0566941 --- a/.oh-my-zsh/plugins/react-native/react-native.plugin.zsh +++ b/.oh-my-zsh/plugins/react-native/react-native.plugin.zsh @@ -1,9 +1,14 @@ +alias rn='react-native' +alias rns='react-native start' +alias rnlink='react-native link' + alias rnand='react-native run-android' +alias rnios='react-native run-ios' alias rnios4s='react-native run-ios --simulator "iPhone 4s"' alias rnios5='react-native run-ios --simulator "iPhone 5"' alias rnios5s='react-native run-ios --simulator "iPhone 5s"' alias rnios6='react-native run-ios --simulator "iPhone 6"' alias rnios6s='react-native run-ios --simulator "iPhone 6s"' -alias rnios='react-native run-ios' -alias rnlink='react-native link' +alias rnland='react-native log-android' +alias rnlios='react-native log-ios' diff --git a/.oh-my-zsh/plugins/rebar/_rebar b/.oh-my-zsh/plugins/rebar/_rebar old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/redis-cli/_redis-cli b/.oh-my-zsh/plugins/redis-cli/_redis-cli old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/repo/README.md b/.oh-my-zsh/plugins/repo/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/repo/_repo b/.oh-my-zsh/plugins/repo/_repo old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/repo/repo.plugin.zsh b/.oh-my-zsh/plugins/repo/repo.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/rsync/rsync.plugin.zsh b/.oh-my-zsh/plugins/rsync/rsync.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/ruby/ruby.plugin.zsh b/.oh-my-zsh/plugins/ruby/ruby.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/rust/_rust b/.oh-my-zsh/plugins/rust/_rust old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/rvm/rvm.plugin.zsh b/.oh-my-zsh/plugins/rvm/rvm.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/safe-paste/safe-paste.plugin.zsh b/.oh-my-zsh/plugins/safe-paste/safe-paste.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/sbt/_sbt b/.oh-my-zsh/plugins/sbt/_sbt old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/sbt/sbt.plugin.zsh b/.oh-my-zsh/plugins/sbt/sbt.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/scala/_scala b/.oh-my-zsh/plugins/scala/_scala old mode 100755 new mode 100644 index c4ccb37..8043468 --- a/.oh-my-zsh/plugins/scala/_scala +++ b/.oh-my-zsh/plugins/scala/_scala @@ -152,10 +152,10 @@ Y_opts=( "-Ydump-classes+[Dump the generated bytecode to .class files (useful for reflective compilation that utilizes in-memory classloaders)]:output directory:_files -/" "-Yeta-expand-keeps-star[Eta-expand varargs methods to T* rather than Seq[T]. This is a temporary option to ease transition.]" "-Ygen-javap+[Generate a parallel output directory of .javap files]:output directory:_files -/" - "-Yinfer-argument-types[Infer types for arguments of overriden methods]" + "-Yinfer-argument-types[Infer types for arguments of overridden methods]" "-Yinline[Perform inlining when possible]" "-Yinline-handlers[Perform exception handler inlining when possible]" - "-Yinline-warnings[Emit inlining warnings (normally surpressed due to high volume)]" + "-Yinline-warnings[Emit inlining warnings (normally suppressed due to high volume)]" "-Yinvalidate+[Invalidate classpath entry before run]:classpath entry" "-Ylinearizer\:-[Linearizer to use (default\: rpo)]:linearizer:(normal dfs rpo dump)" "-Ylog-classpath[Output information about what classpath is being applied]" diff --git a/.oh-my-zsh/plugins/scd/README.md b/.oh-my-zsh/plugins/scd/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/scd/scd.plugin.zsh b/.oh-my-zsh/plugins/scd/scd.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/screen/screen.plugin.zsh b/.oh-my-zsh/plugins/screen/screen.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/scw/README.md b/.oh-my-zsh/plugins/scw/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/scw/_scw b/.oh-my-zsh/plugins/scw/_scw old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/sfffe/sfffe.plugin.zsh b/.oh-my-zsh/plugins/sfffe/sfffe.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/shrink-path/README.md b/.oh-my-zsh/plugins/shrink-path/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/shrink-path/shrink-path.plugin.zsh b/.oh-my-zsh/plugins/shrink-path/shrink-path.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/singlechar/singlechar.plugin.zsh b/.oh-my-zsh/plugins/singlechar/singlechar.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/spring/README.md b/.oh-my-zsh/plugins/spring/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/spring/_spring b/.oh-my-zsh/plugins/spring/_spring old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/sprunge/sprunge.plugin.zsh b/.oh-my-zsh/plugins/sprunge/sprunge.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/ssh-agent/README.md b/.oh-my-zsh/plugins/ssh-agent/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/ssh-agent/ssh-agent.plugin.zsh b/.oh-my-zsh/plugins/ssh-agent/ssh-agent.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/stack/stack.plugin.zsh b/.oh-my-zsh/plugins/stack/stack.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/sublime/README.md b/.oh-my-zsh/plugins/sublime/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/sublime/sublime.plugin.zsh b/.oh-my-zsh/plugins/sublime/sublime.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/sudo/sudo.plugin.zsh b/.oh-my-zsh/plugins/sudo/sudo.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/supervisor/_supervisorctl b/.oh-my-zsh/plugins/supervisor/_supervisorctl old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/supervisor/_supervisord b/.oh-my-zsh/plugins/supervisor/_supervisord old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/supervisor/supervisor.plugin.zsh b/.oh-my-zsh/plugins/supervisor/supervisor.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/suse/suse.plugin.zsh b/.oh-my-zsh/plugins/suse/suse.plugin.zsh old mode 100755 new mode 100644 index afd8eca..f721552 --- a/.oh-my-zsh/plugins/suse/suse.plugin.zsh +++ b/.oh-my-zsh/plugins/suse/suse.plugin.zsh @@ -1,4 +1,4 @@ -#Alias for Zypper according to the offical Zypper's alias +#Alias for Zypper according to the official Zypper's alias #Main commands alias z='sudo zypper' #call zypper @@ -51,7 +51,7 @@ alias zrr='sudo zypper rr' #remove repositories alias zas='sudo zypper as' #adds a service specified by URI to the system alias zms='sudo zypper ms' #modify properties of specified services alias zrefs='sudo zypper refs' #refreshing a service mean executing the service's special task -alias zrs='sudo zypper rs' #remove specified repository index service from the sytem +alias zrs='sudo zypper rs' #remove specified repository index service from the system alias zls='sudo zypper ls' #list services defined on the system #Package Locks Management commands diff --git a/.oh-my-zsh/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/.oh-my-zsh/plugins/svn-fast-info/svn-fast-info.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/svn/README.md b/.oh-my-zsh/plugins/svn/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/svn/svn.plugin.zsh b/.oh-my-zsh/plugins/svn/svn.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/swiftpm/README.md b/.oh-my-zsh/plugins/swiftpm/README.md new file mode 100644 index 0000000..07ca256 --- /dev/null +++ b/.oh-my-zsh/plugins/swiftpm/README.md @@ -0,0 +1,22 @@ +# Swift Package Manager + +## Description + +This plugin provides a few utilities that make you faster on your daily work with the [Swift Package Manager](https://github.com/apple/swift-package-manager). + +To start using it, add the `swiftpm` plugin to your `plugins` array in `~/.zshrc`: + +```zsh +plugins=(... swiftpm) +``` + +## Aliases + +| Alias | Description | Command | +|-------|-------------------------------------|------------------------------------| +| `spi` | Initialize a new package | `swift package init` | +| `spf` | Fetch package dependencies | `swift package fetch` | +| `spu` | Update package dependencies | `swift package update` | +| `spx` | Generates an Xcode project | `swift package generate-xcodeproj` | +| `sps` | Print the resolved dependency graph | `swift package show-dependencies` | +| `spd` | Print parsed Package.swift as JSON | `swift package dump-package` | diff --git a/.oh-my-zsh/plugins/swiftpm/swiftpm.plugin.zsh b/.oh-my-zsh/plugins/swiftpm/swiftpm.plugin.zsh new file mode 100644 index 0000000..ef872ea --- /dev/null +++ b/.oh-my-zsh/plugins/swiftpm/swiftpm.plugin.zsh @@ -0,0 +1,8 @@ +# Some aliases to make your life with the Swift Package Manager faster ✌️ + +alias spi='swift package init' +alias spf='swift package fetch' +alias spu='swift package update' +alias spx='swift package generate-xcodeproj' +alias sps='swift package show-dependencies' +alias spd='swift package dump-package' diff --git a/.oh-my-zsh/plugins/symfony/symfony.plugin.zsh b/.oh-my-zsh/plugins/symfony/symfony.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/symfony2/symfony2.plugin.zsh b/.oh-my-zsh/plugins/symfony2/symfony2.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/systemadmin/systemadmin.plugin.zsh b/.oh-my-zsh/plugins/systemadmin/systemadmin.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/systemd/systemd.plugin.zsh b/.oh-my-zsh/plugins/systemd/systemd.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/taskwarrior/README.md b/.oh-my-zsh/plugins/taskwarrior/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/taskwarrior/_task b/.oh-my-zsh/plugins/taskwarrior/_task old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/taskwarrior/taskwarrior.plugin.zsh b/.oh-my-zsh/plugins/taskwarrior/taskwarrior.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/terminalapp/terminalapp.plugin.zsh b/.oh-my-zsh/plugins/terminalapp/terminalapp.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/terminitor/_terminitor b/.oh-my-zsh/plugins/terminitor/_terminitor old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/terraform/README.md b/.oh-my-zsh/plugins/terraform/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/terraform/_terraform b/.oh-my-zsh/plugins/terraform/_terraform old mode 100755 new mode 100644 index 11740dc..97c42a5 --- a/.oh-my-zsh/plugins/terraform/_terraform +++ b/.oh-my-zsh/plugins/terraform/_terraform @@ -98,7 +98,7 @@ __push() { '-token=[(token) Atlas API token to use to authorize the upload. If blank or unspecified, the ATLAS_TOKEN environmental variable will be used.]' \ '-var=[("foo=bar") Set the value of a variable for the Terraform configuration.]' \ '-var-file=[(foo) Set the value of variables using a variable file.]' \ - '-vcs=[(true) If true (default), then Terraform will detect if a VCS is in use, such as Git, and will only upload files that are comitted to version control. If no version control system is detected, Terraform will upload all files in path (parameter to the command).]' + '-vcs=[(true) If true (default), then Terraform will detect if a VCS is in use, such as Git, and will only upload files that are committed to version control. If no version control system is detected, Terraform will upload all files in path (parameter to the command).]' } __refresh() { diff --git a/.oh-my-zsh/plugins/textastic/README.md b/.oh-my-zsh/plugins/textastic/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/textastic/textastic.plugin.zsh b/.oh-my-zsh/plugins/textastic/textastic.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/textmate/textmate.plugin.zsh b/.oh-my-zsh/plugins/textmate/textmate.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/thefuck/README.md b/.oh-my-zsh/plugins/thefuck/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/thefuck/thefuck.plugin.zsh b/.oh-my-zsh/plugins/thefuck/thefuck.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/themes/_theme b/.oh-my-zsh/plugins/themes/_theme old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/themes/themes.plugin.zsh b/.oh-my-zsh/plugins/themes/themes.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/thor/_thor b/.oh-my-zsh/plugins/thor/_thor old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/tig/README.md b/.oh-my-zsh/plugins/tig/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/tig/tig.plugin.zsh b/.oh-my-zsh/plugins/tig/tig.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/tmux-cssh/_tmux-cssh b/.oh-my-zsh/plugins/tmux-cssh/_tmux-cssh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/tmux/tmux.extra.conf b/.oh-my-zsh/plugins/tmux/tmux.extra.conf old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/tmux/tmux.only.conf b/.oh-my-zsh/plugins/tmux/tmux.only.conf old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/tmux/tmux.plugin.zsh b/.oh-my-zsh/plugins/tmux/tmux.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/tmuxinator/_tmuxinator b/.oh-my-zsh/plugins/tmuxinator/_tmuxinator old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/torrent/torrent.plugin.zsh b/.oh-my-zsh/plugins/torrent/torrent.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/tugboat/_tugboat b/.oh-my-zsh/plugins/tugboat/_tugboat old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/ubuntu/readme.md b/.oh-my-zsh/plugins/ubuntu/readme.md old mode 100755 new mode 100644 index c9ef61f..5ad4bbc --- a/.oh-my-zsh/plugins/ubuntu/readme.md +++ b/.oh-my-zsh/plugins/ubuntu/readme.md @@ -10,7 +10,7 @@ By now you already can guess almost all aliases There are two exeptions since ... agu = sudo Apt-Get Update - we have ... -agug = sudo Apt-Get UpGrade - as the exeptional 4 letter alias for a single command. +agug = sudo Apt-Get UpGrade - as the exceptional 4 letter alias for a single command. afs = Apt-File Search --regexp - this has the regexp switch on without being represented in the alias, I guess this makes sense since the debian plugin has it, I never used that command. diff --git a/.oh-my-zsh/plugins/ubuntu/ubuntu.plugin.zsh b/.oh-my-zsh/plugins/ubuntu/ubuntu.plugin.zsh old mode 100755 new mode 100644 index ffde284..60ff045 --- a/.oh-my-zsh/plugins/ubuntu/ubuntu.plugin.zsh +++ b/.oh-my-zsh/plugins/ubuntu/ubuntu.plugin.zsh @@ -69,7 +69,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc' # apt-add-repository with automatic install/upgrade of the desired package # Usage: aar ppa:xxxxxx/xxxxxx [packagename] # If packagename is not given as 2nd argument the function will ask for it and guess the default by taking -# the part after the / from the ppa name wich is sometimes the right name for the package you want to install +# the part after the / from the ppa name which is sometimes the right name for the package you want to install aar() { if [ -n "$2" ]; then PACKAGE=$2 @@ -108,7 +108,7 @@ apt-history () { awk '{print $4"="$5}' ;; list) - zcat $(ls -rt /var/log/dpkg*) + zgrep --no-filename '' $(ls -rt /var/log/dpkg*) ;; *) echo "Parameters:" diff --git a/.oh-my-zsh/plugins/urltools/urltools.plugin.zsh b/.oh-my-zsh/plugins/urltools/urltools.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/vagrant/_vagrant b/.oh-my-zsh/plugins/vagrant/_vagrant old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/vault/README.md b/.oh-my-zsh/plugins/vault/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/vault/_vault b/.oh-my-zsh/plugins/vault/_vault old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/vi-mode/README.md b/.oh-my-zsh/plugins/vi-mode/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/vi-mode/vi-mode.plugin.zsh b/.oh-my-zsh/plugins/vi-mode/vi-mode.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/vim-interaction/README.md b/.oh-my-zsh/plugins/vim-interaction/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/vim-interaction/vim-interaction.plugin.zsh b/.oh-my-zsh/plugins/vim-interaction/vim-interaction.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/virtualenv/virtualenv.plugin.zsh b/.oh-my-zsh/plugins/virtualenv/virtualenv.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/.oh-my-zsh/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/vundle/vundle.plugin.zsh b/.oh-my-zsh/plugins/vundle/vundle.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/wakeonlan/README b/.oh-my-zsh/plugins/wakeonlan/README old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/wakeonlan/_wake b/.oh-my-zsh/plugins/wakeonlan/_wake old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/wakeonlan/wakeonlan.plugin.zsh b/.oh-my-zsh/plugins/wakeonlan/wakeonlan.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/wd/LICENSE b/.oh-my-zsh/plugins/wd/LICENSE old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/wd/README.md b/.oh-my-zsh/plugins/wd/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/wd/_wd.sh b/.oh-my-zsh/plugins/wd/_wd.sh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/wd/wd.plugin.zsh b/.oh-my-zsh/plugins/wd/wd.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/web-search/web-search.plugin.zsh b/.oh-my-zsh/plugins/web-search/web-search.plugin.zsh old mode 100755 new mode 100644 index 3b5478c..cc970e5 --- a/.oh-my-zsh/plugins/web-search/web-search.plugin.zsh +++ b/.oh-my-zsh/plugins/web-search/web-search.plugin.zsh @@ -15,6 +15,7 @@ function web_search() { github "https://github.com/search?q=" baidu "https://www.baidu.com/s?wd=" ecosia "https://www.ecosia.org/search?q=" + goodreads "https://www.goodreads.com/search?q=" ) # check whether the search engine is supported @@ -47,6 +48,7 @@ alias yandex='web_search yandex' alias github='web_search github' alias baidu='web_search baidu' alias ecosia='web_search ecosia' +alias goodreads='web_search goodreads' #add your own !bang searches here alias wiki='web_search duckduckgo \!w' diff --git a/.oh-my-zsh/plugins/wp-cli/README.md b/.oh-my-zsh/plugins/wp-cli/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/wp-cli/wp-cli.plugin.zsh b/.oh-my-zsh/plugins/wp-cli/wp-cli.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/xcode/README.md b/.oh-my-zsh/plugins/xcode/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/xcode/_xcselv b/.oh-my-zsh/plugins/xcode/_xcselv old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/xcode/xcode.plugin.zsh b/.oh-my-zsh/plugins/xcode/xcode.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/yarn/yarn.plugin.zsh b/.oh-my-zsh/plugins/yarn/yarn.plugin.zsh new file mode 100644 index 0000000..47c503a --- /dev/null +++ b/.oh-my-zsh/plugins/yarn/yarn.plugin.zsh @@ -0,0 +1,81 @@ +alias yi="yarn install" + +_yarn () +{ + local -a _1st_arguments _dopts _dev _production + local expl + typeset -A opt_args + + _dopts=( + '(--force)--force[This refetches all packages, even ones that were previously installed.]' + ) + + _installopts=( + '(--flat)--flat[Only allow one version of a package. On the first run this will prompt you to choose a single version for each package that is depended on at multiple version ranges.]' + '(--har)--har[Outputs an HTTP archive from all the network requests performed during the installation.]' + '(--no-lockfile)--no-lockfile[Don’t read or generate a yarn.lock lockfile.]' + '(--pure-lockfile)--pure-lockfile[Don’t generate a yarn.lock lockfile.]' + ) + + _dev=('(--dev)--dev[Save installed packages into the project"s package.json devDependencies]') + + _production=('(--production)--production[Do not install project devDependencies]') + + _1st_arguments=( + 'help:Display help information about yarn' \ + 'init:Initialize for the development of a package.' \ + 'add:Add a package to use in your current package.' \ + 'install:Install all the dependencies listed within package.json in the local node_modules folder.' \ + 'publish:Publish a package to a package manager.' \ + 'remove:Remove a package that will no longer be used in your current package.' \ + 'cache:Clear the local cache. It will be populated again the next time yarn or yarn install is run.' \ + 'clean:Frees up space by removing unnecessary files and folders from dependencies.' \ + 'check:Verifies that versions of the package dependencies in the current project’s package.json matches that of yarn’s lock file.' \ + 'ls:List all installed packages.' \ + 'global:Makes binaries available to use on your operating system.' \ + 'info: [] - fetch information about a package and return it in a tree format.' \ + 'outdated:Checks for outdated package dependencies.' \ + 'run:Runs a defined package script.' \ + 'self-update:Updates Yarn to the latest version.' \ + 'upgrade:Upgrades packages to their latest version based on the specified range.' \ + 'why: - Show information about why a package is installed.' + ) + _arguments \ + '*:: :->subcmds' && return 0 + + if (( CURRENT == 1 )); then + _describe -t commands "yarn subcommand" _1st_arguments + return + fi + + case "$words[1]" in + add) + _arguments \ + $_dopts \ + $_dev \ + $_production + ;; + install) + _arguments \ + $_installopts \ + $_dopts \ + $_dev \ + $_no_color \ + $_production + ;; + update) + _arguments \ + $_dopts + ;; + remove) + _arguments \ + $_dopts + ;; + *) + _arguments \ + ;; + esac + +} + +compdef _yarn yarn diff --git a/.oh-my-zsh/plugins/yii/yii.plugin.zsh b/.oh-my-zsh/plugins/yii/yii.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/yii2/README.md b/.oh-my-zsh/plugins/yii2/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/yii2/yii2.plugin.zsh b/.oh-my-zsh/plugins/yii2/yii2.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/yum/yum.plugin.zsh b/.oh-my-zsh/plugins/yum/yum.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/z/Makefile b/.oh-my-zsh/plugins/z/Makefile old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/z/README b/.oh-my-zsh/plugins/z/README old mode 100755 new mode 100644 index 7de82a4..56261cf --- a/.oh-my-zsh/plugins/z/README +++ b/.oh-my-zsh/plugins/z/README @@ -125,7 +125,7 @@ ENVIRONMENT Directories must be full paths without trailing slashes. The environment variable $_Z_OWNER can be set to your username, to - allow usage of z when your sudo enviroment keeps $HOME set. + allow usage of z when your sudo environment keeps $HOME set. FILES Data is stored in $HOME/.z. This can be overridden by setting the diff --git a/.oh-my-zsh/plugins/z/z.1 b/.oh-my-zsh/plugins/z/z.1 old mode 100755 new mode 100644 index cc99910..bbc1bf5 --- a/.oh-my-zsh/plugins/z/z.1 +++ b/.oh-my-zsh/plugins/z/z.1 @@ -151,7 +151,7 @@ directory trees to exclude from tracking. \fB$HOME\fR is always excluded. Directories must be full paths without trailing slashes. .P The environment variable \fB$_Z_OWNER\fR can be set to your username, to -allow usage of \fBz\fR when your sudo enviroment keeps \fB$HOME\fR set. +allow usage of \fBz\fR when your sudo environment keeps \fB$HOME\fR set. .SH FILES Data is stored in \fB$HOME/.z\fR. This can be overridden by setting the diff --git a/.oh-my-zsh/plugins/z/z.plugin.zsh b/.oh-my-zsh/plugins/z/z.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/z/z.sh b/.oh-my-zsh/plugins/z/z.sh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zeus/README.md b/.oh-my-zsh/plugins/zeus/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zeus/_zeus b/.oh-my-zsh/plugins/zeus/_zeus old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zeus/zeus.plugin.zsh b/.oh-my-zsh/plugins/zeus/zeus.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/README.txt b/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/README.txt old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-aliases.conf b/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-aliases.conf old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-cd.conf b/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-cd.conf old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-env.conf b/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-env.conf old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-functions.conf b/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-functions.conf old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-history.conf b/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-history.conf old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-kill.conf b/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-kill.conf old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-list.conf b/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-list.conf old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-options.conf b/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-options.conf old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-panelize.conf b/.oh-my-zsh/plugins/zsh-navigation-tools/.config/znt/n-panelize.conf old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/LICENSE b/.oh-my-zsh/plugins/zsh-navigation-tools/LICENSE old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/NEWS b/.oh-my-zsh/plugins/zsh-navigation-tools/NEWS old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/README.md b/.oh-my-zsh/plugins/zsh-navigation-tools/README.md old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/_n-kill b/.oh-my-zsh/plugins/zsh-navigation-tools/_n-kill old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-aliases b/.oh-my-zsh/plugins/zsh-navigation-tools/n-aliases old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-cd b/.oh-my-zsh/plugins/zsh-navigation-tools/n-cd old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-env b/.oh-my-zsh/plugins/zsh-navigation-tools/n-env old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-functions b/.oh-my-zsh/plugins/zsh-navigation-tools/n-functions old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-help b/.oh-my-zsh/plugins/zsh-navigation-tools/n-help old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-history b/.oh-my-zsh/plugins/zsh-navigation-tools/n-history old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-kill b/.oh-my-zsh/plugins/zsh-navigation-tools/n-kill old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-list b/.oh-my-zsh/plugins/zsh-navigation-tools/n-list old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-list-draw b/.oh-my-zsh/plugins/zsh-navigation-tools/n-list-draw old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-list-input b/.oh-my-zsh/plugins/zsh-navigation-tools/n-list-input old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-options b/.oh-my-zsh/plugins/zsh-navigation-tools/n-options old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/n-panelize b/.oh-my-zsh/plugins/zsh-navigation-tools/n-panelize old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/znt-cd-widget b/.oh-my-zsh/plugins/zsh-navigation-tools/znt-cd-widget old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/znt-history-widget b/.oh-my-zsh/plugins/zsh-navigation-tools/znt-history-widget old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/znt-kill-widget b/.oh-my-zsh/plugins/zsh-navigation-tools/znt-kill-widget old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh-navigation-tools/znt-usetty-wrapper b/.oh-my-zsh/plugins/zsh-navigation-tools/znt-usetty-wrapper old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/plugins/zsh_reload/zsh_reload.plugin.zsh b/.oh-my-zsh/plugins/zsh_reload/zsh_reload.plugin.zsh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/templates/zshrc.zsh-template b/.oh-my-zsh/templates/zshrc.zsh-template old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/themes/3den.zsh-theme b/.oh-my-zsh/themes/3den.zsh-theme new file mode 100644 index 0000000..1d2c7db --- /dev/null +++ b/.oh-my-zsh/themes/3den.zsh-theme @@ -0,0 +1,7 @@ +PROMPT=$'%{$fg[white]%}$(~/.rvm/bin/rvm-prompt) %{$fg_bold[cyan]%}%~%{$reset_color%}$(git_prompt_info) %{$fg[cyan]%}%D{[%I:%M:%S]}\ +%{$fg_bold[green]%}%n$%{$reset_color%} ' + +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="*" +ZSH_THEME_GIT_PROMPT_CLEAN="" diff --git a/.oh-my-zsh/themes/Soliah.zsh-theme b/.oh-my-zsh/themes/Soliah.zsh-theme new file mode 100644 index 0000000..070c549 --- /dev/null +++ b/.oh-my-zsh/themes/Soliah.zsh-theme @@ -0,0 +1,87 @@ +PROMPT='%{$fg[blue]%}%n%{$reset_color%} on %{$fg[red]%}%M%{$reset_color%} in %{$fg[blue]%}%~%b%{$reset_color%}$(git_time_since_commit)$(check_git_prompt_info) +$ ' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})" + +# Text to display if the branch is dirty +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" + +# Text to display if the branch is clean +ZSH_THEME_GIT_PROMPT_CLEAN="" + +# Colors vary depending on time lapsed. +ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}" +ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}" +ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}" +ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}" + + +# Git sometimes goes into a detached head state. git_prompt_info doesn't +# return anything in this case. So wrap it in another function and check +# for an empty string. +function check_git_prompt_info() { + if git rev-parse --git-dir > /dev/null 2>&1; then + if [[ -z $(git_prompt_info) ]]; then + echo "%{$fg[magenta]%}detached-head%{$reset_color%})" + else + echo "$(git_prompt_info)" + fi + fi +} + +# Determine if we are using a gemset. +function rvm_gemset() { + if hash rvm 2>/dev/null; then + GEMSET=`rvm gemset list | grep '=>' | cut -b4-` + if [[ -n $GEMSET ]]; then + echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|" + fi + fi +} + +# Determine the time since last commit. If branch is clean, +# use a neutral color, otherwise colors will vary according to time. +function git_time_since_commit() { + if git rev-parse --git-dir > /dev/null 2>&1; then + # Only proceed if there is actually a commit. + if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then + # Get the last commit. + last_commit=`git log --pretty=format:'%at' -1 2> /dev/null` + now=`date +%s` + seconds_since_last_commit=$((now-last_commit)) + + # Totals + MINUTES=$((seconds_since_last_commit / 60)) + HOURS=$((seconds_since_last_commit/3600)) + + # Sub-hours and sub-minutes + DAYS=$((seconds_since_last_commit / 86400)) + SUB_HOURS=$((HOURS % 24)) + SUB_MINUTES=$((MINUTES % 60)) + + if [[ -n $(git status -s 2> /dev/null) ]]; then + if [ "$MINUTES" -gt 30 ]; then + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG" + elif [ "$MINUTES" -gt 10 ]; then + COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM" + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT" + fi + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL" + fi + + if [ "$HOURS" -gt 24 ]; then + echo "($(rvm_gemset)$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|" + elif [ "$MINUTES" -gt 60 ]; then + echo "($(rvm_gemset)$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|" + else + echo "($(rvm_gemset)$COLOR${MINUTES}m%{$reset_color%}|" + fi + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL" + echo "($(rvm_gemset)$COLOR~|" + fi + fi +} diff --git a/.oh-my-zsh/themes/adben.zsh-theme b/.oh-my-zsh/themes/adben.zsh-theme new file mode 100644 index 0000000..e4774cf --- /dev/null +++ b/.oh-my-zsh/themes/adben.zsh-theme @@ -0,0 +1,114 @@ +#!/usr/bin/env zsh +# # +# # #README +# # +# # This theme provides two customizable header functionalities: +# # a) displaying a pseudo-random message from a database of quotations +# # (https://en.wikipedia.org/wiki/Fortune_%28Unix%29) +# # b) displaying randomly command line tips from The command line fu +# # (http://www.commandlinefu.com) community: in order to make use of this functionality +# # you will need Internet connection. +# # This theme provides as well information for the current user's context, like; +# # branch and status for the current version control system (git and svn currently +# # supported) and time, presented to the user in a non invasive volatile way. +# # +# # #REQUIREMENTS +# # This theme requires wget:: +# # -Homebrew-osx- brew install wget +# # -Debian/Ubuntu- apt-get install wget +# # and fortune :: +# # -Homebrew-osx- brew install fortune +# # -Debian/Ubuntu- apt-get install fortune +# # +# # optionally: +# # -Oh-myzsh vcs plug-ins git and svn. +# # -Solarized theme (https://github.com/altercation/solarized/) +# # -OS X: iTerm 2 (http://www.iterm2.com/) +# # -font Source code pro (https://github.com/adobe/source-code-pro) +# # +# # This theme's look and feel is based on the Aaron Toponce's zsh theme, more info: +# # http://pthree.org/2008/11/23/727/ +# # enjoy! +########## COLOR ########### +for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do + eval PR_$COLOR='%{$fg[${(L)COLOR}]%}' + eval PR_BRIGHT_$COLOR='%{$fg_bold[${(L)COLOR}]%}' +done +PR_RESET="%{$reset_color%}" +RED_START="${PR_RESET}${PR_GREY}<${PR_RESET}${PR_RED}<${PR_BRIGHT_RED}<${PR_RESET} " +RED_END="${PR_RESET}${PR_BRIGHT_RED}>${PR_RESET}${PR_RED}>${PR_GREY}>${PR_RESET} " +GREEN_END="${PR_RESET}${PR_BRIGHT_GREEN}>${PR_RESET}${PR_GREEN}>${PR_GREY}>${PR_RESET} " +GREEN_BASE_START="${PR_RESET}${PR_GREY}>${PR_RESET}${PR_GREEN}>${PR_BRIGHT_GREEN}>${PR_RESET}" +GREEN_START_P1="${PR_RESET}${GREEN_BASE_START}${PR_RESET} " +DIVISION="${PR_RESET}${PR_RED} < ${PR_RESET}" +VCS_DIRTY_COLOR="${PR_RESET}${PR_YELLOW}" +VCS_CLEAN_COLOR="${PR_RESET}${PR_GREEN}" +VCS_SUFIX_COLOR="${PR_RESET}${PR_RED}› ${PR_RESET}" +# ########## COLOR ########### +# ########## SVN ########### +ZSH_THEME_SVN_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹svn:" +ZSH_THEME_SVN_PROMPT_SUFFIX="" +ZSH_THEME_SVN_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}" +ZSH_THEME_SVN_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔${VCS_SUFIX_COLOR}" +# ########## SVN ########### +# ########## GIT ########### +ZSH_THEME_GIT_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹git:" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}" +ZSH_THEME_GIT_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔${VCS_SUFIX_COLOR}" +ZSH_THEME_GIT_PROMPT_ADDED="${PR_RESET}${PR_YELLOW} ✚${PR_RESET}" +ZSH_THEME_GIT_PROMPT_MODIFIED="${PR_RESET}${PR_YELLOW} ✹${PR_RESET}" +ZSH_THEME_GIT_PROMPT_DELETED="${PR_RESET}${PR_YELLOW} ✖${PR_RESET}" +ZSH_THEME_GIT_PROMPT_RENAMED="${PR_RESET}${PR_YELLOW} ➜${PR_RESET}" +ZSH_THEME_GIT_PROMPT_UNMERGED="${PR_RESET}${PR_YELLOW} ═${PR_RESET}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="${PR_RESET}${PR_YELLOW} ✭${PR_RESET}" +# ########## GIT ########### +function precmd { + #gets the fortune + ps1_fortune () { + #Choose from all databases, regardless of whether they are considered "offensive" + fortune -a + } + #obtains the tip + ps1_command_tip () { + wget -qO - http://www.commandlinefu.com/commands/random/plaintext | sed 1d | sed '/^$/d' + } + prompt_header () { + if [[ "true" == "$ENABLE_COMMAND_TIP" ]]; then + ps1_command_tip + else + ps1_fortune + fi + } + PROMPT_HEAD="${RED_START}${PR_YELLOW}$(prompt_header)${PR_RESET}" + # set a simple variable to show when in screen + if [[ -n "${WINDOW}" ]]; then + SCREEN="" + fi +} + +# Context: user@directory or just directory +prompt_context () { + if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then + echo -n "${PR_RESET}${PR_RED}$USER@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}" + else + echo -n "${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}" + fi +} + +set_prompt () { + # required for the prompt + setopt prompt_subst + autoload zsh/terminfo + + # ######### PROMPT ######### + PROMPT='${PROMPT_HEAD} +${RED_START}$(prompt_context) +${GREEN_START_P1}' + RPROMPT='${PR_RESET}$(git_prompt_info)$(svn_prompt_info)${PR_YELLOW}%D{%R.%S %a %b %d %Y} ${GREEN_END}${PR_RESET}' + # Matching continuation prompt + PROMPT2='${GREEN_BASE_START}${PR_RESET} %_ ${GREEN_BASE_START}${PR_RESET} ' + # ######### PROMPT ######### +} + +set_prompt diff --git a/.oh-my-zsh/themes/af-magic.zsh-theme b/.oh-my-zsh/themes/af-magic.zsh-theme new file mode 100644 index 0000000..1c6d173 --- /dev/null +++ b/.oh-my-zsh/themes/af-magic.zsh-theme @@ -0,0 +1,33 @@ +# af-magic.zsh-theme +# Repo: https://github.com/andyfleming/oh-my-zsh +# Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme + +if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +# primary prompt +PROMPT='$FG[237]------------------------------------------------------------%{$reset_color%} +$FG[032]%~\ +$(git_prompt_info) \ +$FG[105]%(!.#.»)%{$reset_color%} ' +PROMPT2='%{$fg[red]%}\ %{$reset_color%}' +RPS1='${return_code}' + + +# color vars +eval my_gray='$FG[237]' +eval my_orange='$FG[214]' + +# right prompt +if type "virtualenv_prompt_info" > /dev/null +then + RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%' +else + RPROMPT='$my_gray%n@%m%{$reset_color%}%' +fi + +# git settings +ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075]($FG[078]" +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}" diff --git a/.oh-my-zsh/themes/afowler.zsh-theme b/.oh-my-zsh/themes/afowler.zsh-theme new file mode 100644 index 0000000..3a4753f --- /dev/null +++ b/.oh-my-zsh/themes/afowler.zsh-theme @@ -0,0 +1,10 @@ +if [ $UID -eq 0 ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi + +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +PROMPT='%m %{${fg_bold[blue]}%}:: %{$reset_color%}%{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}»%{${reset_color}%} ' + +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" diff --git a/.oh-my-zsh/themes/agnoster.zsh-theme b/.oh-my-zsh/themes/agnoster.zsh-theme new file mode 100644 index 0000000..07546fd --- /dev/null +++ b/.oh-my-zsh/themes/agnoster.zsh-theme @@ -0,0 +1,228 @@ +# vim:ft=zsh ts=2 sw=2 sts=2 +# +# agnoster's Theme - https://gist.github.com/3712874 +# A Powerline-inspired theme for ZSH +# +# # README +# +# In order for this theme to render correctly, you will need a +# [Powerline-patched font](https://github.com/Lokaltog/powerline-fonts). +# Make sure you have a recent version: the code points that Powerline +# uses changed in 2012, and older versions will display incorrectly, +# in confusing ways. +# +# In addition, I recommend the +# [Solarized theme](https://github.com/altercation/solarized/) and, if you're +# using it on Mac OS X, [iTerm 2](http://www.iterm2.com/) over Terminal.app - +# it has significantly better color fidelity. +# +# # Goals +# +# The aim of this theme is to only show you *relevant* information. Like most +# prompts, it will only show git information when in a git working directory. +# However, it goes a step further: everything from the current user and +# hostname to whether the last call exited with an error to whether background +# jobs are running in this shell will all be displayed automatically when +# appropriate. + +### Segment drawing +# A few utility functions to make it easy and re-usable to draw segmented prompts + +CURRENT_BG='NONE' + +# Special Powerline characters + +() { + local LC_ALL="" LC_CTYPE="en_US.UTF-8" + # NOTE: This segment separator character is correct. In 2012, Powerline changed + # the code points they use for their special characters. This is the new code point. + # If this is not working for you, you probably have an old version of the + # Powerline-patched fonts installed. Download and install the new version. + # Do not submit PRs to change this unless you have reviewed the Powerline code point + # history and have new information. + # This is defined using a Unicode escape sequence so it is unambiguously readable, regardless of + # what font the user is viewing this source code in. Do not replace the + # escape sequence with a single literal character. + # Do not change this! Do not make it '\u2b80'; that is the old, wrong code point. + SEGMENT_SEPARATOR=$'\ue0b0' +} + +# Begin a segment +# Takes two arguments, background and foreground. Both can be omitted, +# rendering default background/foreground. +prompt_segment() { + local bg fg + [[ -n $1 ]] && bg="%K{$1}" || bg="%k" + [[ -n $2 ]] && fg="%F{$2}" || fg="%f" + if [[ $CURRENT_BG != 'NONE' && $1 != $CURRENT_BG ]]; then + echo -n " %{$bg%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{$fg%} " + else + echo -n "%{$bg%}%{$fg%} " + fi + CURRENT_BG=$1 + [[ -n $3 ]] && echo -n $3 +} + +# End the prompt, closing any open segments +prompt_end() { + if [[ -n $CURRENT_BG ]]; then + echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR" + else + echo -n "%{%k%}" + fi + echo -n "%{%f%}" + CURRENT_BG='' +} + +### Prompt components +# Each component will draw itself, and hide itself if no information needs to be shown + +# Context: user@hostname (who am I and where am I) +prompt_context() { + if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then + prompt_segment black default "%(!.%{%F{yellow}%}.)$USER@%m" + fi +} + +# Git: branch/detached head, dirty status +prompt_git() { + (( $+commands[git] )) || return + local PL_BRANCH_CHAR + () { + local LC_ALL="" LC_CTYPE="en_US.UTF-8" + PL_BRANCH_CHAR=$'\ue0a0' #  + } + local ref dirty mode repo_path + repo_path=$(git rev-parse --git-dir 2>/dev/null) + + if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then + dirty=$(parse_git_dirty) + ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git rev-parse --short HEAD 2> /dev/null)" + if [[ -n $dirty ]]; then + prompt_segment yellow black + else + prompt_segment green black + fi + + if [[ -e "${repo_path}/BISECT_LOG" ]]; then + mode=" " + elif [[ -e "${repo_path}/MERGE_HEAD" ]]; then + mode=" >M<" + elif [[ -e "${repo_path}/rebase" || -e "${repo_path}/rebase-apply" || -e "${repo_path}/rebase-merge" || -e "${repo_path}/../.dotest" ]]; then + mode=" >R>" + fi + + setopt promptsubst + autoload -Uz vcs_info + + zstyle ':vcs_info:*' enable git + zstyle ':vcs_info:*' get-revision true + zstyle ':vcs_info:*' check-for-changes true + zstyle ':vcs_info:*' stagedstr '✚' + zstyle ':vcs_info:*' unstagedstr '●' + zstyle ':vcs_info:*' formats ' %u%c' + zstyle ':vcs_info:*' actionformats ' %u%c' + vcs_info + echo -n "${ref/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}" + fi +} + +prompt_bzr() { + (( $+commands[bzr] )) || return + if (bzr status >/dev/null 2>&1); then + status_mod=`bzr status | head -n1 | grep "modified" | wc -m` + status_all=`bzr status | head -n1 | wc -m` + revision=`bzr log | head -n2 | tail -n1 | sed 's/^revno: //'` + if [[ $status_mod -gt 0 ]] ; then + prompt_segment yellow black + echo -n "bzr@"$revision "✚ " + else + if [[ $status_all -gt 0 ]] ; then + prompt_segment yellow black + echo -n "bzr@"$revision + + else + prompt_segment green black + echo -n "bzr@"$revision + fi + fi + fi +} + +prompt_hg() { + (( $+commands[hg] )) || return + local rev status + if $(hg id >/dev/null 2>&1); then + if $(hg prompt >/dev/null 2>&1); then + if [[ $(hg prompt "{status|unknown}") = "?" ]]; then + # if files are not added + prompt_segment red white + st='±' + elif [[ -n $(hg prompt "{status|modified}") ]]; then + # if any modification + prompt_segment yellow black + st='±' + else + # if working copy is clean + prompt_segment green black + fi + echo -n $(hg prompt "☿ {rev}@{branch}") $st + else + st="" + rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g') + branch=$(hg id -b 2>/dev/null) + if `hg st | grep -q "^\?"`; then + prompt_segment red black + st='±' + elif `hg st | grep -q "^[MA]"`; then + prompt_segment yellow black + st='±' + else + prompt_segment green black + fi + echo -n "☿ $rev@$branch" $st + fi + fi +} + +# Dir: current working directory +prompt_dir() { + prompt_segment blue black '%~' +} + +# Virtualenv: current working virtualenv +prompt_virtualenv() { + local virtualenv_path="$VIRTUAL_ENV" + if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then + prompt_segment blue black "(`basename $virtualenv_path`)" + fi +} + +# Status: +# - was there an error +# - am I root +# - are there background jobs? +prompt_status() { + local symbols + symbols=() + [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘" + [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡" + [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙" + + [[ -n "$symbols" ]] && prompt_segment black default "$symbols" +} + +## Main prompt +build_prompt() { + RETVAL=$? + prompt_status + prompt_virtualenv + prompt_context + prompt_dir + prompt_git + prompt_bzr + prompt_hg + prompt_end +} + +PROMPT='%{%f%b%k%}$(build_prompt) ' diff --git a/.oh-my-zsh/themes/alanpeabody.zsh-theme b/.oh-my-zsh/themes/alanpeabody.zsh-theme new file mode 100644 index 0000000..4a1b1b3 --- /dev/null +++ b/.oh-my-zsh/themes/alanpeabody.zsh-theme @@ -0,0 +1,28 @@ + +local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}' +local pwd='%{$fg[blue]%}%~%{$reset_color%}' +local rvm='' +if which rvm-prompt &> /dev/null; then + rvm='%{$fg[green]%}‹$(rvm-prompt i v g)›%{$reset_color%}' +else + if which rbenv &> /dev/null; then + rvm='%{$fg[green]%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}' + fi +fi +local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})' +local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹" +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" + +PROMPT="${user} ${pwd}$ " +RPROMPT="${return_code} ${git_branch} ${rvm}" diff --git a/.oh-my-zsh/themes/amuse.zsh-theme b/.oh-my-zsh/themes/amuse.zsh-theme new file mode 100644 index 0000000..4e7361c --- /dev/null +++ b/.oh-my-zsh/themes/amuse.zsh-theme @@ -0,0 +1,29 @@ +# vim:ft=zsh ts=2 sw=2 sts=2 + +rvm_current() { + rvm current 2>/dev/null +} + +rbenv_version() { + rbenv version 2>/dev/null | awk '{print $1}' +} + +PROMPT=' +%{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) ⌚ %{$fg_bold[red]%}%*%{$reset_color%} +$ ' + +# Must use Powerline font, for \uE0A0 to render. +ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}\uE0A0 " +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +if [ -e ~/.rvm/bin/rvm-prompt ]; then + RPROMPT='%{$fg_bold[red]%}‹$(rvm_current)›%{$reset_color%}' +else + if which rbenv &> /dev/null; then + RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}' + fi +fi + diff --git a/.oh-my-zsh/themes/apple.zsh-theme b/.oh-my-zsh/themes/apple.zsh-theme new file mode 100644 index 0000000..95e6249 --- /dev/null +++ b/.oh-my-zsh/themes/apple.zsh-theme @@ -0,0 +1,28 @@ +function toon { + echo -n "" +} + +get_git_dirty() { + git diff --quiet || echo '*' +} + +autoload -Uz vcs_info +zstyle ':vcs_info:*' check-for-changes true +zstyle ':vcs_info:*' unstagedstr '%F{red}*' # display this when there are unstaged changes +zstyle ':vcs_info:*' stagedstr '%F{yellow}+' # display this when there are staged changes +zstyle ':vcs_info:*' actionformats \ + '%F{5}%F{5}[%F{2}%b%F{3}|%F{1}%a%c%u%F{5}]%f ' +zstyle ':vcs_info:*' formats \ + '%F{5}%F{5}[%F{2}%b%c%u%F{5}]%f ' +zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r' +zstyle ':vcs_info:*' enable git cvs svn + +theme_precmd () { + vcs_info +} + +setopt prompt_subst +PROMPT='%{$fg[magenta]%}$(toon)%{$reset_color%} %~/ %{$reset_color%}${vcs_info_msg_0_}%{$reset_color%}' + +autoload -U add-zsh-hook +add-zsh-hook precmd theme_precmd \ No newline at end of file diff --git a/.oh-my-zsh/themes/arrow.zsh-theme b/.oh-my-zsh/themes/arrow.zsh-theme new file mode 100644 index 0000000..d62dcdc --- /dev/null +++ b/.oh-my-zsh/themes/arrow.zsh-theme @@ -0,0 +1,14 @@ +if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="yellow"; fi + +PROMPT='%{$fg[$NCOLOR]%}%c ➤ %{$reset_color%}' +RPROMPT='%{$fg[$NCOLOR]%}%p $(git_prompt_info)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="git:" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY="*" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +# See http://geoff.greer.fm/lscolors/ +export LSCOLORS="exfxcxdxbxbxbxbxbxbxbx" +export LS_COLORS="di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=31;40:cd=31;40:su=31;40:sg=31;40:tw=31;40:ow=31;40:" + diff --git a/.oh-my-zsh/themes/aussiegeek.zsh-theme b/.oh-my-zsh/themes/aussiegeek.zsh-theme new file mode 100644 index 0000000..c2c7f65 --- /dev/null +++ b/.oh-my-zsh/themes/aussiegeek.zsh-theme @@ -0,0 +1,8 @@ + +PROMPT='$fg_bold[blue][ $fg[red]%t $fg_bold[blue]] $fg_bold[blue] [ $fg[red]%n@%m:%~$(git_prompt_info)$fg[yellow]$(rvm_prompt_info)$fg_bold[blue] ]$reset_color + $ ' +# git theming +ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[green](" +ZSH_THEME_GIT_PROMPT_SUFFIX=")" +ZSH_THEME_GIT_PROMPT_CLEAN="✔" +ZSH_THEME_GIT_PROMPT_DIRTY="✗" diff --git a/.oh-my-zsh/themes/avit.zsh-theme b/.oh-my-zsh/themes/avit.zsh-theme new file mode 100644 index 0000000..4f0dcbc --- /dev/null +++ b/.oh-my-zsh/themes/avit.zsh-theme @@ -0,0 +1,110 @@ +# AVIT ZSH Theme + +PROMPT=' +$(_user_host)${_current_dir} $(git_prompt_info) $(_ruby_version) +%{$fg[$CARETCOLOR]%}▶%{$resetcolor%} ' + +PROMPT2='%{$fg[$CARETCOLOR]%}◀%{$reset_color%} ' + +RPROMPT='$(_vi_status)%{$(echotc UP 1)%}$(_git_time_since_commit) $(git_prompt_status) ${_return_status}%{$(echotc DO 1)%}' + +local _current_dir="%{$fg_bold[blue]%}%3~%{$reset_color%} " +local _return_status="%{$fg_bold[red]%}%(?..⍉)%{$reset_color%}" +local _hist_no="%{$fg[grey]%}%h%{$reset_color%}" + +function _current_dir() { + local _max_pwd_length="65" + if [[ $(echo -n $PWD | wc -c) -gt ${_max_pwd_length} ]]; then + echo "%{$fg_bold[blue]%}%-2~ ... %3~%{$reset_color%} " + else + echo "%{$fg_bold[blue]%}%~%{$reset_color%} " + fi +} + +function _user_host() { + if [[ -n $SSH_CONNECTION ]]; then + me="%n@%m" + elif [[ $LOGNAME != $USER ]]; then + me="%n" + fi + if [[ -n $me ]]; then + echo "%{$fg[cyan]%}$me%{$reset_color%}:" + fi +} + +function _vi_status() { + if {echo $fpath | grep -q "plugins/vi-mode"}; then + echo "$(vi_mode_prompt_info)" + fi +} + +function _ruby_version() { + if {echo $fpath | grep -q "plugins/rvm"}; then + echo "%{$fg[grey]%}$(rvm_prompt_info)%{$reset_color%}" + elif {echo $fpath | grep -q "plugins/rbenv"}; then + echo "%{$fg[grey]%}$(rbenv_prompt_info)%{$reset_color%}" + fi +} + +# Determine the time since last commit. If branch is clean, +# use a neutral color, otherwise colors will vary according to time. +function _git_time_since_commit() { +# Only proceed if there is actually a commit. + if git log -1 > /dev/null 2>&1; then + # Get the last commit. + last_commit=$(git log --pretty=format:'%at' -1 2> /dev/null) + now=$(date +%s) + seconds_since_last_commit=$((now-last_commit)) + + # Totals + minutes=$((seconds_since_last_commit / 60)) + hours=$((seconds_since_last_commit/3600)) + + # Sub-hours and sub-minutes + days=$((seconds_since_last_commit / 86400)) + sub_hours=$((hours % 24)) + sub_minutes=$((minutes % 60)) + + if [ $hours -gt 24 ]; then + commit_age="${days}d" + elif [ $minutes -gt 60 ]; then + commit_age="${sub_hours}h${sub_minutes}m" + else + commit_age="${minutes}m" + fi + + color=$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL + echo "$color$commit_age%{$reset_color%}" + fi +} + +if [[ $USER == "root" ]]; then + CARETCOLOR="red" +else + CARETCOLOR="white" +fi + +MODE_INDICATOR="%{$fg_bold[yellow]%}❮%{$reset_color%}%{$fg[yellow]%}❮❮%{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}✚ " +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%}⚑ " +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✖ " +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}▴ " +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[cyan]%}§ " +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[white]%}◒ " + +# Colors vary depending on time lapsed. +ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}" +ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}" +ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}" +ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[white]%}" + +# LS colors, made with http://geoff.greer.fm/lscolors/ +export LSCOLORS="exfxcxdxbxegedabagacad" +export LS_COLORS='di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:' +export GREP_COLOR='1;33' diff --git a/.oh-my-zsh/themes/awesomepanda.zsh-theme b/.oh-my-zsh/themes/awesomepanda.zsh-theme new file mode 100644 index 0000000..1c5d06b --- /dev/null +++ b/.oh-my-zsh/themes/awesomepanda.zsh-theme @@ -0,0 +1,16 @@ +# the svn plugin has to be activated for this to work. +local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)" +PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}$(svn_prompt_info)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[yellow]%} ✗ %{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}) " + +ZSH_PROMPT_BASE_COLOR="%{$fg_bold[blue]%}" +ZSH_THEME_REPO_NAME_COLOR="%{$fg_bold[red]%}" + +ZSH_THEME_SVN_PROMPT_PREFIX="svn:(" +ZSH_THEME_SVN_PROMPT_SUFFIX=")" +ZSH_THEME_SVN_PROMPT_DIRTY="%{$fg[red]%} ✘ %{$reset_color%}" +ZSH_THEME_SVN_PROMPT_CLEAN=" " diff --git a/.oh-my-zsh/themes/bira.zsh-theme b/.oh-my-zsh/themes/bira.zsh-theme new file mode 100644 index 0000000..29bda0b --- /dev/null +++ b/.oh-my-zsh/themes/bira.zsh-theme @@ -0,0 +1,30 @@ +# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + + +if [[ $UID -eq 0 ]]; then + local user_host='%{$terminfo[bold]$fg[red]%}%n@%m%{$reset_color%}' + local user_symbol='#' +else + local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}' + local user_symbol='$' +fi + +local current_dir='%{$terminfo[bold]$fg[blue]%}%~%{$reset_color%}' +local rvm_ruby='' +if which rvm-prompt &> /dev/null; then + rvm_ruby='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$reset_color%}' +else + if which rbenv &> /dev/null; then + rvm_ruby='%{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}' + fi +fi +local git_branch='$(git_prompt_info)%{$reset_color%}' + +PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch} +╰─%B${user_symbol}%b " +RPS1="%B${return_code}%b" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" + diff --git a/.oh-my-zsh/themes/blinks.zsh-theme b/.oh-my-zsh/themes/blinks.zsh-theme new file mode 100644 index 0000000..ddb32f7 --- /dev/null +++ b/.oh-my-zsh/themes/blinks.zsh-theme @@ -0,0 +1,30 @@ +# https://github.com/blinks zsh theme + +function _prompt_char() { + if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then + echo "%{%F{blue}%}±%{%f%k%b%}" + else + echo ' ' + fi +} + +# This theme works with both the "dark" and "light" variants of the +# Solarized color schema. Set the SOLARIZED_THEME variable to one of +# these two values to choose. If you don't specify, we'll assume you're +# using the "dark" variant. + +case ${SOLARIZED_THEME:-dark} in + light) bkg=white;; + *) bkg=black;; +esac + +ZSH_THEME_GIT_PROMPT_PREFIX=" [%{%B%F{blue}%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{%f%k%b%K{${bkg}}%B%F{green}%}]" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{%F{red}%}*%{%f%k%b%}" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +PROMPT='%{%f%k%b%} +%{%K{${bkg}}%B%F{green}%}%n%{%B%F{blue}%}@%{%B%F{cyan}%}%m%{%B%F{green}%} %{%b%F{yellow}%K{${bkg}}%}%~%{%B%F{green}%}$(git_prompt_info)%E%{%f%k%b%} +%{%K{${bkg}}%}$(_prompt_char)%{%K{${bkg}}%} %#%{%f%k%b%} ' + +RPROMPT='!%{%B%F{cyan}%}%!%{%f%k%b%}' diff --git a/.oh-my-zsh/themes/bureau.zsh-theme b/.oh-my-zsh/themes/bureau.zsh-theme new file mode 100644 index 0000000..3b3bdc8 --- /dev/null +++ b/.oh-my-zsh/themes/bureau.zsh-theme @@ -0,0 +1,123 @@ +# oh-my-zsh Bureau Theme + +### NVM + +ZSH_THEME_NVM_PROMPT_PREFIX="%B⬡%b " +ZSH_THEME_NVM_PROMPT_SUFFIX="" + +### Git [±master ▾●] + +ZSH_THEME_GIT_PROMPT_PREFIX="[%{$fg_bold[green]%}±%{$reset_color%}%{$fg_bold[white]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}]" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✓%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[cyan]%}▴%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[magenta]%}▾%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[yellow]%}●%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}" + +bureau_git_branch () { + ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ + ref=$(command git rev-parse --short HEAD 2> /dev/null) || return + echo "${ref#refs/heads/}" +} + +bureau_git_status() { + _STATUS="" + + # check status of files + _INDEX=$(command git status --porcelain 2> /dev/null) + if [[ -n "$_INDEX" ]]; then + if $(echo "$_INDEX" | command grep -q '^[AMRD]. '); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED" + fi + if $(echo "$_INDEX" | command grep -q '^.[MTD] '); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED" + fi + if $(echo "$_INDEX" | command grep -q -E '^\?\? '); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED" + fi + if $(echo "$_INDEX" | command grep -q '^UU '); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED" + fi + else + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_CLEAN" + fi + + # check status of local repository + _INDEX=$(command git status --porcelain -b 2> /dev/null) + if $(echo "$_INDEX" | command grep -q '^## .*ahead'); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD" + fi + if $(echo "$_INDEX" | command grep -q '^## .*behind'); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND" + fi + if $(echo "$_INDEX" | command grep -q '^## .*diverged'); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED" + fi + + if $(command git rev-parse --verify refs/stash &> /dev/null); then + _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED" + fi + + echo $_STATUS +} + +bureau_git_prompt () { + local _branch=$(bureau_git_branch) + local _status=$(bureau_git_status) + local _result="" + if [[ "${_branch}x" != "x" ]]; then + _result="$ZSH_THEME_GIT_PROMPT_PREFIX$_branch" + if [[ "${_status}x" != "x" ]]; then + _result="$_result $_status" + fi + _result="$_result$ZSH_THEME_GIT_PROMPT_SUFFIX" + fi + echo $_result +} + + +_PATH="%{$fg_bold[white]%}%~%{$reset_color%}" + +if [[ $EUID -eq 0 ]]; then + _USERNAME="%{$fg_bold[red]%}%n" + _LIBERTY="%{$fg[red]%}#" +else + _USERNAME="%{$fg_bold[white]%}%n" + _LIBERTY="%{$fg[green]%}$" +fi +_USERNAME="$_USERNAME%{$reset_color%}@%m" +_LIBERTY="$_LIBERTY%{$reset_color%}" + + +get_space () { + local STR=$1$2 + local zero='%([BSUbfksu]|([FB]|){*})' + local LENGTH=${#${(S%%)STR//$~zero/}} + local SPACES="" + (( LENGTH = ${COLUMNS} - $LENGTH - 1)) + + for i in {0..$LENGTH} + do + SPACES="$SPACES " + done + + echo $SPACES +} + +_1LEFT="$_USERNAME $_PATH" +_1RIGHT="[%*] " + +bureau_precmd () { + _1SPACES=`get_space $_1LEFT $_1RIGHT` + print + print -rP "$_1LEFT$_1SPACES$_1RIGHT" +} + +setopt prompt_subst +PROMPT='> $_LIBERTY ' +RPROMPT='$(nvm_prompt_info) $(bureau_git_prompt)' + +autoload -U add-zsh-hook +add-zsh-hook precmd bureau_precmd diff --git a/.oh-my-zsh/themes/candy-kingdom.zsh-theme b/.oh-my-zsh/themes/candy-kingdom.zsh-theme new file mode 100644 index 0000000..9d21039 --- /dev/null +++ b/.oh-my-zsh/themes/candy-kingdom.zsh-theme @@ -0,0 +1,30 @@ +# neuralsanwich.zsh-theme + +if [ "x$OH_MY_ZSH_HG" = "x" ]; then + OH_MY_ZSH_HG="hg" +fi + +function hg_prompt_info { + $OH_MY_ZSH_HG prompt --angle-brackets "\ +< on %{$fg[magenta]%}%{$reset_color%}>\ +< at %{$fg[yellow]%}%{$reset_color%}>\ +%{$fg[green]%}%{$reset_color%}< +patches: >" 2>/dev/null +} + +function box_name { + [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST} +} + +PROMPT=' +%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}$(box_name)%{$reset_color%}:%{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(hg_prompt_info)$(git_prompt_info) +%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )$ ' + +ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[magenta]%}branch: " +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[red]%}?" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[orange]%}!" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})" + +local return_status="%{$fg[red]%}%(?..✘)%{$reset_color%}" +RPROMPT='${return_status}$(battery_time_remaining) $(battery_pct_prompt)%{$reset_color%}' diff --git a/.oh-my-zsh/themes/candy.zsh-theme b/.oh-my-zsh/themes/candy.zsh-theme new file mode 100644 index 0000000..40e6d41 --- /dev/null +++ b/.oh-my-zsh/themes/candy.zsh-theme @@ -0,0 +1,7 @@ +PROMPT=$'%{$fg_bold[green]%}%n@%m %{$fg[blue]%}%D{[%X]} %{$reset_color%}%{$fg[white]%}[%~]%{$reset_color%} $(git_prompt_info)\ +%{$fg[blue]%}->%{$fg_bold[blue]%} %#%{$reset_color%} ' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[" +ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}" +ZSH_THEME_GIT_PROMPT_CLEAN="" diff --git a/.oh-my-zsh/themes/clean.zsh-theme b/.oh-my-zsh/themes/clean.zsh-theme new file mode 100644 index 0000000..7ee29cb --- /dev/null +++ b/.oh-my-zsh/themes/clean.zsh-theme @@ -0,0 +1,14 @@ +if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="white"; fi + +PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) ' +RPROMPT='[%*]' + +# git theming +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[yellow]%}%B" +ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✗" + +# LS colors, made with http://geoff.greer.fm/lscolors/ +export LSCOLORS="Gxfxcxdxbxegedabagacad" +export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' diff --git a/.oh-my-zsh/themes/cloud.zsh-theme b/.oh-my-zsh/themes/cloud.zsh-theme new file mode 100644 index 0000000..4efbf97 --- /dev/null +++ b/.oh-my-zsh/themes/cloud.zsh-theme @@ -0,0 +1,10 @@ +if [[ -z $ZSH_THEME_CLOUD_PREFIX ]]; then + ZSH_THEME_CLOUD_PREFIX='☁' +fi + +PROMPT='%{$fg_bold[cyan]%}$ZSH_THEME_CLOUD_PREFIX %{$fg_bold[green]%}%p %{$fg[green]%}%c %{$fg_bold[cyan]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$fg[cyan]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}] %{$fg[yellow]%}⚡%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}]" \ No newline at end of file diff --git a/.oh-my-zsh/themes/crcandy.zsh-theme b/.oh-my-zsh/themes/crcandy.zsh-theme new file mode 100644 index 0000000..0a63c12 --- /dev/null +++ b/.oh-my-zsh/themes/crcandy.zsh-theme @@ -0,0 +1,8 @@ +PROMPT=$' +%{$fg_bold[green]%}%n@%m %{$fg[blue]%}%D{[%I:%M:%S]} %{$reset_color%}%{$fg[white]%}[%~]%{$reset_color%} $(git_prompt_info)\ +%{$fg[blue]%}->%{$fg_bold[blue]%} %#%{$reset_color%} ' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[" +ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}" +ZSH_THEME_GIT_PROMPT_CLEAN="" diff --git a/.oh-my-zsh/themes/crunch.zsh-theme b/.oh-my-zsh/themes/crunch.zsh-theme new file mode 100644 index 0000000..2fc0663 --- /dev/null +++ b/.oh-my-zsh/themes/crunch.zsh-theme @@ -0,0 +1,43 @@ +# CRUNCH - created from Steve Eley's cat waxing. +# Initially hacked from the Dallas theme. Thanks, Dallas Reedy. +# +# This theme assumes you do most of your oh-my-zsh'ed "colorful" work at a single machine, +# and eschews the standard space-consuming user and hostname info. Instead, only the +# things that vary in my own workflow are shown: +# +# * The time (not the date) +# * The RVM version and gemset (omitting the 'ruby' name if it's MRI) +# * The current directory +# * The Git branch and its 'dirty' state +# +# Colors are at the top so you can mess with those separately if you like. +# For the most part I stuck with Dallas's. + +CRUNCH_BRACKET_COLOR="%{$fg[white]%}" +CRUNCH_TIME_COLOR="%{$fg[yellow]%}" +CRUNCH_RVM_COLOR="%{$fg[magenta]%}" +CRUNCH_DIR_COLOR="%{$fg[cyan]%}" +CRUNCH_GIT_BRANCH_COLOR="%{$fg[green]%}" +CRUNCH_GIT_CLEAN_COLOR="%{$fg[green]%}" +CRUNCH_GIT_DIRTY_COLOR="%{$fg[red]%}" + +# These Git variables are used by the oh-my-zsh git_prompt_info helper: +ZSH_THEME_GIT_PROMPT_PREFIX="$CRUNCH_BRACKET_COLOR:$CRUNCH_GIT_BRANCH_COLOR" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_CLEAN=" $CRUNCH_GIT_CLEAN_COLOR✓" +ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗" + +# Our elements: +CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%{$reset_color%}" +if [ -e ~/.rvm/bin/rvm-prompt ]; then + CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(~/.rvm/bin/rvm-prompt i v g)#ruby-}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}" +else + if which rbenv &> /dev/null; then + CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(rbenv version | sed -e 's/ (set.*$//' -e 's/^ruby-//')}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}" + fi +fi +CRUNCH_DIR_="$CRUNCH_DIR_COLOR%~\$(git_prompt_info) " +CRUNCH_PROMPT="$CRUNCH_BRACKET_COLOR➭ " + +# Put it all together! +PROMPT="$CRUNCH_TIME_$CRUNCH_RVM_$CRUNCH_DIR_$CRUNCH_PROMPT%{$reset_color%}" diff --git a/.oh-my-zsh/themes/cypher.zsh-theme b/.oh-my-zsh/themes/cypher.zsh-theme new file mode 100644 index 0000000..6e6b78e --- /dev/null +++ b/.oh-my-zsh/themes/cypher.zsh-theme @@ -0,0 +1,4 @@ +# Based on evan's prompt +# Shows the exit status of the last command if non-zero +# Uses "#" instead of "»" when running with elevated privileges +PROMPT="%m %{${fg_bold[red]}%}:: %{${fg[green]}%}%3~%(0?. . %{${fg[red]}%}%? )%{${fg[blue]}%}»%{${reset_color}%} " diff --git a/.oh-my-zsh/themes/dallas.zsh-theme b/.oh-my-zsh/themes/dallas.zsh-theme new file mode 100644 index 0000000..e9e8617 --- /dev/null +++ b/.oh-my-zsh/themes/dallas.zsh-theme @@ -0,0 +1,32 @@ +# Personalized! + +# Grab the current date (%D) and time (%T) wrapped in {}: {%D %T} +DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}" +# Grab the current version of ruby in use (via RVM): [ruby-1.8.7] +if [ -e ~/.rvm/bin/rvm-prompt ]; then + DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}" +else + if which rbenv &> /dev/null; then + DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg[white]%}]%{$reset_color%}" + fi +fi +# Grab the current machine name: muscato +DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}" +# Grab the current filepath, use shortcuts: ~/Desktop +# Append the current git branch, if in a git repository: ~aw@master +DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}\$(parse_git_dirty)" +# Grab the current username: dallas +DALLAS_CURRENT_USER_="%{$fg[red]%}%n%{$reset_color%}" +# Use a % for normal users and a # for privelaged (root) users. +DALLAS_PROMPT_CHAR_="%{$fg[white]%}%(!.#.%%)%{$reset_color%}" +# For the git prompt, use a white @ and blue text for the branch name +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}@%{$fg[blue]%}" +# Close it all off by resetting the color and styles. +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +# Do nothing if the branch is clean (no changes). +ZSH_THEME_GIT_PROMPT_CLEAN="" +# Add 3 cyan ✗s if this branch is diiirrrty! Dirty branch! +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[cyan]%}✗✗✗" + +# Put it all together! +PROMPT="$DALLAS_CURRENT_TIME_$DALLAS_CURRENT_RUBY_$DALLAS_CURRENT_MACH_$DALLAS_CURRENT_LOCA_ $DALLAS_CURRENT_USER_$DALLAS_PROMPT_CHAR_ " diff --git a/.oh-my-zsh/themes/darkblood.zsh-theme b/.oh-my-zsh/themes/darkblood.zsh-theme new file mode 100644 index 0000000..33508fb --- /dev/null +++ b/.oh-my-zsh/themes/darkblood.zsh-theme @@ -0,0 +1,9 @@ +# meh. Dark Blood Rewind, a new beginning. + +PROMPT=$'%{$fg[red]%}┌[%{$fg_bold[white]%}%n%{$reset_color%}%{$fg[red]%}@%{$fg_bold[white]%}%m%{$reset_color%}%{$fg[red]%}] [%{$fg_bold[white]%}/dev/%y%{$reset_color%}%{$fg[red]%}] %{$(git_prompt_info)%}%(?,,%{$fg[red]%}[%{$fg_bold[white]%}%?%{$reset_color%}%{$fg[red]%}]) +%{$fg[red]%}└[%{$fg_bold[white]%}%~%{$reset_color%}%{$fg[red]%}]>%{$reset_color%} ' +PS2=$' %{$fg[red]%}|>%{$reset_color%} ' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}[%{$fg_bold[white]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}%{$fg[red]%}] " +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}⚡%{$reset_color%}" diff --git a/.oh-my-zsh/themes/daveverwer.zsh-theme b/.oh-my-zsh/themes/daveverwer.zsh-theme new file mode 100644 index 0000000..89aef92 --- /dev/null +++ b/.oh-my-zsh/themes/daveverwer.zsh-theme @@ -0,0 +1,7 @@ +# Copied and modified from the oh-my-zsh theme from geoffgarside +# Red server name, green cwd, blue git status + +PROMPT='%{$fg[red]%}%m%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) ' + +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}" diff --git a/.oh-my-zsh/themes/dieter.zsh-theme b/.oh-my-zsh/themes/dieter.zsh-theme new file mode 100644 index 0000000..58d9f88 --- /dev/null +++ b/.oh-my-zsh/themes/dieter.zsh-theme @@ -0,0 +1,56 @@ +# the idea of this theme is to contain a lot of info in a small string, by +# compressing some parts and colorcoding, which bring useful visual cues, +# while limiting the amount of colors and such to keep it easy on the eyes. +# When a command exited >0, the timestamp will be in red and the exit code +# will be on the right edge. +# The exit code visual cues will only display once. +# (i.e. they will be reset, even if you hit enter a few times on empty command prompts) + +typeset -A host_repr + +# translate hostnames into shortened, colorcoded strings +host_repr=('dieter-ws-a7n8x-arch' "%{$fg_bold[green]%}ws" 'dieter-p4sci-arch' "%{$fg_bold[blue]%}p4") + +# local time, color coded by last return code +time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}" +time_disabled="%{$fg[green]%}%*%{$reset_color%}" +time=$time_enabled + +# user part, color coded by privileges +local user="%(!.%{$fg[blue]%}.%{$fg[blue]%})%n%{$reset_color%}" + +# Hostname part. compressed and colorcoded per host_repr array +# if not found, regular hostname in default color +local host="@${host_repr[$HOST]:-$HOST}%{$reset_color%}" + +# Compacted $PWD +local pwd="%{$fg[blue]%}%c%{$reset_color%}" + +PROMPT='${time} ${user}${host} ${pwd} $(git_prompt_info)' + +# i would prefer 1 icon that shows the "most drastic" deviation from HEAD, +# but lets see how this works out +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}?%{$fg[green]%}%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}" + +# elaborate exitcode on the right when >0 +return_code_enabled="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" +return_code_disabled= +return_code=$return_code_enabled + +RPS1='${return_code}' + +function accept-line-or-clear-warning () { + if [[ -z $BUFFER ]]; then + time=$time_disabled + return_code=$return_code_disabled + else + time=$time_enabled + return_code=$return_code_enabled + fi + zle accept-line +} +zle -N accept-line-or-clear-warning +bindkey '^M' accept-line-or-clear-warning diff --git a/.oh-my-zsh/themes/dogenpunk.zsh-theme b/.oh-my-zsh/themes/dogenpunk.zsh-theme new file mode 100644 index 0000000..6a99212 --- /dev/null +++ b/.oh-my-zsh/themes/dogenpunk.zsh-theme @@ -0,0 +1,79 @@ +# dogenpunk.zsh-theme + +MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}" +local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}" + +PROMPT='%{$fg[blue]%}%m%{$reset_color%}%{$fg_bold[white]%} ॐ %{$reset_color%}%{$fg[cyan]%}%~:%{$reset_color%}$(git_time_since_commit)$(git_prompt_info) +%{$fg[red]%}%!%{$reset_color%} $(prompt_char) ' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[green]%}git%{$reset_color%}@%{$bg[white]%}%{$fg[black]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +RPROMPT='${return_status}$(git_prompt_status)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹" +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" + +function prompt_char() { + git branch >/dev/null 2>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return + hg root >/dev/null 2>/dev/null && echo "%{$fg_bold[red]%}☿%{$reset_color%}" && return + echo "%{$fg[cyan]%}◯ %{$reset_color%}" +} + +# Colors vary depending on time lapsed. +ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}" +ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}" +ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}" +ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}" + +# Determine the time since last commit. If branch is clean, +# use a neutral color, otherwise colors will vary according to time. +function git_time_since_commit() { + if git rev-parse --git-dir > /dev/null 2>&1; then + # Only proceed if there is actually a commit. + if git log -n 1 > /dev/null 2>&1; then + # Get the last commit. + last_commit=`git log --pretty=format:'%at' -1 2> /dev/null` + now=`date +%s` + seconds_since_last_commit=$((now-last_commit)) + + # Totals + MINUTES=$((seconds_since_last_commit / 60)) + HOURS=$((seconds_since_last_commit/3600)) + + # Sub-hours and sub-minutes + DAYS=$((seconds_since_last_commit / 86400)) + SUB_HOURS=$((HOURS % 24)) + SUB_MINUTES=$((MINUTES % 60)) + + if [[ -n $(git status -s 2> /dev/null) ]]; then + if [ "$MINUTES" -gt 30 ]; then + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG" + elif [ "$MINUTES" -gt 10 ]; then + COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM" + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT" + fi + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL" + fi + + if [ "$HOURS" -gt 24 ]; then + echo "($COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|" + elif [ "$MINUTES" -gt 60 ]; then + echo "($COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|" + else + echo "($COLOR${MINUTES}m%{$reset_color%}|" + fi + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL" + echo "($COLOR~|" + fi + fi +} diff --git a/.oh-my-zsh/themes/dpoggi.zsh-theme b/.oh-my-zsh/themes/dpoggi.zsh-theme new file mode 100644 index 0000000..6469a20 --- /dev/null +++ b/.oh-my-zsh/themes/dpoggi.zsh-theme @@ -0,0 +1,14 @@ +if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +PROMPT='%{$fg[$NCOLOR]%}%n%{$reset_color%}@%{$fg[cyan]%}%m\ +%{$reset_color%}:%{$fg[magenta]%}%~\ +$(git_prompt_info) \ +%{$fg[red]%}%(!.#.»)%{$reset_color%} ' +PROMPT2='%{$fg[red]%}\ %{$reset_color%}' +RPS1='${return_code}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}(" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}○%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}⚡%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%})%{$reset_color%}" diff --git a/.oh-my-zsh/themes/dst.zsh-theme b/.oh-my-zsh/themes/dst.zsh-theme new file mode 100644 index 0000000..3e2539d --- /dev/null +++ b/.oh-my-zsh/themes/dst.zsh-theme @@ -0,0 +1,16 @@ + +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +function prompt_char { + if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi +} + +PROMPT='%(?, ,%{$fg[red]%}FAIL%{$reset_color%} +) +%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info) +%_ $(prompt_char) ' + +RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}' diff --git a/.oh-my-zsh/themes/dstufft.zsh-theme b/.oh-my-zsh/themes/dstufft.zsh-theme new file mode 100644 index 0000000..5a23fce --- /dev/null +++ b/.oh-my-zsh/themes/dstufft.zsh-theme @@ -0,0 +1,19 @@ +function prompt_char { + git branch >/dev/null 2>/dev/null && echo '±' && return + hg root >/dev/null 2>/dev/null && echo 'Hg' && return + echo '○' +} + +function virtualenv_info { + [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') ' +} + +PROMPT=' +%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) +$(virtualenv_info)$(prompt_char) ' + +ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?" +ZSH_THEME_GIT_PROMPT_CLEAN="" diff --git a/.oh-my-zsh/themes/duellj.zsh-theme b/.oh-my-zsh/themes/duellj.zsh-theme new file mode 100644 index 0000000..3849c35 --- /dev/null +++ b/.oh-my-zsh/themes/duellj.zsh-theme @@ -0,0 +1,7 @@ +# user, host, full path, and time/date +# on two lines for easier vgrepping +# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888 +PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;34m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}%!%{\e[0;34m%}%B]%b%{\e[0m%} +%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]%{\e[0m%}%b ' +RPROMPT='[%*]' +PS2=$' \e[0;34m%}%B>%{\e[0m%}%b ' diff --git a/.oh-my-zsh/themes/eastwood.zsh-theme b/.oh-my-zsh/themes/eastwood.zsh-theme new file mode 100644 index 0000000..88134f8 --- /dev/null +++ b/.oh-my-zsh/themes/eastwood.zsh-theme @@ -0,0 +1,23 @@ +# RVM settings +if [[ -s ~/.rvm/scripts/rvm ]] ; then + RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1" +else + if which rbenv &> /dev/null; then + RPS1="%{$fg[yellow]%}rbenv:%{$reset_color%}%{$fg[red]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$reset_color%} $EPS1" + fi +fi + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}[" +ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +# Customized git status, oh-my-zsh currently does not allow render dirty status before branch +git_custom_status() { + local cb=$(git_current_branch) + if [ -n "$cb" ]; then + echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" + fi +} + +PROMPT='$(git_custom_status)%{$fg[cyan]%}[%~% ]%{$reset_color%}%B$%b ' diff --git a/.oh-my-zsh/themes/edvardm.zsh-theme b/.oh-my-zsh/themes/edvardm.zsh-theme new file mode 100644 index 0000000..f9ca1a9 --- /dev/null +++ b/.oh-my-zsh/themes/edvardm.zsh-theme @@ -0,0 +1,6 @@ +PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg_bold[white]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/.oh-my-zsh/themes/emotty.zsh-theme b/.oh-my-zsh/themes/emotty.zsh-theme new file mode 100644 index 0000000..34d491f --- /dev/null +++ b/.oh-my-zsh/themes/emotty.zsh-theme @@ -0,0 +1,99 @@ +#!/usr/bin/env zsh +# ------------------------------------------------------------------------------ +# FILE: emotty.zsh-theme +# DESCRIPTION: A varying emoji based theme +# AUTHOR: Alexis Hildebrandt (afh[at]surryhill.net) +# VERSION: 1.0.0 +# DEPENDS: emotty plugin +# RECOMMENDS: Hasklig font +# +# This theme shows a different emoji for each tty at the main prompt. +# +# There are pre-defined different emoji sets to choose from, e.g.: +# emoji, stellar, floral, zodiac, love (see emotty plugin). +# +# To choose a different emotty set than the default (emoji) +# % export emotty_set=nature +# +# For the superuser (root) this theme shows a designated indicator +# and switches the foreground color to red +# (see root_prompt variable, default: skull). +# But you are using sudo (8) instead of designated a root shell, right‽ +# +# When logged in via SSH the main prompt also shows the user- and hostname. +# +# The exit status of the last failed command is displayed in the window title +# along with an indicator (see warn_glyph variable, default: collision symbol). +# To clear it just run: $NULL, true or : +# +# The right prompt shows the current working directory (3 levels up) in cyan. +# +# When in a git repository the main prompt shows the current branch name +# with a branch indicator in yellow +# (see vcs_branch_glyph variable, default: Hasklig branch glyph). +# +# If there are modified files the prompt switches to red and shows an unstaged +# indicator (see vcs_unstaged_glyph variable, default: circled letter M). +# +# If there are staged files the prompt switches to green and shows an staged +# indicator (see vcs_staged_glyph variable, default: high voltage sign). +# +# In a git repository the right prompt shows the repository name in bold and +# prepends the current working directory subpath within the repository. +# +# When git currently performs an action such as merge or rebase, the action is +# displayed in red instead of the branch name and a special action indicator +# is shown (see vcs_action_glyph variable, default: chevron). +# ------------------------------------------------------------------------------ + +user_prompt="$(emotty)" +root_prompt="$emoji[skull]" +warn_prompt="$emoji[collision_symbol]" + +vcs_unstaged_glyph="%{$emoji[circled_latin_capital_letter_m]$emoji2[emoji_style] %2G%}" +vcs_staged_glyph="%{$emoji[high_voltage_sign] %2G%}" +vcs_branch_glyph=$(print -P $'\Ue0a0') #  +vcs_action_glyph=$(print -P $'\U276f') # ❯ + +red="$FG[001]" +yellow="$FG[003]" +green="$FG[002]" +cyan="$FG[014]" + +prompt_glyph="%{%(#.${root_prompt}.${user_prompt}) %2G%}" + +# Uncomment the next line if you also like to see the warn_prompt in the prompt on the right. +#last_command_failed="%(?.. %F{red}%1{${warn_prompt} %1G%}%?%f)" + + +setopt promptsubst + +autoload -U add-zsh-hook +autoload -Uz vcs_info + +zstyle ':vcs_info:*' enable git #hg svn cvs +zstyle ':vcs_info:*' get-revision false +zstyle ':vcs_info:*' check-for-changes true +zstyle ':vcs_info:git:*' unstagedstr "${red}${vcs_unstaged_glyph}" +zstyle ':vcs_info:*' stagedstr "${green}${vcs_staged_glyph}" + +# %(K|F){color} set (back|fore)ground color +# %(k|f) reset (back|fore)ground color +zstyle ':vcs_info:*' max-exports 3 +zstyle ':vcs_info:*' nvcsformats "${prompt_glyph}" '%3~' '' +zstyle ':vcs_info:*' formats "${yellow}%u%c%b${vcs_branch_glyph}%f" '%S|' "$FX[bold]%r$FX[no-bold]" +zstyle ':vcs_info:*' actionformats "${red}%K{white}%a${vcs_action_glyph}%k%f" '%S|' "$FX[bold]%r$FX[no-bold]" + +red_if_root="%(!.%F{red}.)" +sshuser_on_host="${SSH_TTY:+%(!.$red.$yellow)%n@%m$reset_color}" + +PROMPT='${sshuser_on_host}${vcs_info_msg_0_}${red_if_root} ' +RPROMPT='${cyan}${vcs_info_msg_1_##.|}${vcs_info_msg_2_}%f${last_command_failed}' + +emotty_title() { + title "${${?/[^0]*/$warn_prompt $?}/0/${prompt_glyph}}" +} +add-zsh-hook precmd emotty_title +add-zsh-hook precmd vcs_info + +# vim:ft=zsh ts=2 sw=2 sts=2 diff --git a/.oh-my-zsh/themes/essembeh.zsh-theme b/.oh-my-zsh/themes/essembeh.zsh-theme new file mode 100644 index 0000000..939bb7a --- /dev/null +++ b/.oh-my-zsh/themes/essembeh.zsh-theme @@ -0,0 +1,30 @@ +# Theme with full path names and hostname +# Handy if you work on different servers all the time; + +local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})" + +function my_git_prompt_info() { + ref=$(git symbolic-ref HEAD 2> /dev/null) || return + GIT_STATUS=$(git_prompt_status) + [[ -n $GIT_STATUS ]] && GIT_STATUS=" $GIT_STATUS" + echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX" +} + +# Colored prompt +ZSH_THEME_COLOR_USER="green" +ZSH_THEME_COLOR_HOST="green" +ZSH_THEME_COLOR_PWD="yellow" +test -n "$SSH_CONNECTION" && ZSH_THEME_COLOR_USER="red" && ZSH_THEME_COLOR_HOST="red" +test `id -u` = 0 && ZSH_THEME_COLOR_USER="magenta" && ZSH_THEME_COLOR_HOST="magenta" +PROMPT='%{$fg_bold[$ZSH_THEME_COLOR_USER]%}%n@%{$fg_bold[$ZSH_THEME_COLOR_HOST]%}%M%{$reset_color%}:%{$fg_bold[$ZSH_THEME_COLOR_PWD]%}%~%{$reset_color%} $(my_git_prompt_info)%(!.#.$) ' +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%%" +ZSH_THEME_GIT_PROMPT_ADDED="+" +ZSH_THEME_GIT_PROMPT_MODIFIED="*" +ZSH_THEME_GIT_PROMPT_RENAMED="~" +ZSH_THEME_GIT_PROMPT_DELETED="!" +ZSH_THEME_GIT_PROMPT_UNMERGED="?" + diff --git a/.oh-my-zsh/themes/evan.zsh-theme b/.oh-my-zsh/themes/evan.zsh-theme new file mode 100644 index 0000000..5ef1f40 --- /dev/null +++ b/.oh-my-zsh/themes/evan.zsh-theme @@ -0,0 +1,2 @@ +# Evan describes this sexy prompt as: "a skinny, topless prompt" +PROMPT='%m :: %2~ %B»%b ' \ No newline at end of file diff --git a/.oh-my-zsh/themes/example.zsh-theme b/.oh-my-zsh/themes/example.zsh-theme new file mode 100644 index 0000000..dbd9dc9 --- /dev/null +++ b/.oh-my-zsh/themes/example.zsh-theme @@ -0,0 +1,5 @@ +# Found on the ZshWiki +# http://zshwiki.org/home/config/prompt +# + +PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% " \ No newline at end of file diff --git a/.oh-my-zsh/themes/fino-time.zsh-theme b/.oh-my-zsh/themes/fino-time.zsh-theme new file mode 100644 index 0000000..9b1db3a --- /dev/null +++ b/.oh-my-zsh/themes/fino-time.zsh-theme @@ -0,0 +1,39 @@ +# fino-time.zsh-theme + +# Use with a dark background and 256-color terminal! +# Meant for people with RVM and git. Tested only on OS X 10.7. + +# You can set your computer name in the ~/.box-name file if you want. + +# Borrowing shamelessly from these oh-my-zsh themes: +# bira +# robbyrussell +# +# Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/ + +function virtualenv_info { + [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') ' +} + +function prompt_char { + git branch >/dev/null 2>/dev/null && echo '⠠⠵' && return + echo '○' +} + +function box_name { + [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST} +} + + +local rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}' +local current_dir='${PWD/#$HOME/~}' +local git_info='$(git_prompt_info)' + + +PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ${rvm_ruby} %D - %* +╰─$(virtualenv_info)$(prompt_char) " + +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[202]%}✘✘✘" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔" diff --git a/.oh-my-zsh/themes/fino.zsh-theme b/.oh-my-zsh/themes/fino.zsh-theme new file mode 100644 index 0000000..6eec097 --- /dev/null +++ b/.oh-my-zsh/themes/fino.zsh-theme @@ -0,0 +1,43 @@ +# fino.zsh-theme + +# Use with a dark background and 256-color terminal! +# Meant for people with rbenv and git. Tested only on OS X 10.7. + +# You can set your computer name in the ~/.box-name file if you want. + +# Borrowing shamelessly from these oh-my-zsh themes: +# bira +# robbyrussell +# +# Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/ + +function prompt_char { + git branch >/dev/null 2>/dev/null && echo "±" && return + echo '○' +} + +function box_name { + [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST} +} + +local ruby_env='' +if which rvm-prompt &> /dev/null; then + ruby_env=' ‹$(rvm-prompt i v g)›%{$reset_color%}' +else + if which rbenv &> /dev/null; then + ruby_env=' ‹$(rbenv version-name)›%{$reset_color%}' + fi +fi + +local current_dir='${PWD/#$HOME/~}' +local git_info='$(git_prompt_info)' +local prompt_char='$(prompt_char)' + + +PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%}${ruby_env} +╰─${prompt_char}%{$reset_color%} " + +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[202]%}✘✘✘" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔" diff --git a/.oh-my-zsh/themes/fishy.zsh-theme b/.oh-my-zsh/themes/fishy.zsh-theme new file mode 100644 index 0000000..83bd455 --- /dev/null +++ b/.oh-my-zsh/themes/fishy.zsh-theme @@ -0,0 +1,29 @@ +# ZSH Theme emulating the Fish shell's default prompt. + +_fishy_collapsed_wd() { + echo $(pwd | perl -pe ' + BEGIN { + binmode STDIN, ":encoding(UTF-8)"; + binmode STDOUT, ":encoding(UTF-8)"; + }; s|^$ENV{HOME}|~|g; s|/([^/.])[^/]*(?=/)|/$1|g; s|/\.([^/])[^/]*(?=/)|/.$1|g +') +} + +local user_color='green'; [ $UID -eq 0 ] && user_color='red' +PROMPT='%n@%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>) ' +PROMPT2='%{$fg[red]%}\ %{$reset_color%}' + +local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}" +RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX=" " +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY="" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[green]%}+" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!" +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?" diff --git a/.oh-my-zsh/themes/flazz.zsh-theme b/.oh-my-zsh/themes/flazz.zsh-theme new file mode 100644 index 0000000..c0a7fb5 --- /dev/null +++ b/.oh-my-zsh/themes/flazz.zsh-theme @@ -0,0 +1,19 @@ +if [ "$USER" = "root" ] +then CARETCOLOR="red" +else CARETCOLOR="blue" +fi + +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +PROMPT='%m%{${fg_bold[magenta]}%} :: %{$reset_color%}%{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}%#%{${reset_color}%} ' + +RPS1='$(vi_mode_prompt_info) ${return_code}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[cyan]%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" + +MODE_INDICATOR="%{$fg_bold[magenta]%}<%{$reset_color%}%{$fg[magenta]%}<<%{$reset_color%}" + +# TODO use 265 colors +#MODE_INDICATOR="$FX[bold]$FG[020]<$FX[no_bold]%{$fg[blue]%}<<%{$reset_color%}" +# TODO use two lines if git diff --git a/.oh-my-zsh/themes/fletcherm.zsh-theme b/.oh-my-zsh/themes/fletcherm.zsh-theme new file mode 100644 index 0000000..e961885 --- /dev/null +++ b/.oh-my-zsh/themes/fletcherm.zsh-theme @@ -0,0 +1,12 @@ +# Copied from old version of tonotdo's theme. LSCOLORS modified. +PROMPT='%{$fg_no_bold[cyan]%}%n%{$fg_no_bold[magenta]%}•%{$fg_no_bold[green]%}%3~$(git_prompt_info)%{$reset_color%}» ' +RPROMPT='[%*]' + +# git theming +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[blue]%})" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}⚡%{$fg_bold[blue]%})" + +export LSCOLORS="exfxcxdxbxegedabagacad" +export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' diff --git a/.oh-my-zsh/themes/fox.zsh-theme b/.oh-my-zsh/themes/fox.zsh-theme new file mode 100644 index 0000000..3ecd4e2 --- /dev/null +++ b/.oh-my-zsh/themes/fox.zsh-theme @@ -0,0 +1,9 @@ +# fox.zsh-theme + +PROMPT='%{$fg[cyan]%}┌[%{$fg_bold[white]%}%n%{$reset_color%}%{$fg[cyan]%}☮%{$fg_bold[white]%}%M%{$reset_color%}%{$fg[cyan]%}]%{$fg[white]%}-%{$fg[cyan]%}(%{$fg_bold[white]%}%~%{$reset_color%}%{$fg[cyan]%})$(git_prompt_info) +└> % %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="-[%{$reset_color%}%{$fg[white]%}git://%{$fg_bold[white]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}%{$fg[cyan]%}]-" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔%{$reset_color%}" diff --git a/.oh-my-zsh/themes/frisk.zsh-theme b/.oh-my-zsh/themes/frisk.zsh-theme new file mode 100644 index 0000000..653c746 --- /dev/null +++ b/.oh-my-zsh/themes/frisk.zsh-theme @@ -0,0 +1,12 @@ +PROMPT=$' +%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)$(bzr_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%} +%{$fg_bold[black]%}>%{$reset_color%} ' + +PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}" + +GIT_CB="git::" +ZSH_THEME_SCM_PROMPT_PREFIX="%{$fg[green]%}[" +ZSH_THEME_GIT_PROMPT_PREFIX=$ZSH_THEME_SCM_PROMPT_PREFIX$GIT_CB +ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}" +ZSH_THEME_GIT_PROMPT_CLEAN="" diff --git a/.oh-my-zsh/themes/frontcube.zsh-theme b/.oh-my-zsh/themes/frontcube.zsh-theme new file mode 100644 index 0000000..539e744 --- /dev/null +++ b/.oh-my-zsh/themes/frontcube.zsh-theme @@ -0,0 +1,12 @@ +local rvm="%{$fg[green]%}[$(rvm-prompt i v g)]%{$reset_color%}" + +PROMPT=' +%{$fg_bold[gray]%}%~%{$fg_bold[blue]%}%{$fg_bold[blue]%} % %{$reset_color%} +%{$fg[green]%}➞ %{$reset_color%' + +RPROMPT='$(git_prompt_info) ${rvm}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}[git:" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}] %{$fg[red]%}✖ %{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}] %{$fg[green]%}✔%{$reset_color%}" diff --git a/.oh-my-zsh/themes/funky.zsh-theme b/.oh-my-zsh/themes/funky.zsh-theme new file mode 100644 index 0000000..2451296 --- /dev/null +++ b/.oh-my-zsh/themes/funky.zsh-theme @@ -0,0 +1,14 @@ +# Taken from Tassilo's Blog +# http://tsdh.wordpress.com/2007/12/06/my-funky-zsh-prompt/ + +local blue_op="%{$fg[blue]%}[%{$reset_color%}" +local blue_cp="%{$fg[blue]%}]%{$reset_color%}" +local path_p="${blue_op}%~${blue_cp}" +local user_host="${blue_op}%n@%m${blue_cp}" +local ret_status="${blue_op}%?${blue_cp}" +local hist_no="${blue_op}%h${blue_cp}" +local smiley="%(?,%{$fg[green]%}:%)%{$reset_color%},%{$fg[red]%}:(%{$reset_color%})" +PROMPT="╭─${path_p}─${user_host}─${ret_status}─${hist_no} +╰─${blue_op}${smiley}${blue_cp} %# " +local cur_cmd="${blue_op}%_${blue_cp}" +PROMPT2="${cur_cmd}> " \ No newline at end of file diff --git a/.oh-my-zsh/themes/fwalch.zsh-theme b/.oh-my-zsh/themes/fwalch.zsh-theme new file mode 100644 index 0000000..24edf55 --- /dev/null +++ b/.oh-my-zsh/themes/fwalch.zsh-theme @@ -0,0 +1,6 @@ +PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/.oh-my-zsh/themes/gallifrey.zsh-theme b/.oh-my-zsh/themes/gallifrey.zsh-theme new file mode 100644 index 0000000..fce7cb9 --- /dev/null +++ b/.oh-my-zsh/themes/gallifrey.zsh-theme @@ -0,0 +1,8 @@ +# ZSH Theme - Preview: http://img.skitch.com/20091113-qqtd3j8xinysujg5ugrsbr7x1y.jpg +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +PROMPT='%{$fg[green]%}%m%{$reset_color%} %2~ $(git_prompt_info)%{$reset_color%}%B»%b ' +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" diff --git a/.oh-my-zsh/themes/gallois.zsh-theme b/.oh-my-zsh/themes/gallois.zsh-theme new file mode 100644 index 0000000..515325e --- /dev/null +++ b/.oh-my-zsh/themes/gallois.zsh-theme @@ -0,0 +1,23 @@ +# Depends on the git plugin for work_in_progress() + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}[" +ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +#Customized git status, oh-my-zsh currently does not allow render dirty status before branch +git_custom_status() { + local cb=$(git_current_branch) + if [ -n "$cb" ]; then + echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" + fi +} + +# RVM component of prompt +ZSH_THEME_RVM_PROMPT_PREFIX="%{$fg[red]%}[" +ZSH_THEME_RVM_PROMPT_SUFFIX="]%{$reset_color%}" + +# Combine it all into a final right-side prompt +RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1' + +PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b ' diff --git a/.oh-my-zsh/themes/garyblessington.zsh-theme b/.oh-my-zsh/themes/garyblessington.zsh-theme new file mode 100644 index 0000000..b4f84a7 --- /dev/null +++ b/.oh-my-zsh/themes/garyblessington.zsh-theme @@ -0,0 +1,6 @@ +PROMPT='%{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}% %{$reset_color%}: ' + +ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg[blue]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[red]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/.oh-my-zsh/themes/gentoo.zsh-theme b/.oh-my-zsh/themes/gentoo.zsh-theme new file mode 100644 index 0000000..ee205d2 --- /dev/null +++ b/.oh-my-zsh/themes/gentoo.zsh-theme @@ -0,0 +1,8 @@ +function prompt_char { + if [ $UID -eq 0 ]; then echo "#"; else echo $; fi +} + +PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(git_prompt_info)%_$(prompt_char)%{$reset_color%} ' + +ZSH_THEME_GIT_PROMPT_PREFIX="(" +ZSH_THEME_GIT_PROMPT_SUFFIX=") " diff --git a/.oh-my-zsh/themes/geoffgarside.zsh-theme b/.oh-my-zsh/themes/geoffgarside.zsh-theme new file mode 100644 index 0000000..675ec72 --- /dev/null +++ b/.oh-my-zsh/themes/geoffgarside.zsh-theme @@ -0,0 +1,5 @@ +# PROMPT="[%*] %n:%c $(git_prompt_info)%(!.#.$) " +PROMPT='[%*] %{$fg[cyan]%}%n%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) ' + +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[yellow]%}git:(" +ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}" diff --git a/.oh-my-zsh/themes/gianu.zsh-theme b/.oh-my-zsh/themes/gianu.zsh-theme new file mode 100644 index 0000000..faa8021 --- /dev/null +++ b/.oh-my-zsh/themes/gianu.zsh-theme @@ -0,0 +1,6 @@ +PROMPT='[%{$fg_bold[white]%}%n%{$reset_color%}@%{$fg_bold[red]%}%m%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)%{$reset_color%}]$ ' + +ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg_bold[green]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX=")" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$reset_color%}" diff --git a/.oh-my-zsh/themes/gnzh.zsh-theme b/.oh-my-zsh/themes/gnzh.zsh-theme new file mode 100644 index 0000000..04b0450 --- /dev/null +++ b/.oh-my-zsh/themes/gnzh.zsh-theme @@ -0,0 +1,50 @@ +# ZSH Theme - Preview: http://dl.dropbox.com/u/4109351/pics/gnzh-zsh-theme.png +# Based on bira theme + +setopt prompt_subst + +() { + +local PR_USER PR_USER_OP PR_PROMPT PR_HOST + +# Check the UID +if [[ $UID -ne 0 ]]; then # normal user + PR_USER='%F{green}%n%f' + PR_USER_OP='%F{green}%#%f' + PR_PROMPT='%f➤ %f' +else # root + PR_USER='%F{red}%n%f' + PR_USER_OP='%F{red}%#%f' + PR_PROMPT='%F{red}➤ %f' +fi + +# Check if we are on SSH or not +if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then + PR_HOST='%F{red}%M%f' # SSH +else + PR_HOST='%F{green}%M%f' # no SSH +fi + + +local return_code="%(?..%F{red}%? ↵%f)" + +local user_host="${PR_USER}%F{cyan}@${PR_HOST}" +local current_dir="%B%F{blue}%~%f%b" +local rvm_ruby='' +if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect user-local rvm installation + rvm_ruby='%F{red}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%f' +elif which rvm-prompt &> /dev/null; then # detect system-wide rvm installation + rvm_ruby='%F{red}‹$(rvm-prompt i v g s)›%f' +elif which rbenv &> /dev/null; then # detect Simple Ruby Version Management + rvm_ruby='%F{red}‹$(rbenv version | sed -e "s/ (set.*$//")›%f' +fi +local git_branch='$(git_prompt_info)' + +PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch} +╰─$PR_PROMPT " +RPROMPT="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="› %f" + +} diff --git a/.oh-my-zsh/themes/gozilla.zsh-theme b/.oh-my-zsh/themes/gozilla.zsh-theme new file mode 100644 index 0000000..c6b752e --- /dev/null +++ b/.oh-my-zsh/themes/gozilla.zsh-theme @@ -0,0 +1,15 @@ +PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="(" +ZSH_THEME_GIT_PROMPT_SUFFIX=")" +ZSH_THEME_GIT_PROMPT_DIRTY="" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +RPROMPT='$(git_prompt_status)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭" +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱" diff --git a/.oh-my-zsh/themes/half-life.zsh-theme b/.oh-my-zsh/themes/half-life.zsh-theme new file mode 100644 index 0000000..5f98709 --- /dev/null +++ b/.oh-my-zsh/themes/half-life.zsh-theme @@ -0,0 +1,96 @@ +# prompt style and colors based on Steve Losh's Prose theme: +# http://github.com/sjl/oh-my-zsh/blob/master/themes/prose.zsh-theme +# +# vcs_info modifications from Bart Trojanowski's zsh prompt: +# http://www.jukie.net/bart/blog/pimping-out-zsh-prompt +# +# git untracked files modification from Brian Carper: +# http://briancarper.net/blog/570/git-info-in-your-zsh-prompt + +function virtualenv_info { + [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') ' +} +PR_GIT_UPDATE=1 + +setopt prompt_subst + +autoload -U add-zsh-hook +autoload -Uz vcs_info + +#use extended color palette if available +if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then + turquoise="%F{81}" + orange="%F{166}" + purple="%F{135}" + hotpink="%F{161}" + limegreen="%F{118}" +else + turquoise="$fg[cyan]" + orange="$fg[yellow]" + purple="$fg[magenta]" + hotpink="$fg[red]" + limegreen="$fg[green]" +fi + +# enable VCS systems you use +zstyle ':vcs_info:*' enable git svn + +# check-for-changes can be really slow. +# you should disable it, if you work with large repositories +zstyle ':vcs_info:*:prompt:*' check-for-changes true + +# set formats +# %b - branchname +# %u - unstagedstr (see below) +# %c - stagedstr (see below) +# %a - action (e.g. rebase-i) +# %R - repository path +# %S - path in the repository +PR_RST="%{${reset_color}%}" +FMT_BRANCH=" on %{$turquoise%}%b%u%c${PR_RST}" +FMT_ACTION=" performing a %{$limegreen%}%a${PR_RST}" +FMT_UNSTAGED="%{$orange%} ●" +FMT_STAGED="%{$limegreen%} ●" + +zstyle ':vcs_info:*:prompt:*' unstagedstr "${FMT_UNSTAGED}" +zstyle ':vcs_info:*:prompt:*' stagedstr "${FMT_STAGED}" +zstyle ':vcs_info:*:prompt:*' actionformats "${FMT_BRANCH}${FMT_ACTION}" +zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH}" +zstyle ':vcs_info:*:prompt:*' nvcsformats "" + + +function steeef_preexec { + case "$(history $HISTCMD)" in + *git*) + PR_GIT_UPDATE=1 + ;; + *svn*) + PR_GIT_UPDATE=1 + ;; + esac +} +add-zsh-hook preexec steeef_preexec + +function steeef_chpwd { + PR_GIT_UPDATE=1 +} +add-zsh-hook chpwd steeef_chpwd + +function steeef_precmd { + if [[ -n "$PR_GIT_UPDATE" ]] ; then + # check for untracked files or updated submodules, since vcs_info doesn't + if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then + PR_GIT_UPDATE=1 + FMT_BRANCH="${PM_RST} on %{$turquoise%}%b%u%c%{$hotpink%} ●${PR_RST}" + else + FMT_BRANCH="${PM_RST} on %{$turquoise%}%b%u%c${PR_RST}" + fi + zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH}" + + vcs_info 'prompt' + PR_GIT_UPDATE= + fi +} +add-zsh-hook precmd steeef_precmd + +PROMPT=$'%{$purple%}%n%{$reset_color%} in %{$limegreen%}%~%{$reset_color%}$(ruby_prompt_info " with%{$fg[red]%} " v g "%{$reset_color%}")$vcs_info_msg_0_%{$orange%} λ%{$reset_color%} ' diff --git a/.oh-my-zsh/themes/humza.zsh-theme b/.oh-my-zsh/themes/humza.zsh-theme new file mode 100644 index 0000000..1078862 --- /dev/null +++ b/.oh-my-zsh/themes/humza.zsh-theme @@ -0,0 +1,26 @@ +# ZSH THEME Preview: https://skitch.com/huyy/rk979/humza.zshtheme + +let TotalBytes=0 +for Bytes in $(ls -l | grep "^-" | awk '{ print $5 }') +do + let TotalBytes=$TotalBytes+$Bytes +done + # should it say b, kb, Mb, or Gb +if [ $TotalBytes -lt 1024 ]; then + TotalSize=$(echo -e "scale=3 \n$TotalBytes \nquit" | bc) + suffix="b" +elif [ $TotalBytes -lt 1048576 ]; then + TotalSize=$(echo -e "scale=3 \n$TotalBytes/1024 \nquit" | bc) + suffix="kb" +elif [ $TotalBytes -lt 1073741824 ]; then + TotalSize=$(echo -e "scale=3 \n$TotalBytes/1048576 \nquit" | bc) + suffix="Mb" +else + TotalSize=$(echo -e "scale=3 \n$TotalBytes/1073741824 \nquit" | bc) + suffix="Gb" +fi + +PROMPT='%{$reset_color%}%n %{$fg[green]%}{%{$reset_color%}%~%{$fg[green]%}}%{$reset_color%}$(git_prompt_info) greetings, earthling %{$fg[green]%}[%{$reset_color%}%{$TotalSize%}%{$suffix%}%{$fg[green]%}]%{$fg[red]%}$%{$reset_color%} ☞ ' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}±(" +ZSH_THEME_GIT_PROMPT_SUFFIX=");%{$reset_color%}" diff --git a/.oh-my-zsh/themes/imajes.zsh-theme b/.oh-my-zsh/themes/imajes.zsh-theme new file mode 100644 index 0000000..88c35b6 --- /dev/null +++ b/.oh-my-zsh/themes/imajes.zsh-theme @@ -0,0 +1,5 @@ +# Found on the ZshWiki +# http://zshwiki.org/home/config/prompt +# + +PROMPT="%{$fg[red]%}%%%{$reset_color%} " \ No newline at end of file diff --git a/.oh-my-zsh/themes/intheloop.zsh-theme b/.oh-my-zsh/themes/intheloop.zsh-theme new file mode 100644 index 0000000..7a98db2 --- /dev/null +++ b/.oh-my-zsh/themes/intheloop.zsh-theme @@ -0,0 +1,23 @@ +# A multiline prompt with username, hostname, full path, return status, git branch, git dirty status, git remote status + +local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}" + +local host_color="green" +if [ -n "$SSH_CLIENT" ]; then + local host_color="red" +fi + +PROMPT=' +%{$fg_bold[grey]%}[%{$reset_color%}%{$fg_bold[${host_color}]%}%n@%m%{$reset_color%}%{$fg_bold[grey]%}]%{$reset_color%} %{$fg_bold[blue]%}%10c%{$reset_color%} $(git_prompt_info) $(git_remote_status) +%{$fg_bold[cyan]%}❯%{$reset_color%} ' + + +RPROMPT='${return_status}%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[grey]%}(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[grey]%}) %{$fg[yellow]%}⚡%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[grey]%})" +ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="%{$fg_bold[magenta]%}↓%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE="%{$fg_bold[magenta]%}↑%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="%{$fg_bold[magenta]%}↕%{$reset_color%}" diff --git a/.oh-my-zsh/themes/itchy.zsh-theme b/.oh-my-zsh/themes/itchy.zsh-theme new file mode 100644 index 0000000..c23889e --- /dev/null +++ b/.oh-my-zsh/themes/itchy.zsh-theme @@ -0,0 +1,18 @@ +# Inspired by http://peepcode.com/blog/2012/my-command-line-prompt + +local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})" + +local user="%{$fg[cyan]%}%n%{$reset_color%}" +local host="%{$fg[cyan]%}@%m%{$reset_color%}" +local pwd="%{$fg[yellow]%}%~%{$reset_color%}" + +PROMPT='${user}${host} ${pwd} +${smiley} ' + +RPROMPT='$(rvm-prompt || rbenv version) %{$fg[white]%}$(git_prompt_info)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ✔%{$reset_color%}" + diff --git a/.oh-my-zsh/themes/jaischeema.zsh-theme b/.oh-my-zsh/themes/jaischeema.zsh-theme new file mode 100644 index 0000000..da1dd1e --- /dev/null +++ b/.oh-my-zsh/themes/jaischeema.zsh-theme @@ -0,0 +1,16 @@ +# jaischeema.zsh-theme + +PROMPT='%{$fg_bold[magenta]%}%m%{$reset_color%} at %{$fg_bold[green]%}%~%{$reset_color%} %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}% %{$reset_color%}%{$fg[red]%}❯%{$reset_color%} ' + +ZSH_THEME_GIT_PROMPT_PREFIX="±(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}) " + +if which rbenv &> /dev/null; then + RPROMPT='%{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%}' +else + if which rvm-prompt &> /dev/null; then + RPROMPT='%{$fg[red]%}$(rvm-prompt)%{$reset_color%}' + fi +fi diff --git a/.oh-my-zsh/themes/jbergantine.zsh-theme b/.oh-my-zsh/themes/jbergantine.zsh-theme new file mode 100644 index 0000000..d84247c --- /dev/null +++ b/.oh-my-zsh/themes/jbergantine.zsh-theme @@ -0,0 +1,6 @@ +PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[white]%}$(git_prompt_info)%{$fg_bold[white]%} % %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[white]%}) %{$fg[yellow]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[white]%})" diff --git a/.oh-my-zsh/themes/jispwoso.zsh-theme b/.oh-my-zsh/themes/jispwoso.zsh-theme new file mode 100644 index 0000000..7484305 --- /dev/null +++ b/.oh-my-zsh/themes/jispwoso.zsh-theme @@ -0,0 +1,10 @@ +local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)" +PROMPT=$'%{$fg[green]%}%n@%m: %{$reset_color%}%{$fg[blue]%}%/ %{$reset_color%}%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%} +${ret_status} %{$reset_color%} ' + +PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/.oh-my-zsh/themes/jnrowe.zsh-theme b/.oh-my-zsh/themes/jnrowe.zsh-theme new file mode 100644 index 0000000..bae88f7 --- /dev/null +++ b/.oh-my-zsh/themes/jnrowe.zsh-theme @@ -0,0 +1,38 @@ +autoload -U add-zsh-hook +autoload -Uz vcs_info + +zstyle ':vcs_info:*' actionformats \ + '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f ' +zstyle ':vcs_info:*' formats '%F{2}%s%F{7}:%F{2}(%F{1}%b%F{2})%f ' +zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r' +zstyle ':vcs_info:*' enable git + +add-zsh-hook precmd prompt_vcs + +prompt_vcs () { + vcs_info + + if [ "${vcs_info_msg_0_}" = "" ]; then + dir_status="%F{2}→%f" + elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then + dir_status="%F{1}▶%f" + elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then + dir_status="%F{3}▶%f" + else + dir_status="%F{2}▶%f" + fi +} + +function { + if [[ -n "$SSH_CLIENT" ]]; then + PROMPT_HOST=" ($HOST)" + else + PROMPT_HOST='' + fi +} + +local ret_status="%(?:%{$fg_bold[green]%}Ξ:%{$fg_bold[red]%}%S↑%s%?)" + +PROMPT='${ret_status}%{$fg[blue]%}${PROMPT_HOST}%{$fg_bold[green]%}%p %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} ' + +# vim: set ft=zsh ts=4 sw=4 et: diff --git a/.oh-my-zsh/themes/jonathan.zsh-theme b/.oh-my-zsh/themes/jonathan.zsh-theme new file mode 100644 index 0000000..2f0e774 --- /dev/null +++ b/.oh-my-zsh/themes/jonathan.zsh-theme @@ -0,0 +1,153 @@ +functions rbenv_prompt_info >& /dev/null || rbenv_prompt_info(){} + +function theme_precmd { + local TERMWIDTH + (( TERMWIDTH = ${COLUMNS} - 1 )) + + + ### + # Truncate the path if it's too long. + + PR_FILLBAR="" + PR_PWDLEN="" + + local promptsize=${#${(%):---(%n@%m:%l)---()--}} + local rubyprompt=`rvm_prompt_info || rbenv_prompt_info` + local rubypromptsize=${#${rubyprompt}} + local pwdsize=${#${(%):-%~}} + + if [[ "$promptsize + $rubypromptsize + $pwdsize" -gt $TERMWIDTH ]]; then + ((PR_PWDLEN=$TERMWIDTH - $promptsize)) + else + PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}" + fi + +} + + +setopt extended_glob +theme_preexec () { + if [[ "$TERM" == "screen" ]]; then + local CMD=${1[(wr)^(*=*|sudo|-*)]} + echo -n "\ek$CMD\e\\" + fi +} + + +setprompt () { + ### + # Need this so the prompt will work. + + setopt prompt_subst + + + ### + # See if we can use colors. + + autoload zsh/terminfo + for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do + eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}' + eval PR_LIGHT_$color='%{$fg[${(L)color}]%}' + (( count = $count + 1 )) + done + PR_NO_COLOUR="%{$terminfo[sgr0]%}" + + ### + # Modify Git prompt + ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}" + ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" + ZSH_THEME_GIT_PROMPT_DIRTY="" + ZSH_THEME_GIT_PROMPT_CLEAN="" + + ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚" + ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹" + ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" + ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜" + ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═" + ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" + + ### + # See if we can use extended characters to look nicer. + # UTF-8 Fixed + + if [[ $(locale charmap) == "UTF-8" ]]; then + PR_SET_CHARSET="" + PR_SHIFT_IN="" + PR_SHIFT_OUT="" + PR_HBAR="─" + PR_ULCORNER="┌" + PR_LLCORNER="└" + PR_LRCORNER="┘" + PR_URCORNER="┐" + else + typeset -A altchar + set -A altchar ${(s..)terminfo[acsc]} + # Some stuff to help us draw nice lines + PR_SET_CHARSET="%{$terminfo[enacs]%}" + PR_SHIFT_IN="%{$terminfo[smacs]%}" + PR_SHIFT_OUT="%{$terminfo[rmacs]%}" + PR_HBAR='$PR_SHIFT_IN${altchar[q]:--}$PR_SHIFT_OUT' + PR_ULCORNER='$PR_SHIFT_IN${altchar[l]:--}$PR_SHIFT_OUT' + PR_LLCORNER='$PR_SHIFT_IN${altchar[m]:--}$PR_SHIFT_OUT' + PR_LRCORNER='$PR_SHIFT_IN${altchar[j]:--}$PR_SHIFT_OUT' + PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT' + fi + + + ### + # Decide if we need to set titlebar text. + + case $TERM in + xterm*) + PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}' + ;; + screen) + PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}' + ;; + *) + PR_TITLEBAR='' + ;; + esac + + + ### + # Decide whether to set a screen title + if [[ "$TERM" == "screen" ]]; then + PR_STITLE=$'%{\ekzsh\e\\%}' + else + PR_STITLE='' + fi + + + ### + # Finally, the prompt. + + PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\ +$PR_CYAN$PR_ULCORNER$PR_HBAR$PR_GREY(\ +$PR_GREEN%$PR_PWDLEN<...<%~%<<\ +$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_GREY(\ +$PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\ +$PR_GREY)$PR_CYAN$PR_HBAR$PR_URCORNER\ + +$PR_CYAN$PR_LLCORNER$PR_BLUE$PR_HBAR(\ +$PR_YELLOW%D{%H:%M:%S}\ +$PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_HBAR\ +$PR_HBAR\ +>$PR_NO_COLOUR ' + + # display exitcode on the right when >0 + return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})" + RPROMPT=' $return_code$PR_CYAN$PR_HBAR$PR_BLUE$PR_HBAR\ +($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_NO_COLOUR' + + PS2='$PR_CYAN$PR_HBAR\ +$PR_BLUE$PR_HBAR(\ +$PR_LIGHT_GREEN%_$PR_BLUE)$PR_HBAR\ +$PR_CYAN$PR_HBAR$PR_NO_COLOUR ' +} + +setprompt + +autoload -U add-zsh-hook +add-zsh-hook precmd theme_precmd +add-zsh-hook preexec theme_preexec diff --git a/.oh-my-zsh/themes/josh.zsh-theme b/.oh-my-zsh/themes/josh.zsh-theme new file mode 100644 index 0000000..c8f0f4d --- /dev/null +++ b/.oh-my-zsh/themes/josh.zsh-theme @@ -0,0 +1,43 @@ +grey='\e[0;90m' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$grey%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$grey%}) %{$fg[yellow]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$grey%})" + +function josh_prompt { + (( spare_width = ${COLUMNS} )) + prompt=" " + + branch=$(git_current_branch) + ruby_version=$(rvm_prompt_info || rbenv_prompt_info) + path_size=${#PWD} + branch_size=${#branch} + ruby_size=${#ruby_version} + user_machine_size=${#${(%):-%n@%m-}} + + if [[ ${#branch} -eq 0 ]] + then (( ruby_size = ruby_size + 1 )) + else + (( branch_size = branch_size + 4 )) + if [[ -n $(git status -s 2> /dev/null) ]]; then + (( branch_size = branch_size + 2 )) + fi + fi + + (( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) )) + + while [ ${#prompt} -lt $spare_width ]; do + prompt=" $prompt" + done + + prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(git_current_branch)" + + echo $prompt +} + +setopt prompt_subst + +PROMPT=' +%n@%m $(josh_prompt) +%(?,%{%F{green}%},%{%F{red}%})⚡%{$reset_color%} ' diff --git a/.oh-my-zsh/themes/jreese.zsh-theme b/.oh-my-zsh/themes/jreese.zsh-theme new file mode 100644 index 0000000..0fa6b4e --- /dev/null +++ b/.oh-my-zsh/themes/jreese.zsh-theme @@ -0,0 +1,16 @@ +# ZSH Theme - Preview: http://dl.dropbox.com/u/1552408/Screenshots/2010-04-08-oh-my-zsh.png + +if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +PROMPT='%{$fg[$NCOLOR]%}%n%{$fg[green]%}@%m%{$reset_color%} %~ \ +$(git_prompt_info)\ +%{$fg[red]%}%(!.#.»)%{$reset_color%} ' +PROMPT2='%{$fg[red]%}\ %{$reset_color%}' +RPS1='${return_code}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}±%{$fg[yellow]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_DIRTY="⚡" + diff --git a/.oh-my-zsh/themes/jtriley.zsh-theme b/.oh-my-zsh/themes/jtriley.zsh-theme new file mode 100644 index 0000000..15d77ed --- /dev/null +++ b/.oh-my-zsh/themes/jtriley.zsh-theme @@ -0,0 +1,8 @@ +#PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' +PROMPT="%{$fg_bold[cyan]%}%T%{$fg_bold[green]%} %{$fg_bold[white]%}%n%{$fg[magenta]%}@%{$fg_bold[white]%}%m %{$fg_bold[green]%}%d +%{$fg_bold[yellow]%}%% %{$reset_color%}" + +#ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" +#ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +#ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" +#ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/.oh-my-zsh/themes/juanghurtado.zsh-theme b/.oh-my-zsh/themes/juanghurtado.zsh-theme new file mode 100644 index 0000000..dbdfde7 --- /dev/null +++ b/.oh-my-zsh/themes/juanghurtado.zsh-theme @@ -0,0 +1,41 @@ +# Color shortcuts +RED=$fg[red] +YELLOW=$fg[yellow] +GREEN=$fg[green] +WHITE=$fg[white] +BLUE=$fg[blue] +RED_BOLD=$fg_bold[red] +YELLOW_BOLD=$fg_bold[yellow] +GREEN_BOLD=$fg_bold[green] +WHITE_BOLD=$fg_bold[white] +BLUE_BOLD=$fg_bold[blue] +RESET_COLOR=$reset_color + +# Format for git_prompt_info() +ZSH_THEME_GIT_PROMPT_PREFIX="" +ZSH_THEME_GIT_PROMPT_SUFFIX="" + +# Format for parse_git_dirty() +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}(*)" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +# Format for git_prompt_status() +ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged" +ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted" +ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed" +ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified" +ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added" +ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked" + +# Format for git_prompt_ahead() +ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}(!)" + +# Format for git_prompt_long_sha() and git_prompt_short_sha() +ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}" +ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]" + +# Prompt format +PROMPT=' +%{$GREEN_BOLD%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%} +%{$BLUE%}>%{$RESET_COLOR%} ' +RPROMPT='%{$GREEN_BOLD%}$(git_current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}' diff --git a/.oh-my-zsh/themes/junkfood.zsh-theme b/.oh-my-zsh/themes/junkfood.zsh-theme new file mode 100644 index 0000000..01fae4b --- /dev/null +++ b/.oh-my-zsh/themes/junkfood.zsh-theme @@ -0,0 +1,30 @@ +# Totally ripped off Dallas theme + +# Grab the current date (%W) and time (%t): +JUNKFOOD_TIME_="%{$fg_bold[red]%}#%{$fg_bold[white]%}( %{$fg_bold[yellow]%}%W%{$reset_color%}@%{$fg_bold[white]%}%t )( %{$reset_color%}" + +# Grab the current machine name +JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%} ):%{$reset_color%}" + +# Grab the current username +JUNKFOOD_CURRENT_USER_="%{$fg_bold[green]%}%n%{$reset_color%}" + +# Grab the current filepath, use shortcuts: ~/Desktop +# Append the current git branch, if in a git repository: ~aw@master +JUNKFOOD_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}" + +# For the git prompt, use a white @ and blue text for the branch name +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}@%{$fg_bold[white]%}" + +# Close it all off by resetting the color and styles. +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" + +# Do nothing if the branch is clean (no changes). +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✔" + +# Add 3 cyan ✗s if this branch is diiirrrty! Dirty branch! +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✗✗✗" + +# Put it all together! +PROMPT="$JUNKFOOD_TIME_$JUNKFOOD_CURRENT_USER_@$JUNKFOOD_MACHINE_$JUNKFOOD_LOCA_ + " diff --git a/.oh-my-zsh/themes/kafeitu.zsh-theme b/.oh-my-zsh/themes/kafeitu.zsh-theme new file mode 100644 index 0000000..c4720b2 --- /dev/null +++ b/.oh-my-zsh/themes/kafeitu.zsh-theme @@ -0,0 +1,6 @@ +PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n%{$fg[cyan]%}@%{$fg_bold[green]%}%m %{$fg_bold[green]%}%p %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/.oh-my-zsh/themes/kardan.zsh-theme b/.oh-my-zsh/themes/kardan.zsh-theme new file mode 100644 index 0000000..9a3d591 --- /dev/null +++ b/.oh-my-zsh/themes/kardan.zsh-theme @@ -0,0 +1,12 @@ +# Simple theme based on my old zsh settings. + +function get_host { + echo '@'$HOST +} + +PROMPT='> ' +RPROMPT='%~$(git_prompt_info)$(get_host)' + +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_PREFIX="(" +ZSH_THEME_GIT_PROMPT_SUFFIX=")" \ No newline at end of file diff --git a/.oh-my-zsh/themes/kennethreitz.zsh-theme b/.oh-my-zsh/themes/kennethreitz.zsh-theme new file mode 100644 index 0000000..b255a8d --- /dev/null +++ b/.oh-my-zsh/themes/kennethreitz.zsh-theme @@ -0,0 +1,15 @@ +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +PROMPT='$(virtualenv_prompt_info)%{%}%{$fg[green]%}%c \ +$(git_prompt_info)\ +\ +%{$fg[red]%}%(!.#.»)%{$reset_color%} ' +PROMPT2='%{$fg[red]%}\ %{$reset_color%}' +RPS1='%{$fg[blue]%}%~%{$reset_color%} ${return_code} ' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[yellow]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$fg[yellow]%}" +ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX="%{$reset_color%}%{%}%{$fg[blue]%}" +ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX="!%{$reset_color%} " \ No newline at end of file diff --git a/.oh-my-zsh/themes/kiwi.zsh-theme b/.oh-my-zsh/themes/kiwi.zsh-theme new file mode 100644 index 0000000..f93de2b --- /dev/null +++ b/.oh-my-zsh/themes/kiwi.zsh-theme @@ -0,0 +1,12 @@ +# +# Kiwi ZSH Theme +# + +PROMPT='%{$fg_bold[green]%}┌[%{$fg_bold[cyan]%}kiwish-4.2%{$fg_bold[green]%}]-(%{$fg_bold[white]%}%2~%{$fg_bold[green]%})-$(git_prompt_info)$(svn_prompt_info)$(battery_pct_prompt) +└> % %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="[%{$reset_color%}%{$fg[white]%}git:%{$fg_bold[white]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[green]%}]-" + +ZSH_THEME_SVN_PROMPT_PREFIX="[%{$reset_color%}%{$fg[white]%}svn:%{$fg_bold[white]%}/" +ZSH_THEME_SVN_PROMPT_SUFFIX="%{$fg_bold[green]%}]-" diff --git a/.oh-my-zsh/themes/kolo.zsh-theme b/.oh-my-zsh/themes/kolo.zsh-theme new file mode 100644 index 0000000..51b0af7 --- /dev/null +++ b/.oh-my-zsh/themes/kolo.zsh-theme @@ -0,0 +1,22 @@ +autoload -Uz vcs_info + +zstyle ':vcs_info:*' stagedstr '%F{green}●' +zstyle ':vcs_info:*' unstagedstr '%F{yellow}●' +zstyle ':vcs_info:*' check-for-changes true +zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r' +zstyle ':vcs_info:*' enable git svn +theme_precmd () { + if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] { + zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]' + } else { + zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]' + } + + vcs_info +} + +setopt prompt_subst +PROMPT='%B%F{magenta}%c%B%F{green}${vcs_info_msg_0_}%B%F{magenta} %{$reset_color%}%% ' + +autoload -U add-zsh-hook +add-zsh-hook precmd theme_precmd diff --git a/.oh-my-zsh/themes/kphoen.zsh-theme b/.oh-my-zsh/themes/kphoen.zsh-theme new file mode 100644 index 0000000..8e8894a --- /dev/null +++ b/.oh-my-zsh/themes/kphoen.zsh-theme @@ -0,0 +1,43 @@ +# kphoen.zsh-theme + +if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then + PROMPT='[%{$fg[red]%}%n%{$reset_color%}@%{$fg[magenta]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%}$(git_prompt_info)] +%# ' + + ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}" + ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" + ZSH_THEME_GIT_PROMPT_DIRTY="" + ZSH_THEME_GIT_PROMPT_CLEAN="" + + # display exitcode on the right when >0 + return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + + RPROMPT='${return_code}$(git_prompt_status)%{$reset_color%}' + + ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚" + ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹" + ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" + ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜" + ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═" + ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" +else + PROMPT='[%n@%m:%~$(git_prompt_info)] +%# ' + + ZSH_THEME_GIT_PROMPT_PREFIX=" on" + ZSH_THEME_GIT_PROMPT_SUFFIX="" + ZSH_THEME_GIT_PROMPT_DIRTY="" + ZSH_THEME_GIT_PROMPT_CLEAN="" + + # display exitcode on the right when >0 + return_code="%(?..%? ↵)" + + RPROMPT='${return_code}$(git_prompt_status)' + + ZSH_THEME_GIT_PROMPT_ADDED=" ✚" + ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹" + ZSH_THEME_GIT_PROMPT_DELETED=" ✖" + ZSH_THEME_GIT_PROMPT_RENAMED=" ➜" + ZSH_THEME_GIT_PROMPT_UNMERGED=" ═" + ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭" +fi diff --git a/.oh-my-zsh/themes/lambda.zsh-theme b/.oh-my-zsh/themes/lambda.zsh-theme new file mode 100644 index 0000000..63292d3 --- /dev/null +++ b/.oh-my-zsh/themes/lambda.zsh-theme @@ -0,0 +1,6 @@ +# ZSH Theme - Preview: http://cl.ly/350F0F0k1M2y3A2i3p1S + +PROMPT='λ %~/ $(git_prompt_info)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " diff --git a/.oh-my-zsh/themes/linuxonly.zsh-theme b/.oh-my-zsh/themes/linuxonly.zsh-theme new file mode 100644 index 0000000..f9e0aa0 --- /dev/null +++ b/.oh-my-zsh/themes/linuxonly.zsh-theme @@ -0,0 +1,79 @@ +# vim: set ts=2 textwidth=0 + +autoload -U add-zsh-hook +autoload -Uz vcs_info +local c0=$(printf "\033[0m") +local c1=$(printf "\033[38;5;215m") +local c2=$(printf "\033[38;5;209m") +local c3=$(printf "\033[38;5;203m") +local c4=$(printf "\033[33;4m") +local c5=$(printf "\033[38;5;137m") +local c6=$(printf "\033[38;5;240m") +local c7=$(printf "\033[38;5;149m") +local c8=$(printf "\033[38;5;126m") +local c9=$(printf "\033[38;5;162m") + + +if [ "$TERM" = "linux" ]; then + c1=$(printf "\033[34;1m") + c2=$(printf "\033[35m") + c3=$(printf "\033[31m") + c4=$(printf "\033[31;1m") + c5=$(printf "\033[32m") + c6=$(printf "\033[32;1m") + c7=$(printf "\033[33m") + c8=$(printf "\033[33;1m") + c9=$(printf "\033[34m") +fi + +#local newtv=$(perl $HOME/devel/newtv.pl) +local newtv='' + +zstyle ':vcs_info:*' actionformats \ + '%{$c8%}(%f%s)%{$c7%}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f ' +zstyle ':vcs_info:*' formats \ + "%{$c8%}%s%{$c7%}:%{$c7%}(%{$c9%}%b%{$c7%})%f " +zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r' +zstyle ':vcs_info:*' enable git + +add-zsh-hook precmd prompt_jnrowe_precmd + +prompt_jnrowe_precmd () { + vcs_info + + if [ "${vcs_info_msg_0_}" = "" ]; then + #dir_status="|%F{3}%n%F{7}@%F{3}%m%F{7}:%F{9}%l%f" + #dir_status="$c1%n%F{7}@%F{9}%m%F{7}:%F{12}%/" + dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})" + #dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$foopath%} %{$c0%}(%{$c5%}%?%{$c0%})" + + PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%} +> ' + elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then + dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})" + PROMPT='${vcs_info_msg_0_} +%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%} +> ' + + elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then + dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})" + + PROMPT='${vcs_info_msg_0_} +%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%} +%{$c9%}·>%{$c0%} ' + else + dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})" + PROMPT='${vcs_info_msg_0_} +%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%} +> ' + + fi +} + + +#PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$reset_color%} ${vcs_info_msg_0_}${dir_status}%{$reset_color%} +#> ' + +# vim: set ft=zsh ts=4 sw=4 et: + + diff --git a/.oh-my-zsh/themes/lukerandall.zsh-theme b/.oh-my-zsh/themes/lukerandall.zsh-theme new file mode 100644 index 0000000..f4045bd --- /dev/null +++ b/.oh-my-zsh/themes/lukerandall.zsh-theme @@ -0,0 +1,24 @@ +# ZSH Theme - Preview: http://cl.ly/f701d00760f8059e06dc +# Thanks to gallifrey, upon whose theme this is based + +local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})" + +function my_git_prompt_info() { + ref=$(git symbolic-ref HEAD 2> /dev/null) || return + GIT_STATUS=$(git_prompt_status) + [[ -n $GIT_STATUS ]] && GIT_STATUS=" $GIT_STATUS" + echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX" +} + +PROMPT='%{$fg_bold[green]%}%n@%m%{$reset_color%} %{$fg_bold[blue]%}%2~%{$reset_color%} $(my_git_prompt_info)%{$reset_color%}%B»%b ' +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%%" +ZSH_THEME_GIT_PROMPT_ADDED="+" +ZSH_THEME_GIT_PROMPT_MODIFIED="*" +ZSH_THEME_GIT_PROMPT_RENAMED="~" +ZSH_THEME_GIT_PROMPT_DELETED="!" +ZSH_THEME_GIT_PROMPT_UNMERGED="?" + diff --git a/.oh-my-zsh/themes/macovsky-ruby.zsh-theme b/.oh-my-zsh/themes/macovsky-ruby.zsh-theme new file mode 100644 index 0000000..69d80d5 --- /dev/null +++ b/.oh-my-zsh/themes/macovsky-ruby.zsh-theme @@ -0,0 +1,15 @@ +# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +if [ -e ~/.rvm/bin/rvm-prompt ]; then + PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b ' +else + if which rbenv &> /dev/null; then + PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b ' + fi +fi + +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" diff --git a/.oh-my-zsh/themes/macovsky.zsh-theme b/.oh-my-zsh/themes/macovsky.zsh-theme new file mode 100644 index 0000000..2e6dce4 --- /dev/null +++ b/.oh-my-zsh/themes/macovsky.zsh-theme @@ -0,0 +1,14 @@ +# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +if [ -e ~/.rvm/bin/rvm-prompt ]; then + PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b ' +else + if which rbenv &> /dev/null; then + PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b ' + fi +fi +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" diff --git a/.oh-my-zsh/themes/maran.zsh-theme b/.oh-my-zsh/themes/maran.zsh-theme new file mode 100644 index 0000000..6fba046 --- /dev/null +++ b/.oh-my-zsh/themes/maran.zsh-theme @@ -0,0 +1,6 @@ +# Theme with full path names and hostname +# Handy if you work on different servers all the time; +PROMPT='%{$fg[cyan]%}%n%{$reset_color%}@%{$fg[yellow]%}%M:%{$fg[green]%}%/%{$reset_color%} $(git_prompt_info) %(!.#.$) ' + +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}git:(" +ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}" diff --git a/.oh-my-zsh/themes/mgutz.zsh-theme b/.oh-my-zsh/themes/mgutz.zsh-theme new file mode 100644 index 0000000..dcf3270 --- /dev/null +++ b/.oh-my-zsh/themes/mgutz.zsh-theme @@ -0,0 +1,6 @@ +PROMPT='%{$fg_bold[magenta]%}%1~$(git_prompt_info) %{$fg_bold[magenta]%}%# %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%}[" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="*]" +ZSH_THEME_GIT_PROMPT_CLEAN="]" diff --git a/.oh-my-zsh/themes/mh.zsh-theme b/.oh-my-zsh/themes/mh.zsh-theme new file mode 100644 index 0000000..34a3765 --- /dev/null +++ b/.oh-my-zsh/themes/mh.zsh-theme @@ -0,0 +1,24 @@ +# mh theme +# preview: http://cl.ly/1y2x0W0E3t2C0F29043z + +# features: +# path is autoshortened to ~30 characters +# displays git status (if applicable in current folder) +# turns username green if superuser, otherwise it is white + +# if superuser make the username green +if [ $UID -eq 0 ]; then NCOLOR="green"; else NCOLOR="white"; fi + +# prompt +PROMPT='[%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[red]%}%30<...<%~%<<%{$reset_color%}]%(!.#.$) ' +RPROMPT='$(git_prompt_info)' + +# git theming +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[gray]%}(%{$fg_no_bold[yellow]%}%B" +ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[gray]%})%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}✱" + +# LS colors, made with http://geoff.greer.fm/lscolors/ +export LSCOLORS="Gxfxcxdxbxegedabagacad" +export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' diff --git a/.oh-my-zsh/themes/michelebologna.zsh-theme b/.oh-my-zsh/themes/michelebologna.zsh-theme new file mode 100644 index 0000000..110e3f2 --- /dev/null +++ b/.oh-my-zsh/themes/michelebologna.zsh-theme @@ -0,0 +1,75 @@ +# Michele Bologna's theme +# http://michelebologna.net +# +# This a theme for oh-my-zsh. Features a colored prompt with: +# * username@host: [jobs] [git] workdir % +# * hostname color is based on hostname characters. When using as root, the +# prompt shows only the hostname in red color. +# * [jobs], if applicable, counts the number of suspended jobs tty +# * [git], if applicable, represents the status of your git repo (more on that +# later) +# * '%' prompt will be green if last command return value is 0, yellow otherwise. +# +# git prompt is inspired by official git contrib prompt: +# https://github.com/git/git/tree/master/contrib/completion/git-prompt.sh +# and it adds: +# * the current branch +# * '%' if there are untracked files +# * '$' if there are stashed changes +# * '*' if there are modified files +# * '+' if there are added files +# * '<' if local repo is behind remote repo +# * '>' if local repo is ahead remote repo +# * '=' if local repo is equal to remote repo (in sync) +# * '<>' if local repo is diverged + +local green="%{$fg_bold[green]%}" +local red="%{$fg_bold[red]%}" +local cyan="%{$fg_bold[cyan]%}" +local yellow="%{$fg_bold[yellow]%}" +local blue="%{$fg_bold[blue]%}" +local magenta="%{$fg_bold[magenta]%}" +local white="%{$fg_bold[white]%}" +local reset="%{$reset_color%}" + +local -a color_array +color_array=($green $red $cyan $yellow $blue $magenta $white) + +local username_normal_color=$white +local username_root_color=$red +local hostname_root_color=$red + +# calculating hostname color with hostname characters +for i in `hostname`; local hostname_normal_color=$color_array[$[((#i))%7+1]] +local -a hostname_color +hostname_color=%(!.$hostname_root_color.$hostname_normal_color) + +local current_dir_color=$blue +local username_command="%n" +local hostname_command="%m" +local current_dir="%~" + +local username_output="%(!..$username_normal_color$username_command$reset@)" +local hostname_output="$hostname_color$hostname_command$reset" +local current_dir_output="$current_dir_color$current_dir$reset" +local jobs_bg="${red}fg: %j$reset" +local last_command_output="%(?.%(!.$red.$green).$yellow)" + +ZSH_THEME_GIT_PROMPT_PREFIX="" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY="" +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_UNTRACKED="$blue%%" +ZSH_THEME_GIT_PROMPT_MODIFIED="$red*" +ZSH_THEME_GIT_PROMPT_ADDED="$green+" +ZSH_THEME_GIT_PROMPT_STASHED="$blue$" +ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="$green=" +ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=">" +ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="<" +ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="$red<>" + +PROMPT='$username_output$hostname_output:$current_dir_output%1(j. [$jobs_bg].)' +GIT_PROMPT='$(out=$(git_prompt_info)$(git_prompt_status)$(git_remote_status);if [[ -n $out ]]; then printf %s " $white($green$out$white)$reset";fi)' +PROMPT+="$GIT_PROMPT" +PROMPT+=" $last_command_output%#$reset " +RPROMPT='' diff --git a/.oh-my-zsh/themes/mikeh.zsh-theme b/.oh-my-zsh/themes/mikeh.zsh-theme new file mode 100644 index 0000000..a95383b --- /dev/null +++ b/.oh-my-zsh/themes/mikeh.zsh-theme @@ -0,0 +1,21 @@ +setopt prompt_subst + +autoload -U add-zsh-hook +autoload -Uz vcs_info + +# check-for-changes can be really slow. +# you should disable it, if you work with large repositories +zstyle ':vcs_info:*:prompt:*' check-for-changes true + +add-zsh-hook precmd mikeh_precmd + +mikeh_precmd() { + vcs_info +} + +# user, host, full path, and time/date +# on two lines for easier vgrepping +# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888 +PROMPT=$'%{\e[0;34m%}%B..[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %I:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%} +%{\e[0;34m%}%B..%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <($vcs_info_msg_0_)>%{\e[0m%}%b ' +PS2=$' \e[0;34m%}%B>%{\e[0m%}%b ' \ No newline at end of file diff --git a/.oh-my-zsh/themes/miloshadzic.zsh-theme b/.oh-my-zsh/themes/miloshadzic.zsh-theme new file mode 100644 index 0000000..ad53944 --- /dev/null +++ b/.oh-my-zsh/themes/miloshadzic.zsh-theme @@ -0,0 +1,8 @@ +# Yay! High voltage and arrows! + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +PROMPT='%{$fg[cyan]%}%1~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}$(git_prompt_info)%{$fg[cyan]%}⇒%{$reset_color%} ' diff --git a/.oh-my-zsh/themes/minimal.zsh-theme b/.oh-my-zsh/themes/minimal.zsh-theme new file mode 100644 index 0000000..e05df9c --- /dev/null +++ b/.oh-my-zsh/themes/minimal.zsh-theme @@ -0,0 +1,24 @@ +ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}[" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$fg[white]%}]%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="]%{$reset_color%} " +ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX +ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX +ZSH_THEME_SVN_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY +ZSH_THEME_SVN_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN +ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX +ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX +ZSH_THEME_HG_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY +ZSH_THEME_HG_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN + +vcs_status() { + if [[ $(whence in_svn) != "" ]] && in_svn; then + svn_prompt_info + elif [[ $(whence in_hg) != "" ]] && in_hg; then + hg_prompt_info + else + git_prompt_info + fi +} + +PROMPT='%2~ $(vcs_status)»%b ' diff --git a/.oh-my-zsh/themes/mira.zsh-theme b/.oh-my-zsh/themes/mira.zsh-theme new file mode 100644 index 0000000..e6c9529 --- /dev/null +++ b/.oh-my-zsh/themes/mira.zsh-theme @@ -0,0 +1,29 @@ +# Based on bira zsh theme with nvm, rvm and jenv support +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}' +local current_dir='%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}' + +local rvm_ruby='' +if which rvm-prompt &> /dev/null; then + rvm_ruby='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$reset_color%}' +else + if which rbenv &> /dev/null; then + rvm_ruby='%{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}' + fi +fi + +local nvm_node='' +nvm_node='%{$fg[green]%}‹node-$(nvm_prompt_info)›%{$reset_color%}' + +local jenv_java='' +jenv_java='%{$fg[blue]%}‹$(jenv_prompt_info)›%{$reset_color%}' + +local git_branch='$(git_prompt_info)%{$reset_color%}' + +PROMPT="╭─${user_host} ${current_dir} ${nvm_node} ${rvm_ruby} ${jenv_java} ${git_branch} +╰─%B$%b " +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}" diff --git a/.oh-my-zsh/themes/mortalscumbag.zsh-theme b/.oh-my-zsh/themes/mortalscumbag.zsh-theme new file mode 100644 index 0000000..55ece97 --- /dev/null +++ b/.oh-my-zsh/themes/mortalscumbag.zsh-theme @@ -0,0 +1,59 @@ +function my_git_prompt() { + tester=$(git rev-parse --git-dir 2> /dev/null) || return + + INDEX=$(git status --porcelain 2> /dev/null) + STATUS="" + + # is branch ahead? + if $(echo "$(git log origin/$(git_current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD" + fi + + # is anything staged? + if $(echo "$INDEX" | command grep -E -e '^(D[ M]|[MARC][ MD]) ' &> /dev/null); then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED" + fi + + # is anything unstaged? + if $(echo "$INDEX" | command grep -E -e '^[ MARC][MD] ' &> /dev/null); then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED" + fi + + # is anything untracked? + if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED" + fi + + # is anything unmerged? + if $(echo "$INDEX" | command grep -E -e '^(A[AU]|D[DU]|U[ADU]) ' &> /dev/null); then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED" + fi + + if [[ -n $STATUS ]]; then + STATUS=" $STATUS" + fi + + echo "$ZSH_THEME_GIT_PROMPT_PREFIX$(my_current_branch)$STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX" +} + +function my_current_branch() { + echo $(git_current_branch || echo "(no branch)") +} + +function ssh_connection() { + if [[ -n $SSH_CONNECTION ]]; then + echo "%{$fg_bold[red]%}(ssh) " + fi +} + +local ret_status="%(?:%{$fg_bold[green]%}:%{$fg_bold[red]%})%?%{$reset_color%}" +PROMPT=$'\n$(ssh_connection)%{$fg_bold[green]%}%n@%m%{$reset_color%}$(my_git_prompt) : %~\n[${ret_status}] %# ' + +ZSH_THEME_PROMPT_RETURNCODE_PREFIX="%{$fg_bold[red]%}" +ZSH_THEME_GIT_PROMPT_PREFIX=" $fg[white]‹ %{$fg_bold[yellow]%}" +ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg_bold[magenta]%}↑" +ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●" +ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[red]%}●" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[white]%}●" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[red]%}✕" +ZSH_THEME_GIT_PROMPT_SUFFIX=" $fg_bold[white]›%{$reset_color%}" diff --git a/.oh-my-zsh/themes/mrtazz.zsh-theme b/.oh-my-zsh/themes/mrtazz.zsh-theme new file mode 100644 index 0000000..214ba5a --- /dev/null +++ b/.oh-my-zsh/themes/mrtazz.zsh-theme @@ -0,0 +1,7 @@ +PROMPT='%{$fg_bold[red]%}%m%{$reset_color%}:%{$fg[cyan]%}%c%{$reset_color%}:%# ' +RPROMPT='%{$fg_bold[green]%}$(git_prompt_info)%{$reset_color%}% ' + +ZSH_THEME_GIT_PROMPT_PREFIX="<%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}✗%{$fg[green]%}>%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}>" diff --git a/.oh-my-zsh/themes/murilasso.zsh-theme b/.oh-my-zsh/themes/murilasso.zsh-theme new file mode 100644 index 0000000..bc2b9b2 --- /dev/null +++ b/.oh-my-zsh/themes/murilasso.zsh-theme @@ -0,0 +1,14 @@ +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" +local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}' +local current_dir='%{$terminfo[bold]$fg[blue]%}%~%{$reset_color%}' +local rvm_ruby='%{$fg[red]%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%}' +local git_branch='%{$fg[blue]%}$(git_prompt_info)%{$reset_color%}' + +PROMPT="${user_host}:${current_dir} ${rvm_ruby} +${git_branch} %B$%b " +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔%{$reset_color%}" diff --git a/.oh-my-zsh/themes/muse.zsh-theme b/.oh-my-zsh/themes/muse.zsh-theme new file mode 100644 index 0000000..c7cd9ee --- /dev/null +++ b/.oh-my-zsh/themes/muse.zsh-theme @@ -0,0 +1,33 @@ +#!/usr/bin/env zsh +#local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +setopt promptsubst + +autoload -U add-zsh-hook + +PROMPT_SUCCESS_COLOR=$FG[117] +PROMPT_FAILURE_COLOR=$FG[124] +PROMPT_VCS_INFO_COLOR=$FG[242] +PROMPT_PROMPT=$FG[077] +GIT_DIRTY_COLOR=$FG[133] +GIT_CLEAN_COLOR=$FG[118] +GIT_PROMPT_INFO=$FG[012] + +PROMPT='%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%}%{$GIT_PROMPT_INFO%}$(git_prompt_info)$(virtualenv_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}ᐅ%{$reset_color%} ' + +#RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX=" (" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%})" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔" + +ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[082]%}✚%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[166]%}✹%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[160]%}✖%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}➜%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}═%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[190]%}✭%{$reset_color%}" + +ZSH_THEME_VIRTUALENV_PREFIX=" [" +ZSH_THEME_VIRTUALENV_SUFFIX="]" diff --git a/.oh-my-zsh/themes/nanotech.zsh-theme b/.oh-my-zsh/themes/nanotech.zsh-theme new file mode 100644 index 0000000..5d33316 --- /dev/null +++ b/.oh-my-zsh/themes/nanotech.zsh-theme @@ -0,0 +1,7 @@ +PROMPT='%F{green}%2c%F{blue} [%f ' +RPROMPT='$(git_prompt_info) %F{blue}] %F{green}%D{%L:%M} %F{yellow}%D{%p}%f' + +ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%f" +ZSH_THEME_GIT_PROMPT_DIRTY=" %F{red}*%f" +ZSH_THEME_GIT_PROMPT_CLEAN="" diff --git a/.oh-my-zsh/themes/nebirhos.zsh-theme b/.oh-my-zsh/themes/nebirhos.zsh-theme new file mode 100644 index 0000000..e242446 --- /dev/null +++ b/.oh-my-zsh/themes/nebirhos.zsh-theme @@ -0,0 +1,21 @@ +# Based on robbyrussell's theme, with host and rvm indicators. Example: +# @host ➜ currentdir rvm:(rubyversion@gemset) git:(branchname) + +# Get the current ruby version in use with RVM: +if [ -e ~/.rvm/bin/rvm-prompt ]; then + RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(~/.rvm/bin/rvm-prompt s i v g)%{$fg_bold[blue]%})%{$reset_color%} " +else + if which rbenv &> /dev/null; then + RUBY_PROMPT_="%{$fg_bold[blue]%}rbenv:(%{$fg[green]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg_bold[blue]%})%{$reset_color%} " + fi +fi + +# Get the host name (first 4 chars) +HOST_PROMPT_="%{$fg_bold[red]%}@$HOST ➜ %{$fg_bold[cyan]%}%c " +GIT_PROMPT="%{$fg_bold[blue]%}\$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}" +PROMPT="$HOST_PROMPT_$RUBY_PROMPT_$GIT_PROMPT" + +ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/.oh-my-zsh/themes/nicoulaj.zsh-theme b/.oh-my-zsh/themes/nicoulaj.zsh-theme new file mode 100644 index 0000000..333aa5e --- /dev/null +++ b/.oh-my-zsh/themes/nicoulaj.zsh-theme @@ -0,0 +1,43 @@ +#!/usr/bin/env zsh +# ------------------------------------------------------------------------------ +# Prompt for the Zsh shell: +# * One line. +# * VCS info on the right prompt. +# * Only shows the path on the left prompt by default. +# * Crops the path to a defined length and only shows the path relative to +# the current VCS repository root. +# * Wears a different color wether the last command succeeded/failed. +# * Shows user@hostname if connected through SSH. +# * Shows if logged in as root or not. +# ------------------------------------------------------------------------------ + +# Customizable parameters. +PROMPT_PATH_MAX_LENGTH=30 +PROMPT_DEFAULT_END=❯ +PROMPT_ROOT_END=❯❯❯ +PROMPT_SUCCESS_COLOR=$FG[071] +PROMPT_FAILURE_COLOR=$FG[124] +PROMPT_VCS_INFO_COLOR=$FG[242] + +# Set required options. +setopt promptsubst + +# Load required modules. +autoload -U add-zsh-hook +autoload -Uz vcs_info + +# Add hook for calling vcs_info before each command. +add-zsh-hook precmd vcs_info + +# Set vcs_info parameters. +zstyle ':vcs_info:*' enable hg bzr git +zstyle ':vcs_info:*:*' check-for-changes true # Can be slow on big repos. +zstyle ':vcs_info:*:*' unstagedstr '!' +zstyle ':vcs_info:*:*' stagedstr '+' +zstyle ':vcs_info:*:*' actionformats "%S" "%r/%s/%b %u%c (%a)" +zstyle ':vcs_info:*:*' formats "%S" "%r/%s/%b %u%c" +zstyle ':vcs_info:*:*' nvcsformats "%~" "" + +# Define prompts. +PROMPT="%(0?.%{$PROMPT_SUCCESS_COLOR%}.%{$PROMPT_FAILURE_COLOR%})${SSH_TTY:+[%n@%m]}%{$FX[bold]%}%$PROMPT_PATH_MAX_LENGTH<..<"'${vcs_info_msg_0_%%.}'"%<<%(!.$PROMPT_ROOT_END.$PROMPT_DEFAULT_END)%{$FX[no-bold]%}%{$FX[reset]%} " +RPROMPT="%{$PROMPT_VCS_INFO_COLOR%}"'$vcs_info_msg_1_'"%{$FX[reset]%}" diff --git a/.oh-my-zsh/themes/norm.zsh-theme b/.oh-my-zsh/themes/norm.zsh-theme new file mode 100644 index 0000000..13077cc --- /dev/null +++ b/.oh-my-zsh/themes/norm.zsh-theme @@ -0,0 +1,4 @@ +PROMPT='%{$fg[yellow]%}λ %m %{$fg[green]%}%c %{$fg[yellow]%}→ $(git_prompt_info)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="λ %{$fg[blue]%}git %{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[yellow]%} → %{$reset_color%}" diff --git a/.oh-my-zsh/themes/obraun.zsh-theme b/.oh-my-zsh/themes/obraun.zsh-theme new file mode 100644 index 0000000..7af4405 --- /dev/null +++ b/.oh-my-zsh/themes/obraun.zsh-theme @@ -0,0 +1,11 @@ +if [ "$USER" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi + +local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +PROMPT='%{$fg[green]%}[%*]%{$reset_color%} %{$fg_no_bold[cyan]%}%n %{${fg_bold[blue]}%}::%{$reset_color%} %{$fg[yellow]%}%m%{$reset_color%} %{$fg_no_bold[magenta]%} ➜ %{$reset_color%} %{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}»%{${reset_color}%} ' + +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}" + diff --git a/.oh-my-zsh/themes/peepcode.zsh-theme b/.oh-my-zsh/themes/peepcode.zsh-theme new file mode 100644 index 0000000..b6dfa68 --- /dev/null +++ b/.oh-my-zsh/themes/peepcode.zsh-theme @@ -0,0 +1,44 @@ +# +# Based on Geoffrey Grosenbach's peepcode zsh theme from +# https://github.com/topfunky/zsh-simple +# + +git_repo_path() { + git rev-parse --git-dir 2>/dev/null +} + +git_commit_id() { + git rev-parse --short HEAD 2>/dev/null +} + +git_mode() { + if [[ -e "$repo_path/BISECT_LOG" ]]; then + echo "+bisect" + elif [[ -e "$repo_path/MERGE_HEAD" ]]; then + echo "+merge" + elif [[ -e "$repo_path/rebase" || -e "$repo_path/rebase-apply" || -e "$repo_path/rebase-merge" || -e "$repo_path/../.dotest" ]]; then + echo "+rebase" + fi +} + +git_dirty() { + if [[ "$repo_path" != '.' && `git ls-files -m` != "" ]]; then + echo " %{$fg_bold[grey]%}✗%{$reset_color%}" + fi +} + +git_prompt() { + local cb=$(git_current_branch) + if [ -n "$cb" ]; then + local repo_path=$(git_repo_path) + echo " %{$fg_bold[grey]%}$cb %{$fg[white]%}$(git_commit_id)%{$reset_color%}$(git_mode)$(git_dirty)" + fi +} + +local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})" + +PROMPT=' +%~ +${smiley} %{$reset_color%}' + +RPROMPT='%{$fg[white]%} $(ruby_prompt_info)$(git_prompt)%{$reset_color%}' diff --git a/.oh-my-zsh/themes/philips.zsh-theme b/.oh-my-zsh/themes/philips.zsh-theme new file mode 100644 index 0000000..f6e5b32 --- /dev/null +++ b/.oh-my-zsh/themes/philips.zsh-theme @@ -0,0 +1,14 @@ +if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi + +PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) ' +RPROMPT='[%*]' + +# git theming +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}%B" +ZSH_THEME_GIT_PROMPT_SUFFIX="%b%{$fg_bold[blue]%})%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_DIRTY="*" + +# LS colors, made with http://geoff.greer.fm/lscolors/ +export LSCOLORS="Gxfxcxdxbxegedabagacad" +export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:*.patch=00;34:*.o=00;32:*.so=01;35:*.ko=01;31:*.la=00;33' diff --git a/.oh-my-zsh/themes/pmcgee.zsh-theme b/.oh-my-zsh/themes/pmcgee.zsh-theme new file mode 100644 index 0000000..e4e45c7 --- /dev/null +++ b/.oh-my-zsh/themes/pmcgee.zsh-theme @@ -0,0 +1,16 @@ +if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi + +PROMPT=' +%{$fg[$NCOLOR]%}%B%n@%m%b%{$reset_color%} %{$fg[white]%}%B${PWD/#$HOME/~}%b%{$reset_color%} +$(git_prompt_info)%(!.#.$) ' +RPROMPT='[%*]' + +# git theming +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_no_bold[yellow]%}%B" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}*" + +# LS colors, made with http://geoff.greer.fm/lscolors/ +export LSCOLORS="Gxfxcxdxbxegedabagacad" +export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' diff --git a/.oh-my-zsh/themes/pure.zsh-theme b/.oh-my-zsh/themes/pure.zsh-theme new file mode 100644 index 0000000..98c1312 --- /dev/null +++ b/.oh-my-zsh/themes/pure.zsh-theme @@ -0,0 +1,10 @@ +print -P '%F{yellow}'Oh My Zsh pure theme: +cat <<-EOF + + The pure theme has been renamed as 'refined' as per the original author's + request. Change your ZSH_THEME to 'refined' to avoid seeing this warning. + +EOF +print -P '%f' + +source ${0:h:A}/refined.zsh-theme diff --git a/.oh-my-zsh/themes/pygmalion.zsh-theme b/.oh-my-zsh/themes/pygmalion.zsh-theme new file mode 100644 index 0000000..5f5fe7f --- /dev/null +++ b/.oh-my-zsh/themes/pygmalion.zsh-theme @@ -0,0 +1,34 @@ +# Yay! High voltage and arrows! + +prompt_setup_pygmalion(){ + ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}" + ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " + ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}" + ZSH_THEME_GIT_PROMPT_CLEAN="" + + base_prompt='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}' + post_prompt='%{$fg[cyan]%}⇒%{$reset_color%} ' + + base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g") + post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g") + + precmd_functions+=(prompt_pygmalion_precmd) +} + +prompt_pygmalion_precmd(){ + local gitinfo=$(git_prompt_info) + local gitinfo_nocolor=$(echo "$gitinfo" | perl -pe "s/%\{[^}]+\}//g") + local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")" + local prompt_length=${#exp_nocolor} + + local nl="" + + if [[ $prompt_length -gt 40 ]]; then + nl=$'\n%{\r%}'; + fi + PROMPT="$base_prompt$gitinfo$nl$post_prompt" +} + +prompt_setup_pygmalion + + diff --git a/.oh-my-zsh/themes/re5et.zsh-theme b/.oh-my-zsh/themes/re5et.zsh-theme new file mode 100644 index 0000000..95af1e2 --- /dev/null +++ b/.oh-my-zsh/themes/re5et.zsh-theme @@ -0,0 +1,15 @@ +if [ "$USER" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="magenta"; fi + +local return_code="%(?..%{$fg_bold[red]%}:( %?%{$reset_color%})" + +PROMPT=' +%{$fg_bold[cyan]%}%n%{$reset_color%}%{$fg[yellow]%}@%{$reset_color%}%{$fg_bold[blue]%}%m%{$reset_color%}:%{${fg_bold[green]}%}%~%{$reset_color%}$(git_prompt_info) +%{${fg[$CARETCOLOR]}%}%# %{${reset_color}%}' + +RPS1='${return_code} %D - %*' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[magenta]%}^%{$reset_color%}%{$fg_bold[yellow]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%} ±" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ?" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[red]%} ♥" diff --git a/.oh-my-zsh/themes/refined.zsh-theme b/.oh-my-zsh/themes/refined.zsh-theme new file mode 100644 index 0000000..0e5681c --- /dev/null +++ b/.oh-my-zsh/themes/refined.zsh-theme @@ -0,0 +1,106 @@ +#!/usr/bin/env zsh + +# ------------------------------------------------------------------------------ +# +# Pure - A minimal and beautiful theme for oh-my-zsh +# +# Based on the custom Zsh-prompt of the same name by Sindre Sorhus. A huge +# thanks goes out to him for designing the fantastic Pure prompt in the first +# place! I'd also like to thank Julien Nicoulaud for his "nicoulaj" theme from +# which I've borrowed both some ideas and some actual code. You can find out +# more about both of these fantastic two people here: +# +# Sindre Sorhus +# Github: https://github.com/sindresorhus +# Twitter: https://twitter.com/sindresorhus +# +# Julien Nicoulaud +# Github: https://github.com/nicoulaj +# Twitter: https://twitter.com/nicoulaj +# +# ------------------------------------------------------------------------------ + +# Set required options +# +setopt prompt_subst + +# Load required modules +# +autoload -Uz vcs_info + +# Set vcs_info parameters +# +zstyle ':vcs_info:*' enable hg bzr git +zstyle ':vcs_info:*:*' unstagedstr '!' +zstyle ':vcs_info:*:*' stagedstr '+' +zstyle ':vcs_info:*:*' formats "$FX[bold]%r$FX[no-bold]/%S" "%s/%b" "%%u%c" +zstyle ':vcs_info:*:*' actionformats "$FX[bold]%r$FX[no-bold]/%S" "%s/%b" "%u%c (%a)" +zstyle ':vcs_info:*:*' nvcsformats "%~" "" "" + +# Fastest possible way to check if repo is dirty +# +git_dirty() { + # Check if we're in a git repo + command git rev-parse --is-inside-work-tree &>/dev/null || return + # Check if it's dirty + command git diff --quiet --ignore-submodules HEAD &>/dev/null; [ $? -eq 1 ] && echo "*" +} + +# Display information about the current repository +# +repo_information() { + echo "%F{blue}${vcs_info_msg_0_%%/.} %F{8}$vcs_info_msg_1_`git_dirty` $vcs_info_msg_2_%f" +} + +# Displays the exec time of the last command if set threshold was exceeded +# +cmd_exec_time() { + local stop=`date +%s` + local start=${cmd_timestamp:-$stop} + let local elapsed=$stop-$start + [ $elapsed -gt 5 ] && echo ${elapsed}s +} + +# Get the initial timestamp for cmd_exec_time +# +preexec() { + cmd_timestamp=`date +%s` +} + +# Output additional information about paths, repos and exec time +# +precmd() { + vcs_info # Get version control info before we start outputting stuff + print -P "\n$(repo_information) %F{yellow}$(cmd_exec_time)%f" +} + +# Define prompts +# +PROMPT="%(?.%F{magenta}.%F{red})❯%f " # Display a red prompt char on failure +RPROMPT="%F{8}${SSH_TTY:+%n@%m}%f" # Display username if connected via SSH + +# ------------------------------------------------------------------------------ +# +# List of vcs_info format strings: +# +# %b => current branch +# %a => current action (rebase/merge) +# %s => current version control system +# %r => name of the root directory of the repository +# %S => current path relative to the repository root directory +# %m => in case of Git, show information about stashes +# %u => show unstaged changes in the repository +# %c => show staged changes in the repository +# +# List of prompt format strings: +# +# prompt: +# %F => color dict +# %f => reset color +# %~ => current path +# %* => time +# %n => username +# %m => shortname host +# %(?..) => prompt conditional - %(condition.true.false) +# +# ------------------------------------------------------------------------------ diff --git a/.oh-my-zsh/themes/rgm.zsh-theme b/.oh-my-zsh/themes/rgm.zsh-theme new file mode 100644 index 0000000..9452a8b --- /dev/null +++ b/.oh-my-zsh/themes/rgm.zsh-theme @@ -0,0 +1,8 @@ +PROMPT=' +%n@%m %{$fg[cyan]%}%~ +%? $(git_prompt_info)%{$fg_bold[blue]%}%% %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}" diff --git a/.oh-my-zsh/themes/risto.zsh-theme b/.oh-my-zsh/themes/risto.zsh-theme new file mode 100644 index 0000000..cb773a6 --- /dev/null +++ b/.oh-my-zsh/themes/risto.zsh-theme @@ -0,0 +1,6 @@ +# -*- sh -*- vim:set ft=sh ai et sw=4 sts=4: +# It might be bash like, but I can't have my co-workers knowing I use zsh +PROMPT='%{$fg[green]%}%n@%m:%{$fg_bold[blue]%}%2~ $(git_prompt_info)%{$reset_color%}%(!.#.$) ' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="›%{$reset_color%}" diff --git a/.oh-my-zsh/themes/rixius.zsh-theme b/.oh-my-zsh/themes/rixius.zsh-theme new file mode 100644 index 0000000..b33f23e --- /dev/null +++ b/.oh-my-zsh/themes/rixius.zsh-theme @@ -0,0 +1,21 @@ +# name in folder (github) +# ± if in github repo, or ≥ if otherwise Time in 24-hour format is on right. +function collapse_pwd { + echo $(pwd | sed -e "s,^$HOME,~,") +} +function prompt_char { + echo -n "%{$bg[white]%}%{$fg[red]%}" + git branch >/dev/null 2>/dev/null && echo "±%{$reset_color%}" && return + echo "≥%{$reset_color%}" +} +RIXIUS_PRE="%{$bg[white]%}%{$fg[red]%}" + +PROMPT=' +%{$RIXIUS_PRE%}%n%{$reset_color%} in %{$fg_bold[green]%}$(collapse_pwd)%{$reset_color%}$(git_prompt_info) +$(prompt_char) ' +RPROMPT='%{$RIXIUS_PRE%}%T%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RIXIUS_PRE%}!%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$RIXIUS_PRE%}√%{$reset_color%}" diff --git a/.oh-my-zsh/themes/rkj-repos.zsh-theme b/.oh-my-zsh/themes/rkj-repos.zsh-theme new file mode 100644 index 0000000..ba2a0db --- /dev/null +++ b/.oh-my-zsh/themes/rkj-repos.zsh-theme @@ -0,0 +1,36 @@ +# user, host, full path, and time/date +# on two lines for easier vgrepping +# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888 + +function hg_prompt_info { + hg prompt --angle-brackets "\ +%{$reset_color%}><:%{$fg[magenta]%}%{$reset_color%}>\ +%{$reset_color%}>\ +%{$fg[red]%}%{$reset_color%}< +patches: >" 2>/dev/null +} + +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%}+" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%}✱" +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✗" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}➦" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%}✂" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[blue]%}✈" +ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$fg[blue]%}" +ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}" + +function mygit() { + if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then + ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ + ref=$(command git rev-parse --short HEAD 2> /dev/null) || return + echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_short_sha)$(git_prompt_status)%{$fg_bold[blue]%}$ZSH_THEME_GIT_PROMPT_SUFFIX " + fi +} + +function retcode() {} + +# alternate prompt with git & hg +PROMPT=$'%{$fg_bold[blue]%}┌─[%{$fg_bold[green]%}%n%b%{$fg[black]%}@%{$fg[cyan]%}%m%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%{$fg_bold[white]%}%~%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%b%{$fg[yellow]%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{$fg_bold[blue]%}] +%{$fg_bold[blue]%}└─[%{$fg_bold[magenta]%}%?$(retcode)%{$fg_bold[blue]%}] <$(mygit)$(hg_prompt_info)>%{$reset_color%} ' +PS2=$' \e[0;34m%}%B>%{\e[0m%}%b ' + diff --git a/.oh-my-zsh/themes/rkj.zsh-theme b/.oh-my-zsh/themes/rkj.zsh-theme new file mode 100644 index 0000000..fe06161 --- /dev/null +++ b/.oh-my-zsh/themes/rkj.zsh-theme @@ -0,0 +1,9 @@ +# user, host, full path, and time/date +# on two lines for easier vgrepping +# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888 + +function retcode() {} + +PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%} +%{\e[0;34m%}%B└─%B[%{\e[1;35m%}%?$(retcode)%{\e[0;34m%}%B]%{\e[0m%}%b ' + diff --git a/.oh-my-zsh/themes/robbyrussell.zsh-theme b/.oh-my-zsh/themes/robbyrussell.zsh-theme new file mode 100644 index 0000000..f9eca6a --- /dev/null +++ b/.oh-my-zsh/themes/robbyrussell.zsh-theme @@ -0,0 +1,7 @@ +local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )" +PROMPT='${ret_status} %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}git:(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/.oh-my-zsh/themes/sammy.zsh-theme b/.oh-my-zsh/themes/sammy.zsh-theme new file mode 100644 index 0000000..52e6e4b --- /dev/null +++ b/.oh-my-zsh/themes/sammy.zsh-theme @@ -0,0 +1,6 @@ +PROMPT='%{$fg[white]%}%c$(git_prompt_info)$ % %{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="(" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY="*)" +ZSH_THEME_GIT_PROMPT_CLEAN=")" diff --git a/.oh-my-zsh/themes/simonoff.zsh-theme b/.oh-my-zsh/themes/simonoff.zsh-theme new file mode 100644 index 0000000..63ce426 --- /dev/null +++ b/.oh-my-zsh/themes/simonoff.zsh-theme @@ -0,0 +1,138 @@ +# Prompt +# +# Below are the color init strings for the basic file types. A color init +# string consists of one or more of the following numeric codes: +# Attribute codes: +# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed +# Text color codes: +# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white +# Background color codes: +# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white +function precmd { + + local TERMWIDTH + (( TERMWIDTH = ${COLUMNS} - 1 )) + + + ### + # Truncate the path if it's too long. + + PR_FILLBAR="" + PR_PWDLEN="" + + local promptsize=${#${(%):---(%n@%M:%l)---()}} + local pwdsize=${#${(%):-%~}} + local gitbranch="$(git_prompt_info)" + local rvmprompt="$(rvm_prompt_info)" + local gitbranchsize=${#${gitbranch:-''}} + local rvmpromptsize=${#${rvmprompt:-''}} + + if [[ "$promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize" -gt $TERMWIDTH ]]; then + ((PR_PWDLEN=$TERMWIDTH - $promptsize)) + else + PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize)))..${PR_SPACE}.)}" + fi +} + + +setopt extended_glob + +preexec () { + if [[ "$TERM" == "screen" ]]; then + local CMD=${1[(wr)^(*=*|sudo|-*)]} + echo -n "\ek$CMD\e\\" + fi + + if [[ "$TERM" == "xterm" ]]; then + print -Pn "\e]0;$1\a" + fi + + if [[ "$TERM" == "rxvt" ]]; then + print -Pn "\e]0;$1\a" + fi + +} + +setprompt () { +### +# Need this so the prompt will work. + + setopt prompt_subst + + +### +# See if we can use colors. + + autoload zsh/terminfo + for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do + eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}' + eval PR_LIGHT_$color='%{$fg[${(L)color}]%}' + (( count = $count + 1 )) + done + PR_NO_COLOUR="%{$terminfo[sgr0]%}" + + +### +# See if we can use extended characters to look nicer. + + typeset -A altchar +# set -A altchar "${(s..)terminfo[acsc]}" + PR_SET_CHARSET="%{$terminfo[enacs]%}" + PR_HBAR=${altchar[q]:--} + PR_ULCORNER=${altchar[l]:--} + PR_LLCORNER=${altchar[m]:--} + PR_LRCORNER=${altchar[j]:--} + PR_URCORNER=${altchar[k]:--} + + ### + # Modify Git prompt + ZSH_THEME_GIT_PROMPT_PREFIX=" [" + ZSH_THEME_GIT_PROMPT_SUFFIX="]" + ### + # Modify RVM prompt + ZSH_THEME_RVM_PROMPT_PREFIX=" [" + ZSH_THEME_RVM_PROMPT_SUFFIX="]" + + +### +# Decide if we need to set titlebar text. + + case $TERM in + xterm*|*rxvt*) + PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(rvm_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}' + ;; + screen) + PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}' + ;; + *) + PR_TITLEBAR='' + ;; + esac + + +### +# Decide whether to set a screen title + if [[ "$TERM" == "screen" ]]; then + PR_STITLE=$'%{\ekzsh\e\\%}' + else + PR_STITLE='' + fi + +### +# Finally, the prompt. +# + PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\ +$PR_RED$PR_HBAR<\ +$PR_BLUE%(!.$PR_RED%SROOT%s.%n)$PR_GREEN@$PR_BLUE%M:$PR_GREEN%$PR_PWDLEN<...<%~$PR_CYAN$(git_prompt_info)$(rvm_prompt_info)\ +$PR_RED>$PR_HBAR$PR_SPACE${(e)PR_FILLBAR}\ +$PR_RED$PR_HBAR<\ +$PR_GREEN%l$PR_RED>$PR_HBAR\ + +$PR_RED$PR_HBAR<\ +%(?..$PR_LIGHT_RED%?$PR_BLUE:)\ +$PR_LIGHT_BLUE%(!.$PR_RED.$PR_WHITE)%#$PR_RED>$PR_HBAR\ +$PR_NO_COLOUR ' + +} + +setprompt diff --git a/.oh-my-zsh/themes/simple.zsh-theme b/.oh-my-zsh/themes/simple.zsh-theme new file mode 100644 index 0000000..a88d9d7 --- /dev/null +++ b/.oh-my-zsh/themes/simple.zsh-theme @@ -0,0 +1,6 @@ +PROMPT='%{$fg[green]%}%~%{$fg_bold[blue]%}$(git_prompt_info)%{$reset_color%} ' + +ZSH_THEME_GIT_PROMPT_PREFIX="(" +ZSH_THEME_GIT_PROMPT_SUFFIX=")" +ZSH_THEME_GIT_PROMPT_DIRTY=" ✗" +ZSH_THEME_GIT_PROMPT_CLEAN=" ✔" diff --git a/.oh-my-zsh/themes/skaro.zsh-theme b/.oh-my-zsh/themes/skaro.zsh-theme new file mode 100644 index 0000000..84b7b11 --- /dev/null +++ b/.oh-my-zsh/themes/skaro.zsh-theme @@ -0,0 +1,7 @@ +PROMPT='%{$fg_bold[green]%}%h %{$fg[cyan]%}%2~ %{$fg_bold[blue]%}$(git_prompt_info) %{$reset_color%}» ' + +ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" + diff --git a/.oh-my-zsh/themes/smt.zsh-theme b/.oh-my-zsh/themes/smt.zsh-theme new file mode 100644 index 0000000..f2b0526 --- /dev/null +++ b/.oh-my-zsh/themes/smt.zsh-theme @@ -0,0 +1,86 @@ +# smt.zsh-theme, based on dogenpunk by Matthew Nelson. + +MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}" +local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%} " + +ZSH_THEME_GIT_PROMPT_PREFIX="|" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}⚡%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg_bold[red]%}!%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✓%{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹" +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" + +# Format for git_prompt_long_sha() and git_prompt_short_sha() +ZSH_THEME_GIT_PROMPT_SHA_BEFORE="➤ %{$fg_bold[yellow]%}" +ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}" + +function prompt_char() { + git branch >/dev/null 2>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" && return + hg root >/dev/null 2>/dev/null && echo "%{$fg_bold[red]%}☿%{$reset_color%}" && return + darcs show repo >/dev/null 2>/dev/null && echo "%{$fg_bold[green]%}❉%{$reset_color%}" && return + echo "%{$fg[cyan]%}◯%{$reset_color%}" +} + +# Colors vary depending on time lapsed. +ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}" +ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM="%{$fg[yellow]%}" +ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG="%{$fg[red]%}" +ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}" + +# Determine the time since last commit. If branch is clean, +# use a neutral color, otherwise colors will vary according to time. +function git_time_since_commit() { + if git rev-parse --git-dir > /dev/null 2>&1; then + # Only proceed if there is actually a commit. + if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then + # Get the last commit. + last_commit=`git log --pretty=format:'%at' -1 2> /dev/null` + now=`date +%s` + seconds_since_last_commit=$((now-last_commit)) + + # Totals + MINUTES=$((seconds_since_last_commit / 60)) + HOURS=$((seconds_since_last_commit/3600)) + + # Sub-hours and sub-minutes + DAYS=$((seconds_since_last_commit / 86400)) + SUB_HOURS=$((HOURS % 24)) + SUB_MINUTES=$((MINUTES % 60)) + + if [[ -n $(git status -s 2> /dev/null) ]]; then + if [ "$MINUTES" -gt 30 ]; then + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG" + elif [ "$MINUTES" -gt 10 ]; then + COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM" + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT" + fi + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL" + fi + + if [ "$HOURS" -gt 24 ]; then + echo "[$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}]" + elif [ "$MINUTES" -gt 60 ]; then + echo "[$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}]" + else + echo "[$COLOR${MINUTES}m%{$reset_color%}]" + fi + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL" + echo "[$COLOR~]" + fi + fi +} + +PROMPT=' +%{$fg[blue]%}%m%{$reset_color%} 福 %{$fg[cyan]%}%~ %{$reset_color%}$(git_prompt_short_sha)$(git_prompt_info) +%{$fg[red]%}%!%{$reset_color%} $(prompt_char) : ' + +RPROMPT='${return_status}$(git_time_since_commit)$(git_prompt_status)%{$reset_color%}' diff --git a/.oh-my-zsh/themes/sonicradish.zsh-theme b/.oh-my-zsh/themes/sonicradish.zsh-theme new file mode 100644 index 0000000..5086118 --- /dev/null +++ b/.oh-my-zsh/themes/sonicradish.zsh-theme @@ -0,0 +1,37 @@ +#!/usr/bin/env zsh +#local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" + +setopt promptsubst + +autoload -U add-zsh-hook +ROOT_ICON_COLOR=$FG[111] +MACHINE_NAME_COLOR=$FG[208] +PROMPT_SUCCESS_COLOR=$FG[103] +PROMPT_FAILURE_COLOR=$FG[124] +PROMPT_VCS_INFO_COLOR=$FG[242] +PROMPT_PROMPT=$FG[208] +GIT_DIRTY_COLOR=$FG[124] +GIT_CLEAN_COLOR=$FG[148] +GIT_PROMPT_INFO=$FG[148] + +# Hash +ROOT_ICON="# " +if [[ $EUID -ne 0 ]] ; then + ROOT_ICON="" +fi + +PROMPT='%{$ROOT_ICON_COLOR%}$ROOT_ICON%{$reset_color%}%{$MACHINE_NAME_COLOR%}%m➜ %{$reset_color%}%{$PROMPT_SUCCESS_COLOR%}%c%{$reset_color%} %{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}ᐅ %{$reset_color%} ' + +#RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX=": " +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%} :" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔" + +ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[103]%}✚%{$rset_color%}" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[103]%}✹%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[103]%}✖%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[103]%}➜%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[103]%}═%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[103]%}✭%{$reset_color%}" diff --git a/.oh-my-zsh/themes/sorin.zsh-theme b/.oh-my-zsh/themes/sorin.zsh-theme new file mode 100644 index 0000000..ac6a498 --- /dev/null +++ b/.oh-my-zsh/themes/sorin.zsh-theme @@ -0,0 +1,42 @@ +# sorin.zsh-theme +# screenshot: http://i.imgur.com/aipDQ.png + +if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then + MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}" + local return_status="%{$fg[red]%}%(?..⏎)%{$reset_color%}" + + PROMPT='%{$fg[cyan]%}%c$(git_prompt_info) %(!.%{$fg_bold[red]%}#.%{$fg_bold[green]%}❯)%{$reset_color%} ' + + ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}git%{$reset_color%}:%{$fg[red]%}" + ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" + ZSH_THEME_GIT_PROMPT_DIRTY="" + ZSH_THEME_GIT_PROMPT_CLEAN="" + + RPROMPT='${return_status}$(git_prompt_status)%{$reset_color%}' + + ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚" + ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹" + ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" + ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜" + ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═" + ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" +else + MODE_INDICATOR="❮❮❮" + local return_status="%(?::⏎)" + + PROMPT='%c$(git_prompt_info) %(!.#.❯) ' + + ZSH_THEME_GIT_PROMPT_PREFIX=" git:" + ZSH_THEME_GIT_PROMPT_SUFFIX="" + ZSH_THEME_GIT_PROMPT_DIRTY="" + ZSH_THEME_GIT_PROMPT_CLEAN="" + + RPROMPT='${return_status}$(git_prompt_status)' + + ZSH_THEME_GIT_PROMPT_ADDED=" ✚" + ZSH_THEME_GIT_PROMPT_MODIFIED=" ✹" + ZSH_THEME_GIT_PROMPT_DELETED=" ✖" + ZSH_THEME_GIT_PROMPT_RENAMED=" ➜" + ZSH_THEME_GIT_PROMPT_UNMERGED=" ═" + ZSH_THEME_GIT_PROMPT_UNTRACKED=" ✭" +fi diff --git a/.oh-my-zsh/themes/sporty_256.zsh-theme b/.oh-my-zsh/themes/sporty_256.zsh-theme new file mode 100644 index 0000000..db0fc42 --- /dev/null +++ b/.oh-my-zsh/themes/sporty_256.zsh-theme @@ -0,0 +1,13 @@ +# zsh theme requires 256 color enabled terminal +# i.e TERM=xterm-256color +# Preview - http://www.flickr.com/photos/adelcampo/4556482563/sizes/o/ +# based on robbyrussell's shell but louder! + +PROMPT='%{$fg_bold[blue]%}$(git_prompt_info) %F{208}%c%f +%{$fg_bold[white]%}%# %{$reset_color%}' +RPROMPT='%B%F{208}%n%f%{$fg_bold[white]%}@%F{039}%m%f%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%F{154}±|%f%F{124}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}%B✘%b%F{154}|%f%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔%F{154}|" diff --git a/.oh-my-zsh/themes/steeef.zsh-theme b/.oh-my-zsh/themes/steeef.zsh-theme new file mode 100644 index 0000000..b72a41c --- /dev/null +++ b/.oh-my-zsh/themes/steeef.zsh-theme @@ -0,0 +1,100 @@ +# prompt style and colors based on Steve Losh's Prose theme: +# http://github.com/sjl/oh-my-zsh/blob/master/themes/prose.zsh-theme +# +# vcs_info modifications from Bart Trojanowski's zsh prompt: +# http://www.jukie.net/bart/blog/pimping-out-zsh-prompt +# +# git untracked files modification from Brian Carper: +# http://briancarper.net/blog/570/git-info-in-your-zsh-prompt + +export VIRTUAL_ENV_DISABLE_PROMPT=1 + +function virtualenv_info { + [ $VIRTUAL_ENV ] && echo '('%F{blue}`basename $VIRTUAL_ENV`%f') ' +} +PR_GIT_UPDATE=1 + +setopt prompt_subst + +autoload -U add-zsh-hook +autoload -Uz vcs_info + +#use extended color palette if available +if [[ $terminfo[colors] -ge 256 ]]; then + turquoise="%F{81}" + orange="%F{166}" + purple="%F{135}" + hotpink="%F{161}" + limegreen="%F{118}" +else + turquoise="%F{cyan}" + orange="%F{yellow}" + purple="%F{magenta}" + hotpink="%F{red}" + limegreen="%F{green}" +fi + +# enable VCS systems you use +zstyle ':vcs_info:*' enable git svn + +# check-for-changes can be really slow. +# you should disable it, if you work with large repositories +zstyle ':vcs_info:*:prompt:*' check-for-changes true + +# set formats +# %b - branchname +# %u - unstagedstr (see below) +# %c - stagedstr (see below) +# %a - action (e.g. rebase-i) +# %R - repository path +# %S - path in the repository +PR_RST="%f" +FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})" +FMT_ACTION="(%{$limegreen%}%a${PR_RST})" +FMT_UNSTAGED="%{$orange%}●" +FMT_STAGED="%{$limegreen%}●" + +zstyle ':vcs_info:*:prompt:*' unstagedstr "${FMT_UNSTAGED}" +zstyle ':vcs_info:*:prompt:*' stagedstr "${FMT_STAGED}" +zstyle ':vcs_info:*:prompt:*' actionformats "${FMT_BRANCH}${FMT_ACTION}" +zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH}" +zstyle ':vcs_info:*:prompt:*' nvcsformats "" + + +function steeef_preexec { + case "$(history $HISTCMD)" in + *git*) + PR_GIT_UPDATE=1 + ;; + *svn*) + PR_GIT_UPDATE=1 + ;; + esac +} +add-zsh-hook preexec steeef_preexec + +function steeef_chpwd { + PR_GIT_UPDATE=1 +} +add-zsh-hook chpwd steeef_chpwd + +function steeef_precmd { + if [[ -n "$PR_GIT_UPDATE" ]] ; then + # check for untracked files or updated submodules, since vcs_info doesn't + if git ls-files --other --exclude-standard 2> /dev/null | grep -q "."; then + PR_GIT_UPDATE=1 + FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})" + else + FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})" + fi + zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH} " + + vcs_info 'prompt' + PR_GIT_UPDATE= + fi +} +add-zsh-hook precmd steeef_precmd + +PROMPT=$' +%{$purple%}%n${PR_RST} at %{$orange%}%m${PR_RST} in %{$limegreen%}%~${PR_RST} $vcs_info_msg_0_$(virtualenv_info) +$ ' diff --git a/.oh-my-zsh/themes/strug.zsh-theme b/.oh-my-zsh/themes/strug.zsh-theme new file mode 100644 index 0000000..89b56b0 --- /dev/null +++ b/.oh-my-zsh/themes/strug.zsh-theme @@ -0,0 +1,25 @@ +# terminal coloring +export CLICOLOR=1 +export LSCOLORS=dxFxCxDxBxegedabagacad + +local git_branch='$(git_prompt_info)%{$reset_color%}$(git_remote_status)' + +PROMPT="%{$fg[green]%}╭─%n@%m %{$reset_color%}%{$fg[yellow]%}in %~ %{$reset_color%}${git_branch} +%{$fg[green]%}╰\$ %{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%}on " +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_DIRTY="%{$reset_color%}%{$fg[red]%} ✘ %{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ✔ %{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED=true +ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX="%{$fg[yellow]%}(" +ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX="%{$fg[yellow]%})%{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=" +" +ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR=%{$fg[green]%} + +ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE=" -" +ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR=%{$fg[red]%} + diff --git a/.oh-my-zsh/themes/sunaku.zsh-theme b/.oh-my-zsh/themes/sunaku.zsh-theme new file mode 100644 index 0000000..440fa90 --- /dev/null +++ b/.oh-my-zsh/themes/sunaku.zsh-theme @@ -0,0 +1,26 @@ +# Git-centric variation of the "fishy" theme. +# See screenshot at http://ompldr.org/vOHcwZg + +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}+" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[magenta]%}!" +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}-" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%}>" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[cyan]%}#" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[yellow]%}?" + +ZSH_THEME_GIT_PROMPT_PREFIX="" +ZSH_THEME_GIT_PROMPT_SUFFIX=" " +ZSH_THEME_GIT_PROMPT_DIRTY="" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +local user_color='green' +test $UID -eq 0 && user_color='red' + +PROMPT='%(?..%{$fg_bold[red]%}exit %? +%{$reset_color%})'\ +'%{$bold_color%}$(git_prompt_status)%{$reset_color%}'\ +'$(git_prompt_info)'\ +'%{$fg[$user_color]%}%~%{$reset_color%}'\ +'%(!.#.>) ' + +PROMPT2='%{$fg[red]%}\ %{$reset_color%}' diff --git a/.oh-my-zsh/themes/sunrise.zsh-theme b/.oh-my-zsh/themes/sunrise.zsh-theme new file mode 100644 index 0000000..e3f4019 --- /dev/null +++ b/.oh-my-zsh/themes/sunrise.zsh-theme @@ -0,0 +1,93 @@ +# Sunrise theme for oh-my-zsh +# Intended to be used with Solarized: http://ethanschoonover.com/solarized + +# Color shortcuts +R=$fg_no_bold[red] +G=$fg_no_bold[green] +M=$fg_no_bold[magenta] +Y=$fg_no_bold[yellow] +B=$fg_no_bold[blue] +RESET=$reset_color + +if [ "$USER" = "root" ]; then + PROMPTCOLOR="%{$R%}" PROMPTPREFIX="-!-"; +else + PROMPTCOLOR="" PROMPTPREFIX="---"; +fi + +local return_code="%(?..%{$R%}%? ↵%{$RESET%})" + +# Get the status of the working tree (copied and modified from git.zsh) +custom_git_prompt_status() { + INDEX=$(git status --porcelain 2> /dev/null) + STATUS="" + # Non-staged + if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS" + fi + if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" + fi + if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" + fi + if $(echo "$INDEX" | grep '^.M ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS" + elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS" + elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS" + fi + # Staged + if $(echo "$INDEX" | grep '^D ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_DELETED$STATUS" + fi + if $(echo "$INDEX" | grep '^R' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_RENAMED$STATUS" + fi + if $(echo "$INDEX" | grep '^M' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_MODIFIED$STATUS" + fi + if $(echo "$INDEX" | grep '^A' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_STAGED_ADDED$STATUS" + fi + + if $(echo -n "$STATUS" | grep '.*' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_STATUS_PREFIX$STATUS" + fi + + echo $STATUS +} + +# get the name of the branch we are on (copied and modified from git.zsh) +function custom_git_prompt() { + ref=$(git symbolic-ref HEAD 2> /dev/null) || return + echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$(git_prompt_ahead)$(custom_git_prompt_status)$ZSH_THEME_GIT_PROMPT_SUFFIX" +} + +# %B sets bold text +PROMPT='%B$PROMPTPREFIX %2~ $(custom_git_prompt)%{$M%}%B»%b%{$RESET%} ' +RPS1="${return_code}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$Y%}‹" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$Y%}›%{$RESET%} " + +ZSH_THEME_GIT_PROMPT_DIRTY="%{$R%}*" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +ZSH_THEME_GIT_PROMPT_AHEAD="%{$B%}➔" + + +ZSH_THEME_GIT_STATUS_PREFIX=" " + +# Staged +ZSH_THEME_GIT_PROMPT_STAGED_ADDED="%{$G%}A" +ZSH_THEME_GIT_PROMPT_STAGED_MODIFIED="%{$G%}M" +ZSH_THEME_GIT_PROMPT_STAGED_RENAMED="%{$G%}R" +ZSH_THEME_GIT_PROMPT_STAGED_DELETED="%{$G%}D" + +# Not-staged +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$R%}?" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$R%}M" +ZSH_THEME_GIT_PROMPT_DELETED="%{$R%}D" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$R%}UU" diff --git a/.oh-my-zsh/themes/superjarin.zsh-theme b/.oh-my-zsh/themes/superjarin.zsh-theme new file mode 100644 index 0000000..86fa9c7 --- /dev/null +++ b/.oh-my-zsh/themes/superjarin.zsh-theme @@ -0,0 +1,18 @@ +# Grab the current version of ruby in use: [ruby-1.8.7] +JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(ruby_prompt_info)%{$fg[white]%}]%{$reset_color%}" + +# Grab the current filepath, use shortcuts: ~/Desktop +# Append the current git branch, if in a git repository +JARIN_CURRENT_LOCA_="%{$fg_bold[cyan]%}%~\$(git_prompt_info)%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%} <%{$fg[magenta]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[white]%}" + +# Do nothing if the branch is clean (no changes). +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[white]%}>" + +# Add a yellow ✗ if the branch is dirty +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[white]%}> %{$fg[yellow]%}✗" + +# Put it all together! +PROMPT="$JARIN_CURRENT_RUBY_ $JARIN_CURRENT_LOCA_ " + diff --git a/.oh-my-zsh/themes/suvash.zsh-theme b/.oh-my-zsh/themes/suvash.zsh-theme new file mode 100644 index 0000000..1680973 --- /dev/null +++ b/.oh-my-zsh/themes/suvash.zsh-theme @@ -0,0 +1,34 @@ +function prompt_char { + git branch >/dev/null 2>/dev/null && echo '±' && return + hg root >/dev/null 2>/dev/null && echo 'Hg' && return + echo '○' +} + +function virtualenv_info { + [[ -n "$VIRTUAL_ENV" ]] && echo '('${VIRTUAL_ENV:t}') ' +} + +function ruby_prompt { + if (( $+commands[rvm-prompt] )); then + print -n $ZSH_THEME_RUBY_PROMPT_PREFIX + print -n $(~/.rvm/bin/rvm-prompt) + print -n $ZSH_THEME_RUBY_PROMPT_SUFFIX + elif (( $+commands[rbenv] )); then + print -n $ZSH_THEME_RUBY_PROMPT_PREFIX + print -n $(rbenv version | sed -e "s/ (set.*$//") + print -n $ZSH_THEME_RUBY_PROMPT_SUFFIX + fi + return 0 +} + +PROMPT='%F{magenta}%n%f at %F{yellow}%m%f in %B%F{green}%~%f%b$(git_prompt_info)$(ruby_prompt) +$(virtualenv_info) $(prompt_char) ' + +ZSH_THEME_GIT_PROMPT_PREFIX=' on %F{magenta}' +ZSH_THEME_GIT_PROMPT_SUFFIX='%f' +ZSH_THEME_GIT_PROMPT_DIRTY='%F{green}!' +ZSH_THEME_GIT_PROMPT_UNTRACKED='%F{green}?' +ZSH_THEME_GIT_PROMPT_CLEAN='' + +ZSH_THEME_RUBY_PROMPT_PREFIX=' using %F{red}' +ZSH_THEME_RUBY_PROMPT_SUFFIX='%f' diff --git a/.oh-my-zsh/themes/takashiyoshida.zsh-theme b/.oh-my-zsh/themes/takashiyoshida.zsh-theme new file mode 100644 index 0000000..419a8cf --- /dev/null +++ b/.oh-my-zsh/themes/takashiyoshida.zsh-theme @@ -0,0 +1,27 @@ +# +# PROMPT +# +PROMPT_BRACKET_BEGIN='%{$fg_bold[white]%}[' +PROMPT_HOST='%{$fg_bold[cyan]%}%m' +PROMPT_SEPARATOR='%{$reset_color%}:' +PROMPT_DIR='%{$fg_bold[yellow]%}%c' +PROMPT_BRACKET_END='%{$fg_bold[white]%}]' + +PROMPT_USER='%{$fg_bold[white]%}%n' +PROMPT_SIGN='%{$reset_color%}%#' + +GIT_PROMPT_INFO='$(git_prompt_info)' + +# My current prompt looks like: +# [host:current_dir] (git_prompt_info) +# [username]% +PROMPT="${PROMPT_BRACKET_BEGIN}${PROMPT_HOST}${PROMPT_SEPARATOR}${PROMPT_DIR}${PROMPT_BRACKET_END}${GIT_PROMPT_INFO} +${PROMPT_BRACKET_BEGIN}${PROMPT_USER}${PROMPT_BRACKET_END}${PROMPT_SIGN} " + +# +# Git repository +# +ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!" +ZSH_THEME_GIT_PROMPT_CLEAN='' diff --git a/.oh-my-zsh/themes/terminalparty.zsh-theme b/.oh-my-zsh/themes/terminalparty.zsh-theme new file mode 100644 index 0000000..cd7370b --- /dev/null +++ b/.oh-my-zsh/themes/terminalparty.zsh-theme @@ -0,0 +1,8 @@ +PROMPT='%(?,%{$fg[green]%},%{$fg[red]%}) %% ' +# RPS1='%{$fg[blue]%}%~%{$reset_color%} ' +RPS1='%{$fg[white]%}%2~$(git_prompt_info) %{$fg_bold[blue]%}%m%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[yellow]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ⚡%{$fg[yellow]%}" diff --git a/.oh-my-zsh/themes/theunraveler.zsh-theme b/.oh-my-zsh/themes/theunraveler.zsh-theme new file mode 100644 index 0000000..e4bfb79 --- /dev/null +++ b/.oh-my-zsh/themes/theunraveler.zsh-theme @@ -0,0 +1,16 @@ +# Comment + +PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}' + +RPROMPT='%{$fg[magenta]%}$(git_prompt_info)%{$reset_color%} $(git_prompt_status)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY="" +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭" +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱" \ No newline at end of file diff --git a/.oh-my-zsh/themes/tjkirch.zsh-theme b/.oh-my-zsh/themes/tjkirch.zsh-theme new file mode 100644 index 0000000..446cde7 --- /dev/null +++ b/.oh-my-zsh/themes/tjkirch.zsh-theme @@ -0,0 +1,15 @@ +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}⚡" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +function prompt_char { + if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi +} + +PROMPT='%(?, ,%{$fg[red]%}FAIL: $?%{$reset_color%} +) +%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info) +%_$(prompt_char) ' + +RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}' diff --git a/.oh-my-zsh/themes/tjkirch_mod.zsh-theme b/.oh-my-zsh/themes/tjkirch_mod.zsh-theme new file mode 100644 index 0000000..1b206a7 --- /dev/null +++ b/.oh-my-zsh/themes/tjkirch_mod.zsh-theme @@ -0,0 +1,13 @@ +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}⚡" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +function prompt_char { + if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi +} + +PROMPT='%(?,,%{$fg[red]%}FAIL: $?%{$reset_color%} +)%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info) %_$(prompt_char) ' + +RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}' diff --git a/.oh-my-zsh/themes/tonotdo.zsh-theme b/.oh-my-zsh/themes/tonotdo.zsh-theme new file mode 100644 index 0000000..a640703 --- /dev/null +++ b/.oh-my-zsh/themes/tonotdo.zsh-theme @@ -0,0 +1,12 @@ +PROMPT='%{$fg_no_bold[cyan]%}%n%{$fg_no_bold[magenta]%}➜%{$fg_no_bold[green]%}%3~$(git_prompt_info)%{$reset_color%}» ' +RPROMPT='[%*]' + +# git theming +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[blue]%})" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}✗%{$fg_bold[blue]%})" + +# LS colors, made with http://geoff.greer.fm/lscolors/ +export LSCOLORS="Gxfxcxdxbxegedabagacad" +export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:' \ No newline at end of file diff --git a/.oh-my-zsh/themes/trapd00r.zsh-theme b/.oh-my-zsh/themes/trapd00r.zsh-theme new file mode 100644 index 0000000..3fa5d57 --- /dev/null +++ b/.oh-my-zsh/themes/trapd00r.zsh-theme @@ -0,0 +1,94 @@ +# trapd00r.zsh-theme +# +# This theme needs a terminal supporting 256 colors as well as unicode. It also +# needs the script that splits up the current path and makes it fancy as located +# here: https://github.com/trapd00r/utils/blob/master/zsh_path +# +# By default it spans over two lines like so: +# +# scp1@shiva:pts/9-> /home » scp1 (0) +# > +# +# that's user@host:pts/-> splitted path (return status) +# +# If the current directory is a git repository, we span 3 lines; +# +# git❨ master ❩ DIRTY +# scp1@shiva:pts/4-> /home » scp1 » dev » utils (0) +# > + +autoload -U add-zsh-hook +autoload -Uz vcs_info + +local c0=$( printf "\e[m") +local c1=$( printf "\e[38;5;245m") +local c2=$( printf "\e[38;5;250m") +local c3=$( printf "\e[38;5;242m") +local c4=$( printf "\e[38;5;197m") +local c5=$( printf "\e[38;5;225m") +local c6=$( printf "\e[38;5;240m") +local c7=$( printf "\e[38;5;242m") +local c8=$( printf "\e[38;5;244m") +local c9=$( printf "\e[38;5;162m") +local c10=$(printf "\e[1m") +local c11=$(printf "\e[38;5;208m\e[1m") +local c12=$(printf "\e[38;5;142m\e[1m") +local c13=$(printf "\e[38;5;196m\e[1m") + + +# We don't want to use the extended colorset in the TTY / VC. +if [ "$TERM" = "linux" ]; then + c1=$( printf "\e[34;1m") + c2=$( printf "\e[35m") + c3=$( printf "\e[31m") + c4=$( printf "\e[31;1m") + c5=$( printf "\e[32m") + c6=$( printf "\e[32;1m") + c7=$( printf "\e[33m") + c8=$( printf "\e[33;1m") + c9=$( printf "\e[34m") + + c11=$(printf "\e[35;1m") + c12=$(printf "\e[36m") + c13=$(printf "\e[31;1m") +fi + +zstyle ':vcs_info:*' actionformats \ + '%{$c8%}(%f%s)%{$c7%}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f ' + +zstyle ':vcs_info:*' formats \ + "%{$c8%}%s%%{$c7%}❨ %{$c9%}%{$c11%}%b%{$c7%} ❩%{$reset_color%}%f " + +zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r' +zstyle ':vcs_info:*' enable git + +add-zsh-hook precmd prompt_jnrowe_precmd + +prompt_jnrowe_precmd () { + vcs_info + if [ "${vcs_info_msg_0_}" = "" ]; then + dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})" + PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%} +> ' + +# modified, to be committed + elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then + dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})" + PROMPT='${vcs_info_msg_0_}%{$30%} %{$bg_bold[red]%}%{$fg_bold[cyan]%}C%{$fg_bold[black]%}OMMIT%{$reset_color%} +%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%} +> ' + + elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then + dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})" + PROMPT='${vcs_info_msg_0_}%{$bg_bold[red]%}%{$fg_bold[blue]%}D%{$fg_bold[black]%}IRTY%{$reset_color%} +%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%} +%{$c13%}>%{$c0%} ' + else + dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})" + PROMPT='${vcs_info_msg_0_} +%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%} +> ' +fi +} + +# vim: set ft=zsh sw=2 et tw=0: diff --git a/.oh-my-zsh/themes/wedisagree.zsh-theme b/.oh-my-zsh/themes/wedisagree.zsh-theme new file mode 100644 index 0000000..9bdbce4 --- /dev/null +++ b/.oh-my-zsh/themes/wedisagree.zsh-theme @@ -0,0 +1,108 @@ +# On a mac with snow leopard, for nicer terminal colours: + +# - Install SIMBL: http://www.culater.net/software/SIMBL/SIMBL.php +# - Download'Terminal-Colours': http://bwaht.net/code/TerminalColours.bundle.zip +# - Place that bundle in ~/Library/Application\ Support/SIMBL/Plugins (create that folder if it doesn't exist) +# - Open Terminal preferences. Go to Settings -> Text -> More +# - Change default colours to your liking. +# +# Here are the colours from Textmate's Monokai theme: +# +# Black: 0, 0, 0 +# Red: 229, 34, 34 +# Green: 166, 227, 45 +# Yellow: 252, 149, 30 +# Blue: 196, 141, 255 +# Magenta: 250, 37, 115 +# Cyan: 103, 217, 240 +# White: 242, 242, 242 + +# Thanks to Steve Losh: http://stevelosh.com/blog/2009/03/candy-colored-terminal/ + +# The prompt + +PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}' + +# The right-hand prompt + +RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}' + +# Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name +# %{$fg[yellow]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%} + +# local time, color coded by last return code +time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}" +time_disabled="%{$fg[green]%}%*%{$reset_color%}" +time=$time_enabled + +ZSH_THEME_GIT_PROMPT_PREFIX=" ☁ %{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%} ☂" # Ⓓ +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" # ⓣ +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ☀" # Ⓞ + +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✚" # ⓐ ⑃ +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ⚡" # ⓜ ⑁ +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" # ⓧ ⑂ +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➜" # ⓡ ⑄ +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ♒" # ⓤ ⑊ +ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[blue]%} 𝝙" + +# More symbols to choose from: +# ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷ +# ✡ ✔ ✖ ✚ ✱ ✤ ✦ ❤ ➜ ➟ ➼ ✂ ✎ ✐ ⨀ ⨁ ⨂ ⨍ ⨎ ⨏ ⨷ ⩚ ⩛ ⩡ ⩱ ⩲ ⩵ ⩶ ⨠ +# ⬅ ⬆ ⬇ ⬈ ⬉ ⬊ ⬋ ⬒ ⬓ ⬔ ⬕ ⬖ ⬗ ⬘ ⬙ ⬟ ⬤ 〒 ǀ ǁ ǂ ĭ Ť Ŧ + +# Determine if we are using a gemset. +function rvm_gemset() { + GEMSET=`rvm gemset list | grep '=>' | cut -b4-` + if [[ -n $GEMSET ]]; then + echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|" + fi +} + +# Determine the time since last commit. If branch is clean, +# use a neutral color, otherwise colors will vary according to time. +function git_time_since_commit() { + if git rev-parse --git-dir > /dev/null 2>&1; then + # Only proceed if there is actually a commit. + if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then + # Get the last commit. + last_commit=`git log --pretty=format:'%at' -1 2> /dev/null` + now=`date +%s` + seconds_since_last_commit=$((now-last_commit)) + + # Totals + MINUTES=$((seconds_since_last_commit / 60)) + HOURS=$((seconds_since_last_commit/3600)) + + # Sub-hours and sub-minutes + DAYS=$((seconds_since_last_commit / 86400)) + SUB_HOURS=$((HOURS % 24)) + SUB_MINUTES=$((MINUTES % 60)) + + if [[ -n $(git status -s 2> /dev/null) ]]; then + if [ "$MINUTES" -gt 30 ]; then + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG" + elif [ "$MINUTES" -gt 10 ]; then + COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM" + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT" + fi + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL" + fi + + if [ "$HOURS" -gt 24 ]; then + echo "($(rvm_gemset)$COLOR${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}|" + elif [ "$MINUTES" -gt 60 ]; then + echo "($(rvm_gemset)$COLOR${HOURS}h${SUB_MINUTES}m%{$reset_color%}|" + else + echo "($(rvm_gemset)$COLOR${MINUTES}m%{$reset_color%}|" + fi + else + COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL" + echo "($(rvm_gemset)$COLOR~|" + fi + fi +} diff --git a/.oh-my-zsh/themes/wezm+.zsh-theme b/.oh-my-zsh/themes/wezm+.zsh-theme new file mode 100644 index 0000000..fee3eb0 --- /dev/null +++ b/.oh-my-zsh/themes/wezm+.zsh-theme @@ -0,0 +1,7 @@ +PROMPT='%{${fg_bold[yellow]}%}%n%{$reset_color%}%{${fg[yellow]}%}@%m%{$reset_color%} $(git_prompt_info)%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )%{$fg[yellow]%}%#%{$reset_color%} ' +RPROMPT='%{$fg[green]%}%~%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[red]%}✗%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/.oh-my-zsh/themes/wezm.zsh-theme b/.oh-my-zsh/themes/wezm.zsh-theme new file mode 100644 index 0000000..1881343 --- /dev/null +++ b/.oh-my-zsh/themes/wezm.zsh-theme @@ -0,0 +1,7 @@ +PROMPT='$(git_prompt_info)%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )%{$fg[yellow]%}%#%{$reset_color%} ' +RPROMPT='%{$fg[green]%}%~%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%}(" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[red]%}⚡%{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" diff --git a/.oh-my-zsh/themes/wuffers.zsh-theme b/.oh-my-zsh/themes/wuffers.zsh-theme new file mode 100644 index 0000000..4019d0a --- /dev/null +++ b/.oh-my-zsh/themes/wuffers.zsh-theme @@ -0,0 +1,5 @@ +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}[" +ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%} x%{$fg_bold[blue]%}" + +PROMPT='%{$(git_prompt_info)%}%{$fg_bold[green]%}{%{$(rvm current 2>/dev/null || rbenv version-name 2>/dev/null)%}}%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} ' diff --git a/.oh-my-zsh/themes/xiong-chiamiov-plus.zsh-theme b/.oh-my-zsh/themes/xiong-chiamiov-plus.zsh-theme new file mode 100644 index 0000000..5fb4fe6 --- /dev/null +++ b/.oh-my-zsh/themes/xiong-chiamiov-plus.zsh-theme @@ -0,0 +1,6 @@ +# user, host, full path, and time/date +# on two lines for easier vgrepping +# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888 +PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %H:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%} +%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <$(git_prompt_info)>%{\e[0m%}%b ' +PS2=$' \e[0;34m%}%B>%{\e[0m%}%b ' diff --git a/.oh-my-zsh/themes/xiong-chiamiov.zsh-theme b/.oh-my-zsh/themes/xiong-chiamiov.zsh-theme new file mode 100644 index 0000000..0ed335f --- /dev/null +++ b/.oh-my-zsh/themes/xiong-chiamiov.zsh-theme @@ -0,0 +1,6 @@ +# user, host, full path, and time/date +# on two lines for easier vgrepping +# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888 +PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %H:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%} +%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]>%{\e[0m%}%b ' +PS2=$' \e[0;34m%}%B>%{\e[0m%}%b ' diff --git a/.oh-my-zsh/themes/ys.zsh-theme b/.oh-my-zsh/themes/ys.zsh-theme new file mode 100644 index 0000000..89d5355 --- /dev/null +++ b/.oh-my-zsh/themes/ys.zsh-theme @@ -0,0 +1,60 @@ +# Clean, simple, compatible and meaningful. +# Tested on Linux, Unix and Windows under ANSI colors. +# It is recommended to use with a dark background. +# Colors: black, red, green, yellow, *blue, magenta, cyan, and white. +# +# Mar 2013 Yad Smood + +# VCS +YS_VCS_PROMPT_PREFIX1=" %{$fg[white]%}on%{$reset_color%} " +YS_VCS_PROMPT_PREFIX2=":%{$fg[cyan]%}" +YS_VCS_PROMPT_SUFFIX="%{$reset_color%}" +YS_VCS_PROMPT_DIRTY=" %{$fg[red]%}x" +YS_VCS_PROMPT_CLEAN=" %{$fg[green]%}o" + +# Git info +local git_info='$(git_prompt_info)' +ZSH_THEME_GIT_PROMPT_PREFIX="${YS_VCS_PROMPT_PREFIX1}git${YS_VCS_PROMPT_PREFIX2}" +ZSH_THEME_GIT_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX" +ZSH_THEME_GIT_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY" +ZSH_THEME_GIT_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN" + +# HG info +local hg_info='$(ys_hg_prompt_info)' +ys_hg_prompt_info() { + # make sure this is a hg dir + if [ -d '.hg' ]; then + echo -n "${YS_VCS_PROMPT_PREFIX1}hg${YS_VCS_PROMPT_PREFIX2}" + echo -n $(hg branch 2>/dev/null) + if [ -n "$(hg status 2>/dev/null)" ]; then + echo -n "$YS_VCS_PROMPT_DIRTY" + else + echo -n "$YS_VCS_PROMPT_CLEAN" + fi + echo -n "$YS_VCS_PROMPT_SUFFIX" + fi +} + +local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%})" + +# Prompt format: +# +# PRIVILEGES USER @ MACHINE in DIRECTORY on git:BRANCH STATE [TIME] C:LAST_EXIT_CODE +# $ COMMAND +# +# For example: +# +# % ys @ ys-mbp in ~/.oh-my-zsh on git:master x [21:47:42] C:0 +# $ +PROMPT=" +%{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \ +%(#,%{$bg[yellow]%}%{$fg[black]%}%n%{$reset_color%},%{$fg[cyan]%}%n) \ +%{$fg[white]%}@ \ +%{$fg[green]%}%m \ +%{$fg[white]%}in \ +%{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\ +${hg_info}\ +${git_info}\ + \ +%{$fg[white]%}[%*] $exit_code +%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}" diff --git a/.oh-my-zsh/themes/zhann.zsh-theme b/.oh-my-zsh/themes/zhann.zsh-theme new file mode 100644 index 0000000..27597ec --- /dev/null +++ b/.oh-my-zsh/themes/zhann.zsh-theme @@ -0,0 +1,23 @@ +autoload -Uz vcs_info + +zstyle ':vcs_info:*' stagedstr '%F{green}●' +zstyle ':vcs_info:*' unstagedstr '%F{yellow}●' +zstyle ':vcs_info:*' check-for-changes true +zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r' +zstyle ':vcs_info:*' enable git svn +theme_precmd () { + if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] { + zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]' + } else { + zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]' + } + + vcs_info +} + +setopt prompt_subst +PROMPT='%B%F{blue}%c%B%F{green}${vcs_info_msg_0_}%B%F{magenta} %{$reset_color%}% ' + +autoload -U add-zsh-hook +add-zsh-hook precmd theme_precmd + diff --git a/.oh-my-zsh/tools/check_for_upgrade.sh b/.oh-my-zsh/tools/check_for_upgrade.sh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/tools/uninstall.sh b/.oh-my-zsh/tools/uninstall.sh old mode 100755 new mode 100644 diff --git a/.oh-my-zsh/tools/upgrade.sh b/.oh-my-zsh/tools/upgrade.sh old mode 100755 new mode 100644 diff --git a/.vim/init.vim b/.vim/init.vim index 3b8474e..c7d42f6 100755 --- a/.vim/init.vim +++ b/.vim/init.vim @@ -54,7 +54,9 @@ Plugin 'tpope/vim-repeat' Plugin 'tpope/vim-endwise' Plugin 'moll/vim-bbye' Plugin 'stevearc/vim-arduino' - +Plugin 'Shougo/deoplete.nvim' +Plugin 'fishbullet/deoplete-ruby' +Plugin 'Shougo/deoplete-rct' "GIT Plugin 'tpope/vim-fugitive' Plugin 'airblade/vim-gitgutter' @@ -90,7 +92,7 @@ let g:vimfiler_as_default_explorer = 1 "EMMET let g:user_emmet_install_global = 0 let g:user_emmet_expandabbr_key = '' - +let g:deoplete#enable_at_startup = 1 "ARDUINO let g:arduino_dir = '/usr/share/arduino' "STARTIFY