From 3d720f3e4fba9e5a5bdf85a3a6bcb708c9686952 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 12 Nov 2017 18:17:49 -0500 Subject: [PATCH] Many changes --- .gitmodules | 16 +- brew | 19 ++- cask | 17 +- link/.antigen.zsh | 44 ------ link/.zgen-local-plugins | 112 +++++++++++++ link/.zlogin | 1 - link/.zprezto | 1 - link/.zpreztorc | 148 ------------------ link/.zprofile | 1 - link/.zshenv | 1 - link/.zshrc | 66 -------- source/aliases.zsh => link/.zshrc.d/aliases | 0 .../.zshrc.d/boot2docker | 0 source/chruby.zsh => link/.zshrc.d/chruby | 0 source/docker.zsh => link/.zshrc.d/docker | 0 source/editor.zsh => link/.zshrc.d/editor | 0 source/git.zsh => link/.zshrc.d/git | 0 source/go.zsh => link/.zshrc.d/go | 0 link/.zshrc.d/iterm2 | 1 + source/knife.zsh => link/.zshrc.d/knife | 0 .../nocorrect.zsh => link/.zshrc.d/nocorrect | 0 source/nvm.zsh => link/.zshrc.d/nvm | 0 source/path.zsh => link/.zshrc.d/path | 0 source/tmux.zsh => link/.zshrc.d/tmux | 0 source/fleetctl.zsh | 2 - source/history.zsh | 1 - 26 files changed, 144 insertions(+), 286 deletions(-) delete mode 100644 link/.antigen.zsh create mode 100644 link/.zgen-local-plugins delete mode 120000 link/.zlogin delete mode 160000 link/.zprezto delete mode 100644 link/.zpreztorc delete mode 120000 link/.zprofile delete mode 120000 link/.zshenv delete mode 100644 link/.zshrc rename source/aliases.zsh => link/.zshrc.d/aliases (100%) rename source/boot2docker.zsh => link/.zshrc.d/boot2docker (100%) rename source/chruby.zsh => link/.zshrc.d/chruby (100%) rename source/docker.zsh => link/.zshrc.d/docker (100%) rename source/editor.zsh => link/.zshrc.d/editor (100%) rename source/git.zsh => link/.zshrc.d/git (100%) rename source/go.zsh => link/.zshrc.d/go (100%) create mode 100644 link/.zshrc.d/iterm2 rename source/knife.zsh => link/.zshrc.d/knife (100%) rename source/nocorrect.zsh => link/.zshrc.d/nocorrect (100%) rename source/nvm.zsh => link/.zshrc.d/nvm (100%) rename source/path.zsh => link/.zshrc.d/path (100%) rename source/tmux.zsh => link/.zshrc.d/tmux (100%) delete mode 100644 source/fleetctl.zsh delete mode 100644 source/history.zsh diff --git a/.gitmodules b/.gitmodules index 020a5c3..46fb3d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,12 @@ -[submodule "link/.zprezto"] - path = link/.zprezto - url = https://github.com/sorin-ionescu/prezto.git [submodule "link/vim-config"] - path = link/vim-config - url = https://github.com/tedkulp/vim-config.git + path = link/vim-config + url = https://github.com/tedkulp/vim-config.git +[submodule "link/.emacs.d"] + path = link/.emacs.d + url = https://github.com/syl20bnr/spacemacs.git +[submodule "link/zgen"] + path = link/zgen + url = https://github.com/tarjoilija/zgen.git +[submodule "link/zsh-quickstart-kit"] + path = link/zsh-quickstart-kit + url = https://github.com/unixorn/zsh-quickstart-kit.git diff --git a/brew b/brew index 1681b62..b120a8a 100755 --- a/brew +++ b/brew @@ -31,27 +31,28 @@ brew install ag brew install ansible brew install antigen brew install apple-gcc42 +brew install awscli brew install chruby brew install coreutils brew install docker brew install docker-compose brew install docker-machine -brew install emacs -brew install emacs-mac +brew install elixir +brew install emacs-plus --HEAD --with-natural-title-bars +brew install erlang brew install ffmpeg brew install gdbm brew install git brew install gnupg2 brew install go -brew install heroku-toolbelt +brew install heroku brew install htop-osx brew install hub brew install imagemagick brew install libffi brew install libyaml +brew install kubernetes-cli brew install jq -brew install macvim --override-system-vim -brew install maven brew install mkvtoolnix brew install ngrok2 brew install nmap @@ -61,15 +62,19 @@ brew install phantomjs brew install readline brew install reattach-to-user-namespace brew install ruby-install +brew install stow brew install teensy_loader_cli brew install tesseract brew install the_platinum_searcher brew install the_silver_searcher brew install tmux +brew install tmuxinator-completion brew install ttyrec -brew install typesafe-activator -brew install unixodbc +brew install vim +brew install wallpaper brew install xz +brew install youtube-dl +brew install zsh brew install https://raw.github.com/falsecz/homebrew-misc/master/Formula/git-wtf.rb diff --git a/cask b/cask index 229c5d4..b7da640 100755 --- a/cask +++ b/cask @@ -18,31 +18,30 @@ if [ -x "$brew_path" ] ; then installcask atom installcask bartender installcask bettertouchtool - installcask crashplan - installcask dbvisualizer installcask discord - installcask docker-toolbox installcask dropbox + installcask firefox + installcask fluid installcask gitter installcask gitup - installcask rowanj-gitx installcask google-chrome installcask google-earth installcask gopro-studio installcask handbrake installcask handbrakecli - installcask intellij-idea - installcask iterm2 installcask istat-menus + installcask iterm2 + installcask keycastr installcask mactex installcask makemkv + installcask ngrok + installcask resilio-sync + installcask rowanj-gitx installcask sharemouse - installcask sidestep + installcask shimo installcask skype installcask slack - installcask sourcetree installcask spotify - installcask steam installcask teamviewer installcask vagrant installcask virtualbox diff --git a/link/.antigen.zsh b/link/.antigen.zsh deleted file mode 100644 index 6af9eb3..0000000 --- a/link/.antigen.zsh +++ /dev/null @@ -1,44 +0,0 @@ -antigen bundle robbyrussell/oh-my-zsh lib/ -antigen use oh-my-zsh - -# CHANGE ME!!!! -antigen theme https://gist.github.com/3750104.git agnoster - -# Angtigen Stuff -antigen bundle git -antigen bundle zsh-users/zsh-syntax-highlighting -antigen bundle rupa/z - -antigen bundle common-aliases - -# Node Plugins -antigen bundle coffee -antigen bundle node -antigen bundle npm -antigen bundle bower - -# Python Plugins -antigen bundle pip -antigen bundle python -antigen bundle virtualenv - -# Ruby Stuff -antigen bundle ruby -antigen bundle gem -antigen bundle rails - -# Java Stuff -antigen bundle mvn - -# Dev-y stuff -antigen bundle docker -antigen bundle vagrant -antigen bundle tmux -antigen bundle tmuxinator - -# OSX Stuff -antigen bundle brew -antigen bundle brew-cask -antigen bundle osx - -antigen-apply diff --git a/link/.zgen-local-plugins b/link/.zgen-local-plugins new file mode 100644 index 0000000..2006132 --- /dev/null +++ b/link/.zgen-local-plugins @@ -0,0 +1,112 @@ +#!/bin/zsh + +echo "creating a zgen save" +ZGEN_LOADED=() +ZGEN_COMPLETIONS=() + +zgen oh-my-zsh + +# If you want to customize your plugin list, create a file named +# .zgen-local-plugins in your home directory. That file will be sourced +# during startup *instead* of running this load-starter-plugin-list function, +# so make sure to include everything from this function that you want to keep. + +# If zsh-syntax-highlighting is bundled after zsh-history-substring-search, +# they break, so get the order right. +zgen load zsh-users/zsh-syntax-highlighting +zgen load zsh-users/zsh-history-substring-search + +# Set keystrokes for substring searching +zmodload zsh/terminfo +bindkey "$terminfo[kcuu1]" history-substring-search-up +bindkey "$terminfo[kcud1]" history-substring-search-down + +# Tab complete rakefile targets +zgen load unixorn/rake-completion.zshplugin + +# Automatically run zgen update and zgen selfupdate every 7 days +zgen load unixorn/autoupdate-zgen + +# Add my collection of miscellaneous utility functions. +zgen load unixorn/jpb.zshplugin + +# Colorize the things if you have grc installed. Well, some of the +# things, anyway. +zgen load unixorn/warhol.plugin.zsh + +# OS X helpers. This plugin is smart enough to detect when it isn't running +# on OS X and not load itself, so you can safely share the same plugin list +# across OS X and Linux/BSD +zgen load unixorn/tumult.plugin.zsh + +# Warn you when you run a command that you've set an alias for +zgen load djui/alias-tips + +# Add my collection of git helper scripts +zgen load unixorn/git-extra-commands + +# Add my bitbucket git helpers plugin +zgen load unixorn/bitbucket-git-helpers.plugin.zsh + +# A collection of scripts that might be useful to sysadmins +zgen load skx/sysadmin-util + +# Adds aliases to open your current repo & branch on github. +zgen load peterhurford/git-it-on.zsh + +# Tom Limoncelli's tooling for storing private information (keys, etc) +# in a repository securely by encrypting them with gnupg +zgen load StackExchange/blackbox + +# Load some oh-my-zsh plugins +zgen oh-my-zsh plugins/pip +zgen oh-my-zsh plugins/sudo +zgen oh-my-zsh plugins/aws +zgen oh-my-zsh plugins/chruby +zgen oh-my-zsh plugins/colored-man-pages +zgen oh-my-zsh plugins/git +zgen oh-my-zsh plugins/github +zgen oh-my-zsh plugins/python +zgen oh-my-zsh plugins/rsync +zgen oh-my-zsh plugins/screen +zgen oh-my-zsh plugins/vagrant + +if [ $(uname -a | grep -ci Darwin) = 1 ]; then + # Load OSX-specific plugins + zgen oh-my-zsh plugins/brew + zgen oh-my-zsh plugins/osx +fi + +# A set of shell functions to make it easy to install small apps and +# utilities distributed with pip. +zgen load sharat87/pip-app + +zgen load chrissicool/zsh-256color + +# Load more completion files for zsh from the zsh-lovers github repo +zgen load zsh-users/zsh-completions src + +# Docker completion +zgen load srijanshetty/docker-zsh + +# Load me last +GENCOMPL_FPATH=$HOME/.zsh/complete + +# Very cool plugin that generates zsh completion functions for commands +# if they have getopt-style help text. It doesn't generate them on the fly, +# you'll have to explicitly generate a completion, but it's still quite cool. +zgen load RobSis/zsh-completion-generator + +# Add Fish-like autosuggestions to your ZSH +zgen load zsh-users/zsh-autosuggestions + +# k is a zsh script / plugin to make directory listings more readable, +# adding a bit of color and some git status information on files and directories +zgen load rimraf/k + +# Bullet train prompt setup +# zgen load caiogondim/bullet-train-oh-my-zsh-theme bullet-train +zgen load denysdovhan/spaceship-zsh-theme spaceship + +# Save it all to init script +zgen save diff --git a/link/.zlogin b/link/.zlogin deleted file mode 120000 index 5765ab0..0000000 --- a/link/.zlogin +++ /dev/null @@ -1 +0,0 @@ -.zprezto/runcoms/zlogin \ No newline at end of file diff --git a/link/.zprezto b/link/.zprezto deleted file mode 160000 index f2a826e..0000000 --- a/link/.zprezto +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f2a826e963f06a204dc0e09c05fc3e5419799f52 diff --git a/link/.zpreztorc b/link/.zpreztorc deleted file mode 100644 index 0afeeb0..0000000 --- a/link/.zpreztorc +++ /dev/null @@ -1,148 +0,0 @@ -# -# Sets Prezto options. -# -# Authors: -# Sorin Ionescu -# - -# -# General -# - -# Set case-sensitivity for completion, history lookup, etc. -# zstyle ':prezto:*:*' case-sensitive 'yes' - -# Color output (auto set to 'no' on dumb terminals). -zstyle ':prezto:*:*' color 'yes' - -# Set the Zsh modules to load (man zshmodules). -# zstyle ':prezto:load' zmodule 'attr' 'stat' - -# Set the Zsh functions to load (man zshcontrib). -# zstyle ':prezto:load' zfunction 'zargs' 'zmv' - -# Set the Prezto modules to load (browse modules). -# The order matters. -zstyle ':prezto:load' pmodule \ - 'environment' \ - 'terminal' \ - 'editor' \ - 'history' \ - 'directory' \ - 'spectrum' \ - 'gnu-utility' \ - 'utility' \ - 'completion' \ - 'prompt' \ - 'git' \ - 'ruby' \ - 'tmux' \ - 'homebrew' - -# -# Editor -# - -# Set the key mapping style to 'emacs' or 'vi'. -zstyle ':prezto:module:editor' key-bindings 'vi' - -# Auto convert .... to ../.. -# zstyle ':prezto:module:editor' dot-expansion 'yes' - -# -# Git -# - -# Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'. -# zstyle ':prezto:module:git:status:ignore' submodules 'all' - -# -# GNU Utility -# - -# Set the command prefix on non-GNU systems. -# zstyle ':prezto:module:gnu-utility' prefix 'g' - -# -# History Substring Search -# - -# Set the query found color. -# zstyle ':prezto:module:history-substring-search:color' found '' - -# Set the query not found color. -# zstyle ':prezto:module:history-substring-search:color' not-found '' - -# Set the search globbing flags. -# zstyle ':prezto:module:history-substring-search' globbing-flags '' - -# -# Pacman -# - -# Set the Pacman frontend. -# zstyle ':prezto:module:pacman' frontend 'yaourt' - -# -# Prompt -# - -# Set the prompt theme to load. -# Setting it to 'random' loads a random theme. -# Auto set to 'off' on dumb terminals. -zstyle ':prezto:module:prompt' theme 'sorin' - -# -# Screen -# - -# Auto start a session when Zsh is launched in a local terminal. -# zstyle ':prezto:module:screen:auto-start' local 'yes' - -# Auto start a session when Zsh is launched in a SSH connection. -# zstyle ':prezto:module:screen:auto-start' remote 'yes' - -# -# SSH -# - -# Set the SSH identities to load into the agent. -# zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'id_rsa2' 'id_github' - -# -# Syntax Highlighting -# - -# Set syntax highlighters. -# By default, only the main highlighter is enabled. -# zstyle ':prezto:module:syntax-highlighting' highlighters \ -# 'main' \ -# 'brackets' \ -# 'pattern' \ -# 'cursor' \ -# 'root' -# -# Set syntax highlighting styles. -# zstyle ':prezto:module:syntax-highlighting' styles \ -# 'builtin' 'bg=blue' \ -# 'command' 'bg=blue' \ -# 'function' 'bg=blue' -# - -# -# Terminal -# - -# Auto set the tab and window titles. -zstyle ':prezto:module:terminal' auto-title 'yes' - -# -# Tmux -# - -# Auto start a session when Zsh is launched in a local terminal. -# zstyle ':prezto:module:tmux:auto-start' local 'yes' - -# Auto start a session when Zsh is launched in a SSH connection. -# zstyle ':prezto:module:tmux:auto-start' remote 'yes' - diff --git a/link/.zprofile b/link/.zprofile deleted file mode 120000 index b085555..0000000 --- a/link/.zprofile +++ /dev/null @@ -1 +0,0 @@ -.zprezto/runcoms/zprofile \ No newline at end of file diff --git a/link/.zshenv b/link/.zshenv deleted file mode 120000 index 2ffffef..0000000 --- a/link/.zshenv +++ /dev/null @@ -1 +0,0 @@ -.zprezto/runcoms/zshenv \ No newline at end of file diff --git a/link/.zshrc b/link/.zshrc deleted file mode 100644 index e8b40b1..0000000 --- a/link/.zshrc +++ /dev/null @@ -1,66 +0,0 @@ -# -# Executes commands at the start of an interactive session. -# -# Authors: -# Sorin Ionescu -# - -# Source Prezto. -# if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then -# source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" -# fi - -# Source antigen -# source $(brew --prefix)/share/antigen/antigen.zsh -# source ~/.antigen.zsh - -# load zgen -source "${HOME}/.zgen/zgen.zsh" - -if ! zgen saved; then - # specify plugins here - zgen oh-my-zsh - - # generate the init script from plugins above - zgen oh-my-zsh plugins/git - zgen oh-my-zsh plugins/sudo - zgen oh-my-zsh plugins/command-not-found - - zgen load https://gist.github.com/3750104.git agnoster - - zgen load zsh-users/zsh-syntax-highlighting - zgen load zsh-users/zsh-history-substring-search - zgen load zsh-users/zsh-autosuggestions - - zgen oh-my-zsh plugins/brew - zgen oh-my-zsh plugins/osx - - zgen save -fi - -# Run all files in dotfiles source directory -if [[ -d "$HOME/dotfiles/source" ]]; then - if [ "$(ls -A $HOME/dotfiles/source)" ]; then - for file in ~/dotfiles/source/*; do - source "$file" - done - fi -fi - -# Run all files in local source directory -if [[ -d "$HOME/source" ]]; then - if [ "$(ls -A $HOME/source)" ]; then - for file in $HOME/source/*; do - source "$file" - done - fi -fi - -# Customize to your needs... - -export NVM_DIR="/Users/tedkulp/.nvm" -[ -s "$(brew --prefix nvm)/nvm.sh" ] && . "$(brew --prefix nvm)/nvm.sh" # This loads nvm - -# setopt no_complete_aliases - -test -e ${HOME}/.iterm2_shell_integration.zsh && source ${HOME}/.iterm2_shell_integration.zsh diff --git a/source/aliases.zsh b/link/.zshrc.d/aliases similarity index 100% rename from source/aliases.zsh rename to link/.zshrc.d/aliases diff --git a/source/boot2docker.zsh b/link/.zshrc.d/boot2docker similarity index 100% rename from source/boot2docker.zsh rename to link/.zshrc.d/boot2docker diff --git a/source/chruby.zsh b/link/.zshrc.d/chruby similarity index 100% rename from source/chruby.zsh rename to link/.zshrc.d/chruby diff --git a/source/docker.zsh b/link/.zshrc.d/docker similarity index 100% rename from source/docker.zsh rename to link/.zshrc.d/docker diff --git a/source/editor.zsh b/link/.zshrc.d/editor similarity index 100% rename from source/editor.zsh rename to link/.zshrc.d/editor diff --git a/source/git.zsh b/link/.zshrc.d/git similarity index 100% rename from source/git.zsh rename to link/.zshrc.d/git diff --git a/source/go.zsh b/link/.zshrc.d/go similarity index 100% rename from source/go.zsh rename to link/.zshrc.d/go diff --git a/link/.zshrc.d/iterm2 b/link/.zshrc.d/iterm2 new file mode 100644 index 0000000..52d9b5f --- /dev/null +++ b/link/.zshrc.d/iterm2 @@ -0,0 +1 @@ +test -e ${HOME}/.iterm2_shell_integration.zsh && source ${HOME}/.iterm2_shell_integration.zsh diff --git a/source/knife.zsh b/link/.zshrc.d/knife similarity index 100% rename from source/knife.zsh rename to link/.zshrc.d/knife diff --git a/source/nocorrect.zsh b/link/.zshrc.d/nocorrect similarity index 100% rename from source/nocorrect.zsh rename to link/.zshrc.d/nocorrect diff --git a/source/nvm.zsh b/link/.zshrc.d/nvm similarity index 100% rename from source/nvm.zsh rename to link/.zshrc.d/nvm diff --git a/source/path.zsh b/link/.zshrc.d/path similarity index 100% rename from source/path.zsh rename to link/.zshrc.d/path diff --git a/source/tmux.zsh b/link/.zshrc.d/tmux similarity index 100% rename from source/tmux.zsh rename to link/.zshrc.d/tmux diff --git a/source/fleetctl.zsh b/source/fleetctl.zsh deleted file mode 100644 index fd3bdbb..0000000 --- a/source/fleetctl.zsh +++ /dev/null @@ -1,2 +0,0 @@ -alias fcq="fleetctl --endpoint=http://192.168.3.32:4001 " -alias ecq="etcdctl --peers=192.168.3.32:4001 " diff --git a/source/history.zsh b/source/history.zsh deleted file mode 100644 index 02107e1..0000000 --- a/source/history.zsh +++ /dev/null @@ -1 +0,0 @@ -bindkey '^r' history-incremental-search-backward