From 010fb807e3b265f84416aa26b492d5daddc70a3e Mon Sep 17 00:00:00 2001 From: Vincent Composieux Date: Sun, 3 Sep 2017 10:47:46 +0200 Subject: [PATCH] Added .zshrc with extra dotfiles --- .aliases | 23 ++++++++++++++ .exports | 6 ++++ .sources | 2 ++ .zshrc | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 4 +++ 5 files changed, 130 insertions(+) create mode 100644 .aliases create mode 100644 .exports create mode 100644 .sources create mode 100644 .zshrc diff --git a/.aliases b/.aliases new file mode 100644 index 0000000..41cf30e --- /dev/null +++ b/.aliases @@ -0,0 +1,23 @@ +# Navigation +alias ..="cd .." +alias ...="cd ../.." +alias ....="cd ../../.." +alias .....="cd ../../../.." +alias -- -="cd -" + +# cURL +alias curltime="curl -w \"\nConnect: %{time_connect} TTFB: %{time_starttransfer} Total time: %{time_total} \n\"" + +# Recursively delete `.DS_Store` files +alias cleanup="find . -type f -name '*.DS_Store' -ls -delete" + +# IP addresses +alias ip="dig +short myip.opendns.com @resolver1.opendns.com" +alias localip="ipconfig getifaddr en7" +alias ips="ifconfig -a | grep -o 'inet6\? \(addr:\)\?\s\?\(\(\([0-9]\+\.\)\{3\}[0-9]\+\)\|[a-fA-F0-9:]\+\)' | awk '{ sub(/inet6? (addr:)? ?/, \"\"); print }'" + +# Network interfaces +alias ifactive="ifconfig | pcregrep -M -o '^[^\t:]+:([^\n]|\n\t)*status: active'" + +# Updates macOS applications and updates Homebrew packages +alias update='sudo softwareupdate -i -a; brew update; brew upgrade; brew cleanup' diff --git a/.exports b/.exports new file mode 100644 index 0000000..d05914b --- /dev/null +++ b/.exports @@ -0,0 +1,6 @@ +# Golang +export GOPATH="$HOME/golang" +export GOBIN="$GOPATH/bin" + +# PATH +export PATH="$PATH:$GOBIN" diff --git a/.sources b/.sources new file mode 100644 index 0000000..f3dd7ab --- /dev/null +++ b/.sources @@ -0,0 +1,2 @@ +# Autoenv +source /usr/local/opt/autoenv/activate.sh diff --git a/.zshrc b/.zshrc new file mode 100644 index 0000000..4fb5a38 --- /dev/null +++ b/.zshrc @@ -0,0 +1,95 @@ +# Path to your oh-my-zsh installation. +export ZSH=/Users/vincent/.oh-my-zsh + +# Set name of the theme to load. Optionally, if you set this to "random" +# it'll load a random theme each time that oh-my-zsh is loaded. +# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes +ZSH_THEME="minimal" + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. Case +# sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment the following line to disable bi-weekly auto-update checks. +# DISABLE_AUTO_UPDATE="true" + +# Uncomment the following line to change how often to auto-update (in days). +# export UPDATE_ZSH_DAYS=13 + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) +# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(git zsh-iterm-touchbar) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# ssh +# export SSH_KEY_PATH="~/.ssh/rsa_id" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + +# tabtab source for serverless package +# uninstall by removing these lines or running `tabtab uninstall serverless` +[[ -f /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/serverless.zsh ]] && . /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/serverless.zsh +# tabtab source for sls package +# uninstall by removing these lines or running `tabtab uninstall sls` +[[ -f /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/sls.zsh ]] && . /usr/local/lib/node_modules/serverless/node_modules/tabtab/.completions/sls.zsh + +# Load extra dotflies +for file in ~/.{exports,aliases,sources}; do + [ -r "$file" ] && [ -f "$file" ] && source "$file"; +done; +unset file; diff --git a/Makefile b/Makefile index 13ab274..322d359 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,10 @@ install: ## Installs dotfiles into current environment @$(MAKE) DOTFILE=.gitconfig install_file @$(MAKE) DOTFILE=.gitignore install_file @$(MAKE) DOTFILE=.hyper.js install_file + @$(MAKE) DOTFILE=.aliases install_file + @$(MAKE) DOTFILE=.exports install_file + @$(MAKE) DOTFILE=.sources install_file + @$(MAKE) DOTFILE=.zshrc install_file install_file: @if [ ! -f ${HOME}/${DOTFILE} ]; then \