Switched back to oh my zsh and updated zsh theme
This commit is contained in:
parent
2491100237
commit
ee4b2a5359
GPG Key ID:
FA5F485356B0D2D4
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -1,6 +1 @@
|
||||||
zsh/.zcompdump
|
|
||||||
zsh/.zcompcache
|
|
||||||
zsh/.zcompdump.zwc
|
|
||||||
zsh/.zhistory
|
|
||||||
|
|
||||||
nvim/.config/nvim/plugged
|
nvim/.config/nvim/plugged
|
||||||
|
|
|
||||||
9
.gitmodules
vendored
9
.gitmodules
vendored
|
|
@ -1,3 +1,6 @@
|
||||||
[submodule "zsh/prezto"]
|
[submodule "zsh/ohmyzsh"]
|
||||||
path = zsh/prezto
|
path = zsh/ohmyzsh
|
||||||
url = https://github.com/sorin-ionescu/prezto.git
|
url = https://github.com/ohmyzsh/ohmyzsh
|
||||||
|
[submodule "zsh/custom/plugins/zsh-autosuggestions"]
|
||||||
|
path = zsh/custom/plugins/zsh-autosuggestions
|
||||||
|
url = https://github.com/zsh-users/zsh-autosuggestions/
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,2 @@
|
||||||
/prezto/*
|
ohmyzsh
|
||||||
.zlogin
|
custom
|
||||||
.zlogout
|
|
||||||
.zpreztorc
|
|
||||||
.zprofile
|
|
||||||
.zshenv
|
|
||||||
|
|
||||||
gitalias.zsh
|
|
||||||
agnoster.zsh-theme
|
|
||||||
|
|
||||||
.zcompdump
|
|
||||||
.zcompdump.zwc
|
|
||||||
.zhistory
|
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,8 +0,0 @@
|
||||||
gradle_group_tasks=( ${(Q)"${(z)$(<<\EO:gradle_group_tasks
|
|
||||||
|
|
||||||
EO:gradle_group_tasks
|
|
||||||
)}"} )
|
|
||||||
gradle_all_tasks=( ${(Q)"${(z)$(<<\EO:gradle_all_tasks
|
|
||||||
|
|
||||||
EO:gradle_all_tasks
|
|
||||||
)}"} )
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
gradle_group_tasks=( ${(Q)"${(z)$(<<\EO:gradle_group_tasks
|
|
||||||
|
|
||||||
EO:gradle_group_tasks
|
|
||||||
)}"} )
|
|
||||||
gradle_all_tasks=( ${(Q)"${(z)$(<<\EO:gradle_all_tasks
|
|
||||||
|
|
||||||
EO:gradle_all_tasks
|
|
||||||
)}"} )
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
gradle_group_tasks=( ${(Q)"${(z)$(<<\EO:gradle_group_tasks
|
|
||||||
|
|
||||||
EO:gradle_group_tasks
|
|
||||||
)}"} )
|
|
||||||
gradle_all_tasks=( ${(Q)"${(z)$(<<\EO:gradle_all_tasks
|
|
||||||
|
|
||||||
EO:gradle_all_tasks
|
|
||||||
)}"} )
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
gradle_group_tasks=( ${(Q)"${(z)$(<<\EO:gradle_group_tasks
|
|
||||||
|
|
||||||
EO:gradle_group_tasks
|
|
||||||
)}"} )
|
|
||||||
gradle_all_tasks=( ${(Q)"${(z)$(<<\EO:gradle_all_tasks
|
|
||||||
|
|
||||||
EO:gradle_all_tasks
|
|
||||||
)}"} )
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
_docker_hide_legacy_commands=''
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
_docker_subcommands=( ${(Q)"${(z)$(<<\EO:_docker_subcommands
|
|
||||||
'builder:Manage builds' 'buildx*:Docker Buildx (Docker Inc., v0.7.1-docker)' 'compose*:Docker Compose (Docker Inc., 2.2.2)' 'config:Manage Docker configs' 'container:Manage containers' 'context:Manage contexts' 'image:Manage images' 'manifest:Manage Docker image manifests and manifest lists' 'network:Manage networks' 'node:Manage Swarm nodes' 'plugin:Manage plugins' 'secret:Manage Docker secrets' 'service:Manage services' 'stack:Manage Docker stacks' 'swarm:Manage Swarm' 'system:Manage Docker' 'trust:Manage trust on Docker images' 'volume:Manage volumes' 'attach:Attach local standard input, output, and error streams to a running container' 'build:Build an image from a Dockerfile' '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 to files or directories on a container''s filesystem' 'events:Get real time events from the server' 'exec:Run a command in a running container' 'export:Export a container''s filesystem as a tar archive' 'history:Show the history of an image' 'images:List images' 'import:Import the contents from a tarball to create a filesystem image' 'info:Display system-wide information' 'inspect:Return low-level information on Docker objects' 'kill:Kill one or more running containers' 'load:Load an image from a tar archive or STDIN' 'login:Log in to a Docker registry' 'logout:Log out from a Docker registry' 'logs:Fetch the logs of a container' 'pause:Pause all processes within one or more containers' 'port:List port mappings or a specific mapping for the container' 'ps:List containers' 'pull:Pull an image or a repository from a registry' 'push:Push an image or a repository to a registry' 'rename:Rename a container' 'restart:Restart one or more containers' 'rm:Remove one or more containers' 'rmi:Remove one or more images' 'run:Run a command in a new container' 'save:Save one or more images to a tar archive (streamed to STDOUT by default)' 'search:Search the Docker Hub for images' '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' 'tag:Create a tag TARGET_IMAGE that refers to SOURCE_IMAGE' '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' 'version:Show the Docker version information' 'wait:Block until one or more containers stop, then print their exit codes' 'daemon:Enable daemon mode' 'help:Show help for a command'
|
|
||||||
EO:_docker_subcommands
|
|
||||||
)}"} )
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +0,0 @@
|
||||||
_svn_cmds=( ${(Q)"${(z)$(<<\EO:_svn_cmds
|
|
||||||
'patch' ':patch:' 'status' ':status:stat:st:' 'help' ':help:?:h:' 'propdel' ':propdel:pdel:pd:' 'switch' ':switch:sw:' 'diff' ':diff:di:' 'x-shelve' ':x-shelve:' 'propget' ':propget:pget:pg:' 'changelist' ':changelist:cl:' 'x-shelf-list' ':x-shelf-list:x-shelves:' 'cat' ':cat:' 'x-shelf-log' ':x-shelf-log:' 'x-unshelve' ':x-unshelve:' 'move' ':move:mv:rename:ren:' 'unlock' ':unlock:' 'resolved' ':resolved:' 'propedit' ':propedit:pedit:pe:' 'propset' ':propset:pset:ps:' 'update' ':update:up:' 'add' ':add:' 'x-wc-copy-mods' ':x-wc-copy-mods:' 'list' ':list:ls:' 'x-shelf-drop' ':x-shelf-drop:' 'relocate' ':relocate:' 'cleanup' ':cleanup:' 'import' ':import:' 'auth' ':auth:' 'mkdir' ':mkdir:' 'blame' ':blame:praise:annotate:ann:' 'lock' ':lock:' 'proplist' ':proplist:plist:pl:' 'checkout' ':checkout:co:' 'delete' ':delete:del:remove:rm:' 'info' ':info:' 'x-shelf-save' ':x-shelf-save:' 'merge' ':merge:' 'export' ':export:' 'copy' ':copy:cp:' 'upgrade' ':upgrade:' 'mergeinfo' ':mergeinfo:' 'resolve' ':resolve:' 'revert' ':revert:' 'x-shelf-diff' ':x-shelf-diff:' 'commit' ':commit:ci:' 'x-shelf-list-by-paths' ':x-shelf-list-by-paths:' 'log' ':log:'
|
|
||||||
EO:_svn_cmds
|
|
||||||
)}"} )
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
args=( ${(Q)"${(z)$(<<\EO:args
|
|
||||||
'(--revision)-r+:arg:' '(-r)--revision=:arg:' '(--change)-c+:arg:' '(-c)--change=:arg:' '(--quiet)-q' '(-q)--quiet' '(--verbose)-v' '(-v)--verbose' '(--use-merge-history)-g' '(-g)--use-merge-history' '--targets=:arg:' '--stop-on-copy' '--incremental' '--xml' '(--limit)-l+:arg:' '(-l)--limit=:arg:' '--with-all-revprops' '--with-no-revprops' '--with-revprop=:arg:' '--depth=:operation depth (how far to recurse):(empty files immediates infinity)' '--diff' '--diff-cmd=:arg:' '--internal-diff' '(--extensions)-x+:arg:' '(-x)--extensions=:arg:' '--search=:arg:' '--search-and=:arg:' '--username=:arg:' '--password=:arg:' '--password-from-stdin' '--no-auth-cache' '--non-interactive' '--force-interactive' '--trust-server-cert' '--trust-server-cert-failures=:failures:_values -s , "certificate failures to ignore" "unknown-ca[unknown authority]" "cn-mismatch[hostname mismatch]" "expired[certificate expired]" "not-yet-valid[certificate not yet valid]" "other[all other failures]"' '--config-dir=:config dir:_directories' '*--config-option=: :_svn_config_options'
|
|
||||||
EO:args
|
|
||||||
)}"} )
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
usage='usage: 1. log [PATH][@REV]'
|
|
||||||
15
zsh/.zlogin
15
zsh/.zlogin
|
|
@ -1,15 +0,0 @@
|
||||||
#
|
|
||||||
# Executes commands at login post-zshrc.
|
|
||||||
#
|
|
||||||
# Authors:
|
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
|
||||||
#
|
|
||||||
|
|
||||||
# Execute code that does not affect the current session in the background.
|
|
||||||
{
|
|
||||||
# Compile the completion dump to increase startup speed.
|
|
||||||
zcompdump="${ZDOTDIR:-$HOME}/.zcompdump"
|
|
||||||
if [[ -s "$zcompdump" && (! -s "${zcompdump}.zwc" || "$zcompdump" -nt "${zcompdump}.zwc") ]]; then
|
|
||||||
zcompile "$zcompdump"
|
|
||||||
fi
|
|
||||||
} &!
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
#
|
|
||||||
# Executes commands at logout.
|
|
||||||
#
|
|
||||||
# Authors:
|
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
|
||||||
#
|
|
||||||
237
zsh/.zpreztorc
237
zsh/.zpreztorc
|
|
@ -1,237 +0,0 @@
|
||||||
#
|
|
||||||
# Sets Prezto options.
|
|
||||||
#
|
|
||||||
# Authors:
|
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# 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'
|
|
||||||
|
|
||||||
zstyle ':prezto:module:utility' safe-ops 'no'.
|
|
||||||
|
|
||||||
# Add additional directories to load prezto modules from
|
|
||||||
# zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib
|
|
||||||
|
|
||||||
# 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' \
|
|
||||||
'utility' \
|
|
||||||
'git' \
|
|
||||||
'completion' \
|
|
||||||
'autosuggestions' \
|
|
||||||
'history-substring-search' \
|
|
||||||
'prompt'
|
|
||||||
|
|
||||||
#
|
|
||||||
# Autosuggestions
|
|
||||||
#
|
|
||||||
|
|
||||||
# Set the query found color.
|
|
||||||
#zstyle ':prezto:module:autosuggestions:color' found ''
|
|
||||||
|
|
||||||
zstyle ':prezto:module:history-substring-search:color' found ''
|
|
||||||
zstyle ':prezto:module:history-substring-search:color' not-found ''
|
|
||||||
|
|
||||||
#
|
|
||||||
# Completions
|
|
||||||
#
|
|
||||||
|
|
||||||
# Set the entries to ignore in static */etc/hosts* for host completion.
|
|
||||||
# zstyle ':prezto:module:completion:*:hosts' etc-host-ignores \
|
|
||||||
# '0.0.0.0' '127.0.0.1'
|
|
||||||
|
|
||||||
#
|
|
||||||
# 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'
|
|
||||||
|
|
||||||
# Allow the zsh prompt context to be shown.
|
|
||||||
zstyle ':prezto:module:editor' ps-context 'yes'
|
|
||||||
|
|
||||||
#
|
|
||||||
# Git
|
|
||||||
#
|
|
||||||
|
|
||||||
# Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'.
|
|
||||||
zstyle ':prezto:module:git:status:ignore' submodules 'all'
|
|
||||||
zstyle ':prezto:module:git:alias' skip 'yes'
|
|
||||||
|
|
||||||
#
|
|
||||||
# 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 ''
|
|
||||||
|
|
||||||
#
|
|
||||||
# macOS
|
|
||||||
#
|
|
||||||
|
|
||||||
# Set the keyword used by `mand` to open man pages in Dash.app
|
|
||||||
# zstyle ':prezto:module:osx:man' dash-keyword 'manpages'
|
|
||||||
|
|
||||||
#
|
|
||||||
# Pacman
|
|
||||||
#
|
|
||||||
|
|
||||||
# Set the Pacman frontend.
|
|
||||||
#zstyle ':prezto:module:pacman' frontend 'aurman'
|
|
||||||
|
|
||||||
#
|
|
||||||
# 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 'agnoster'
|
|
||||||
|
|
||||||
# Set the working directory prompt display length.
|
|
||||||
# By default, it is set to 'short'. Set it to 'long' (without '~' expansion)
|
|
||||||
# for longer or 'full' (with '~' expansion) for even longer prompt display.
|
|
||||||
#zstyle ':prezto:module:prompt' pwd-length 'short'
|
|
||||||
|
|
||||||
# Set the prompt to display the return code along with an indicator for non-zero
|
|
||||||
# return codes. This is not supported by all prompts.
|
|
||||||
#zstyle ':prezto:module:prompt' show-return-val 'false'
|
|
||||||
|
|
||||||
#
|
|
||||||
# Ruby
|
|
||||||
#
|
|
||||||
|
|
||||||
# Auto switch the Ruby version on directory change.
|
|
||||||
# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes'
|
|
||||||
|
|
||||||
#
|
|
||||||
# Python
|
|
||||||
#
|
|
||||||
|
|
||||||
# Auto switch the Python virtualenv on directory change.
|
|
||||||
# zstyle ':prezto:module:python:virtualenv' auto-switch 'yes'
|
|
||||||
|
|
||||||
# Automatically initialize virtualenvwrapper if pre-requisites are met.
|
|
||||||
# zstyle ':prezto:module:python:virtualenv' initialize 'yes'
|
|
||||||
|
|
||||||
#
|
|
||||||
# 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'
|
|
||||||
|
|
||||||
#
|
|
||||||
# Tmux
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# 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' \
|
|
||||||
# 'line' \
|
|
||||||
# 'cursor' \
|
|
||||||
# 'root'
|
|
||||||
#
|
|
||||||
# Set syntax highlighting styles.
|
|
||||||
# zstyle ':prezto:module:syntax-highlighting' styles \
|
|
||||||
# 'builtin' 'bg=blue' \
|
|
||||||
# 'command' 'bg=blue' \
|
|
||||||
# 'function' 'bg=blue'
|
|
||||||
#
|
|
||||||
# Set syntax pattern styles.
|
|
||||||
# zstyle ':prezto:module:syntax-highlighting' pattern \
|
|
||||||
# 'rm*-rf*' 'fg=white,bold,bg=red'
|
|
||||||
|
|
||||||
#
|
|
||||||
# Terminal
|
|
||||||
#
|
|
||||||
|
|
||||||
# Auto set the tab and window titles.
|
|
||||||
# zstyle ':prezto:module:terminal' auto-title 'yes'
|
|
||||||
|
|
||||||
# Set the window title format.
|
|
||||||
# zstyle ':prezto:module:terminal:window-title' format '%n@%m: %3~'
|
|
||||||
|
|
||||||
# Set the tab title format.
|
|
||||||
# zstyle ':prezto:module:terminal:tab-title' format '%m: %s'
|
|
||||||
|
|
||||||
# Set the terminal multiplexer title format.
|
|
||||||
# zstyle ':prezto:module:terminal:multiplexer-title' format '%s'
|
|
||||||
|
|
||||||
#
|
|
||||||
# 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'
|
|
||||||
|
|
||||||
# Integrate with iTerm2.
|
|
||||||
# zstyle ':prezto:module:tmux:iterm' integrate 'yes'
|
|
||||||
|
|
||||||
# Set the default session name:
|
|
||||||
# zstyle ':prezto:module:tmux:session' name 'YOUR DEFAULT SESSION NAME'
|
|
||||||
|
|
||||||
#
|
|
||||||
# Utility
|
|
||||||
#
|
|
||||||
|
|
||||||
# Enabled safe options. This aliases cp, ln, mv and rm so that they prompt
|
|
||||||
# before deleting or overwriting files. Set to 'no' to disable this safer
|
|
||||||
# behavior.
|
|
||||||
# zstyle ':prezto:module:utility' safe-ops 'yes'
|
|
||||||
|
|
@ -1,55 +0,0 @@
|
||||||
#
|
|
||||||
# Executes commands at login pre-zshrc.
|
|
||||||
#
|
|
||||||
# Authors:
|
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# Editors
|
|
||||||
#
|
|
||||||
|
|
||||||
export EDITOR='nvim'
|
|
||||||
export VISUAL='nvim'
|
|
||||||
export PAGER='less'
|
|
||||||
|
|
||||||
#
|
|
||||||
# Language
|
|
||||||
#
|
|
||||||
|
|
||||||
if [[ -z "$LANG" ]]; then
|
|
||||||
export LANG='en_US.UTF-8'
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
# Paths
|
|
||||||
#
|
|
||||||
|
|
||||||
# Ensure path arrays do not contain duplicates.
|
|
||||||
typeset -gU cdpath fpath mailpath path
|
|
||||||
|
|
||||||
# Set the list of directories that cd searches.
|
|
||||||
# cdpath=(
|
|
||||||
# $cdpath
|
|
||||||
# )
|
|
||||||
|
|
||||||
# Set the list of directories that Zsh searches for programs.
|
|
||||||
path=(
|
|
||||||
/usr/local/{bin,sbin}
|
|
||||||
$path
|
|
||||||
)
|
|
||||||
|
|
||||||
#
|
|
||||||
# Less
|
|
||||||
#
|
|
||||||
|
|
||||||
# Set the default Less options.
|
|
||||||
# Mouse-wheel scrolling has been disabled by -X (disable screen clearing).
|
|
||||||
# Remove -X and -F (exit if the content fits on one screen) to enable it.
|
|
||||||
export LESS='-F -g -i -M -R -S -w -z-4'
|
|
||||||
|
|
||||||
# Set the Less input preprocessor.
|
|
||||||
# Try both `lesspipe` and `lesspipe.sh` as either might exist on a system.
|
|
||||||
if (( $#commands[(i)lesspipe(|.sh)] )); then
|
|
||||||
export LESSOPEN="| /usr/bin/env $commands[(i)lesspipe(|.sh)] %s 2>&-"
|
|
||||||
fi
|
|
||||||
11
zsh/.zshenv
11
zsh/.zshenv
|
|
@ -1,11 +0,0 @@
|
||||||
#
|
|
||||||
# Defines environment variables.
|
|
||||||
#
|
|
||||||
# Authors:
|
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
|
||||||
#
|
|
||||||
|
|
||||||
# Ensure that a non-login, non-interactive shell has a defined environment.
|
|
||||||
if [[ ( "$SHLVL" -eq 1 && ! -o LOGIN ) && -s "${ZDOTDIR:-$HOME}/.zprofile" ]]; then
|
|
||||||
source "${ZDOTDIR:-$HOME}/.zprofile"
|
|
||||||
fi
|
|
||||||
25
zsh/.zshrc
25
zsh/.zshrc
|
|
@ -1,25 +0,0 @@
|
||||||
if [ -z "$TMUX" ]; then tmux; exit; fi
|
|
||||||
|
|
||||||
export ZDOTDIR="${HOME}/.dotfiles/zsh"
|
|
||||||
export EDITOR=nvim
|
|
||||||
export USE_CCACHE=1
|
|
||||||
export DOCKER_CLIENT_TIMEOUT=300
|
|
||||||
export COMPOSE_HTTP_TIMEOUT=300
|
|
||||||
|
|
||||||
export PATH="${HOME}/.local/bin:$PATH"
|
|
||||||
|
|
||||||
alias cl="clear"
|
|
||||||
alias tmux="tmux -2"
|
|
||||||
|
|
||||||
KEYTIMEOUT=1
|
|
||||||
|
|
||||||
# Source Prezto.
|
|
||||||
if [[ -s "${ZDOTDIR}/prezto/init.zsh" ]]; then
|
|
||||||
source "${ZDOTDIR}/prezto/init.zsh"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -s "${ZDOTDIR}/gitalias.zsh" ]]; then
|
|
||||||
source "${ZDOTDIR}/gitalias.zsh"
|
|
||||||
fi
|
|
||||||
|
|
||||||
export GREP_COLORS="mt=01;32"
|
|
||||||
|
|
@ -1,167 +0,0 @@
|
||||||
# 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://gist.github.com/1595572).
|
|
||||||
#
|
|
||||||
# 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'
|
|
||||||
if [[ -z "$PRIMARY_FG" ]]; then
|
|
||||||
PRIMARY_FG=black
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Characters
|
|
||||||
SEGMENT_SEPARATOR="\ue0b0"
|
|
||||||
PLUSMINUS=""
|
|
||||||
BRANCH="\ue0a0"
|
|
||||||
DETACHED="\u27a6"
|
|
||||||
CROSS=""
|
|
||||||
LIGHTNING="\u26a1"
|
|
||||||
GEAR="\u2699"
|
|
||||||
|
|
||||||
# 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
|
|
||||||
print -n "%{$bg%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{$fg%}"
|
|
||||||
else
|
|
||||||
print -n "%{$bg%}%{$fg%}"
|
|
||||||
fi
|
|
||||||
CURRENT_BG=$1
|
|
||||||
[[ -n $3 ]] && print -n $3
|
|
||||||
}
|
|
||||||
|
|
||||||
# End the prompt, closing any open segments
|
|
||||||
prompt_end() {
|
|
||||||
if [[ -n $CURRENT_BG ]]; then
|
|
||||||
print -n "%{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR\n%{%k%F{white}%}$SEGMENT_SEPARATOR"
|
|
||||||
else
|
|
||||||
print -n "%{%k%}"
|
|
||||||
fi
|
|
||||||
print -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() {
|
|
||||||
local user=`whoami`
|
|
||||||
|
|
||||||
if [[ -n "$SSH_CONNECTION" ]]; then
|
|
||||||
prompt_segment $PRIMARY_FG default " %(!.%{%F{yellow}%}.)$user@%m"
|
|
||||||
else
|
|
||||||
prompt_segment $PRIMARY_FG default " %(!.%{%F{yellow}%}.)$user "
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Git: branch/detached head, dirty status
|
|
||||||
prompt_git() {
|
|
||||||
local color ref
|
|
||||||
is_dirty() {
|
|
||||||
test -n "$(git status --porcelain --ignore-submodules)"
|
|
||||||
}
|
|
||||||
ref="$vcs_info_msg_0_"
|
|
||||||
if [[ -n "$ref" ]]; then
|
|
||||||
if is_dirty; then
|
|
||||||
color=yellow
|
|
||||||
ref="${ref} $PLUSMINUS"
|
|
||||||
else
|
|
||||||
color=green
|
|
||||||
ref="${ref} "
|
|
||||||
fi
|
|
||||||
if [[ "${ref/.../}" == "$ref" ]]; then
|
|
||||||
ref="$BRANCH $ref"
|
|
||||||
else
|
|
||||||
ref="$DETACHED ${ref/.../}"
|
|
||||||
fi
|
|
||||||
prompt_segment $color $PRIMARY_FG
|
|
||||||
print -n " $ref"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Dir: current working directory
|
|
||||||
prompt_dir() {
|
|
||||||
prompt_segment blue $PRIMARY_FG ' %3~ '
|
|
||||||
}
|
|
||||||
|
|
||||||
# Status:
|
|
||||||
# - was there an error
|
|
||||||
# - am I root
|
|
||||||
# - are there background jobs?
|
|
||||||
prompt_status() {
|
|
||||||
local symbols
|
|
||||||
symbols=()
|
|
||||||
[[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}$CROSS"
|
|
||||||
[[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}$LIGHTNING"
|
|
||||||
[[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}$GEAR"
|
|
||||||
|
|
||||||
[[ -n "$symbols" ]] && prompt_segment $PRIMARY_FG default " $symbols "
|
|
||||||
}
|
|
||||||
|
|
||||||
# Display current virtual environment
|
|
||||||
prompt_virtualenv() {
|
|
||||||
if [[ -n $VIRTUAL_ENV ]]; then
|
|
||||||
color=cyan
|
|
||||||
prompt_segment $color $PRIMARY_FG
|
|
||||||
print -Pn " $(basename $VIRTUAL_ENV) "
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
## Main prompt
|
|
||||||
prompt_agnoster_main() {
|
|
||||||
RETVAL=$?
|
|
||||||
CURRENT_BG='NONE'
|
|
||||||
prompt_status
|
|
||||||
prompt_context
|
|
||||||
prompt_virtualenv
|
|
||||||
prompt_dir
|
|
||||||
prompt_git
|
|
||||||
prompt_end
|
|
||||||
}
|
|
||||||
|
|
||||||
prompt_agnoster_precmd() {
|
|
||||||
vcs_info
|
|
||||||
PROMPT='%{%f%b%k%}$(prompt_agnoster_main) '
|
|
||||||
}
|
|
||||||
|
|
||||||
prompt_agnoster_setup() {
|
|
||||||
autoload -Uz add-zsh-hook
|
|
||||||
autoload -Uz vcs_info
|
|
||||||
|
|
||||||
prompt_opts=(cr subst percent)
|
|
||||||
|
|
||||||
add-zsh-hook precmd prompt_agnoster_precmd
|
|
||||||
|
|
||||||
zstyle ':vcs_info:*' enable git
|
|
||||||
zstyle ':vcs_info:*' check-for-changes false
|
|
||||||
zstyle ':vcs_info:git*' formats '%b'
|
|
||||||
zstyle ':vcs_info:git*' actionformats '%b (%a)'
|
|
||||||
}
|
|
||||||
|
|
||||||
prompt_agnoster_setup "$@"
|
|
||||||
1
zsh/custom/plugins/zsh-autosuggestions
Submodule
1
zsh/custom/plugins/zsh-autosuggestions
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
|
||||||
275
zsh/custom/themes/agnoster_dx.zsh-theme
Normal file
275
zsh/custom/themes/agnoster_dx.zsh-theme
Normal file
|
|
@ -0,0 +1,275 @@
|
||||||
|
# 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](https://iterm2.com/) over Terminal.app -
|
||||||
|
# it has significantly better color fidelity.
|
||||||
|
#
|
||||||
|
# If using with "light" variant of the Solarized color schema, set
|
||||||
|
# SOLARIZED_THEME variable to "light". If you don't specify, we'll assume
|
||||||
|
# you're using the "dark" variant.
|
||||||
|
#
|
||||||
|
# # 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'
|
||||||
|
|
||||||
|
case ${SOLARIZED_THEME:-dark} in
|
||||||
|
light) CURRENT_FG='white';;
|
||||||
|
*) CURRENT_FG='black';;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# 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 "%(1j. %B%F{cyan}%j%b .)"
|
||||||
|
echo -n "\n%F{white}$SEGMENT_SEPARATOR%{%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 [[ -n "$SSH_CLIENT" ]]; then
|
||||||
|
prompt_segment black default "%(!.%{%B%F{yellow}%}.)%n@%m%(!.%{%b%}.)"
|
||||||
|
else
|
||||||
|
prompt_segment black default "%(!.%{%B%F{yellow}%}.)%n%(!.%{%b%}.)"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Git: branch/detached head, dirty status
|
||||||
|
prompt_git() {
|
||||||
|
(( $+commands[git] )) || return
|
||||||
|
if [[ "$(git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
local PL_BRANCH_CHAR
|
||||||
|
() {
|
||||||
|
local LC_ALL="" LC_CTYPE="en_US.UTF-8"
|
||||||
|
PL_BRANCH_CHAR=$'\ue0a0' #
|
||||||
|
}
|
||||||
|
local ref dirty mode repo_path
|
||||||
|
|
||||||
|
if [[ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]]; then
|
||||||
|
repo_path=$(git rev-parse --git-dir 2>/dev/null)
|
||||||
|
dirty=$(parse_git_dirty)
|
||||||
|
ref=$(git symbolic-ref HEAD 2> /dev/null) || \
|
||||||
|
ref="◈ $(git describe --exact-match --tags 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 $CURRENT_FG
|
||||||
|
fi
|
||||||
|
|
||||||
|
local ahead behind
|
||||||
|
ahead=$(git log --oneline @{upstream}.. 2>/dev/null)
|
||||||
|
behind=$(git log --oneline ..@{upstream} 2>/dev/null)
|
||||||
|
if [[ -n "$ahead" ]] && [[ -n "$behind" ]]; then
|
||||||
|
PL_BRANCH_CHAR=$'\u21c5'
|
||||||
|
elif [[ -n "$ahead" ]]; then
|
||||||
|
PL_BRANCH_CHAR=$'\u21b1'
|
||||||
|
elif [[ -n "$behind" ]]; then
|
||||||
|
PL_BRANCH_CHAR=$'\u21b0'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -e "${repo_path}/BISECT_LOG" ]]; then
|
||||||
|
mode=" <B>"
|
||||||
|
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:gs/%/%%}/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
prompt_bzr() {
|
||||||
|
(( $+commands[bzr] )) || return
|
||||||
|
|
||||||
|
# Test if bzr repository in directory hierarchy
|
||||||
|
local dir="$PWD"
|
||||||
|
while [[ ! -d "$dir/.bzr" ]]; do
|
||||||
|
[[ "$dir" = "/" ]] && return
|
||||||
|
dir="${dir:h}"
|
||||||
|
done
|
||||||
|
|
||||||
|
local bzr_status status_mod status_all revision
|
||||||
|
if bzr_status=$(bzr status 2>&1); then
|
||||||
|
status_mod=$(echo -n "$bzr_status" | head -n1 | grep "modified" | wc -m)
|
||||||
|
status_all=$(echo -n "$bzr_status" | head -n1 | wc -m)
|
||||||
|
revision=${$(bzr log -r-1 --log-format line | cut -d: -f1):gs/%/%%}
|
||||||
|
if [[ $status_mod -gt 0 ]] ; then
|
||||||
|
prompt_segment yellow black "bzr@$revision ✚"
|
||||||
|
else
|
||||||
|
if [[ $status_all -gt 0 ]] ; then
|
||||||
|
prompt_segment yellow black "bzr@$revision"
|
||||||
|
else
|
||||||
|
prompt_segment green black "bzr@$revision"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
prompt_hg() {
|
||||||
|
(( $+commands[hg] )) || return
|
||||||
|
local rev st branch
|
||||||
|
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 $CURRENT_FG
|
||||||
|
fi
|
||||||
|
echo -n ${$(hg prompt "☿ {rev}@{branch}"):gs/%/%%} $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 $CURRENT_FG
|
||||||
|
fi
|
||||||
|
echo -n "☿ ${rev:gs/%/%%}@${branch:gs/%/%%}" $st
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Dir: current working directory
|
||||||
|
prompt_dir() {
|
||||||
|
prompt_segment blue $CURRENT_FG '%~'
|
||||||
|
}
|
||||||
|
|
||||||
|
# Virtualenv: current working virtualenv
|
||||||
|
export VIRTUAL_ENV_DISABLE_PROMPT=1
|
||||||
|
prompt_virtualenv() {
|
||||||
|
if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
|
||||||
|
prompt_segment magenta black "${VIRTUAL_ENV:t:gs/%/%%}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Status:
|
||||||
|
# - was there an error
|
||||||
|
# - am I root
|
||||||
|
# - are there background jobs?
|
||||||
|
prompt_status() {
|
||||||
|
local -a symbols
|
||||||
|
|
||||||
|
[[ $RETVAL -ne 0 ]] && prompt_segment red black ""
|
||||||
|
[[ $UID -eq 0 ]] && prompt_segment yellow black ""
|
||||||
|
}
|
||||||
|
|
||||||
|
#AWS Profile:
|
||||||
|
# - display current AWS_PROFILE name
|
||||||
|
# - displays yellow on red if profile name contains 'production' or
|
||||||
|
# ends in '-prod'
|
||||||
|
# - displays black on green otherwise
|
||||||
|
prompt_aws() {
|
||||||
|
[[ -z "$AWS_PROFILE" || "$SHOW_AWS_PROMPT" = false ]] && return
|
||||||
|
case "$AWS_PROFILE" in
|
||||||
|
*-prod|*production*) prompt_segment red yellow "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
|
||||||
|
*) prompt_segment cyan black "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
## Main prompt
|
||||||
|
build_prompt() {
|
||||||
|
RETVAL=$?
|
||||||
|
prompt_status
|
||||||
|
prompt_context
|
||||||
|
prompt_virtualenv
|
||||||
|
prompt_aws
|
||||||
|
prompt_dir
|
||||||
|
prompt_git
|
||||||
|
prompt_bzr
|
||||||
|
prompt_hg
|
||||||
|
prompt_end
|
||||||
|
}
|
||||||
|
|
||||||
|
PROMPT='%{%f%b%k%}$(build_prompt) '
|
||||||
|
# Disable vi-mode prompt
|
||||||
|
RPROMPT=''
|
||||||
51
zsh/dot-zshrc
Normal file
51
zsh/dot-zshrc
Normal file
|
|
@ -0,0 +1,51 @@
|
||||||
|
# Path to your oh-my-zsh installation.
|
||||||
|
export DOTFILES=${DOTFILES:-"$HOME/.dotfiles"}
|
||||||
|
export ZSH="$DOTFILES/zsh/ohmyzsh"
|
||||||
|
export ZSH_CUSTOM="$DOTFILES/zsh/custom"
|
||||||
|
|
||||||
|
ZSH_THEME="agnoster_dx"
|
||||||
|
|
||||||
|
zstyle ':omz:update' mode reminder # just remind me to update when it's time
|
||||||
|
# zstyle ':omz:update' frequency 13
|
||||||
|
|
||||||
|
# CASE_SENSITIVE="true"
|
||||||
|
# HYPHEN_INSENSITIVE="true"
|
||||||
|
# DISABLE_MAGIC_FUNCTIONS="true"
|
||||||
|
# DISABLE_AUTO_TITLE="true"
|
||||||
|
# ENABLE_CORRECTION="true"
|
||||||
|
COMPLETION_WAITING_DOTS="true"
|
||||||
|
|
||||||
|
plugins=(
|
||||||
|
git
|
||||||
|
zsh-autosuggestions
|
||||||
|
# Disabled because the highlighting conflicts with autosuggestions
|
||||||
|
# history-substring-search
|
||||||
|
vi-mode
|
||||||
|
tmux
|
||||||
|
colored-man-pages
|
||||||
|
command-not-found
|
||||||
|
dirhistory
|
||||||
|
)
|
||||||
|
|
||||||
|
HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="fg=yellow"
|
||||||
|
HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND="fg=red"
|
||||||
|
HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_TIMEOUT=3
|
||||||
|
|
||||||
|
VI_MODE_RESET_PROMT_ON_MODE_CHANGE=true
|
||||||
|
VI_MODE_SET_CURSOR=true
|
||||||
|
# Might cause issues?
|
||||||
|
KEYTIMEOUT=1
|
||||||
|
|
||||||
|
ZSH_TMUX_AUTOSTART=true
|
||||||
|
ZSH_TMUX_AUTOCONNECT=false
|
||||||
|
ZSH_TMUX_FIXTERM=true
|
||||||
|
|
||||||
|
source $ZSH/oh-my-zsh.sh
|
||||||
|
|
||||||
|
less_termcap[so]="${fg_bold[black]}${bg[white]}"
|
||||||
|
|
||||||
|
export PATH="${HOME}/.local/bin:$PATH"
|
||||||
|
export EDITOR=nvim
|
||||||
|
# export GREP_COLORS="mt=01;32"
|
||||||
|
|
||||||
|
alias cl="clear"
|
||||||
208
zsh/gitalias.zsh
208
zsh/gitalias.zsh
|
|
@ -1,208 +0,0 @@
|
||||||
alias g='git'
|
|
||||||
|
|
||||||
alias ga='git add'
|
|
||||||
alias gaa='git add --all'
|
|
||||||
alias gapa='git add --patch'
|
|
||||||
alias gau='git add --update'
|
|
||||||
alias gap='git apply'
|
|
||||||
|
|
||||||
alias gb='git branch'
|
|
||||||
alias gba='git branch -a'
|
|
||||||
alias gbd='git branch -d'
|
|
||||||
alias gbda='git branch --no-color --merged | command grep -vE "^(\*|\s*(master|develop|dev)\s*$)" | command xargs -n 1 git branch -d'
|
|
||||||
alias gbl='git blame -b -w'
|
|
||||||
alias gbnm='git branch --no-merged'
|
|
||||||
alias gbr='git branch --remote'
|
|
||||||
alias gbs='git bisect'
|
|
||||||
alias gbsb='git bisect bad'
|
|
||||||
alias gbsg='git bisect good'
|
|
||||||
alias gbsr='git bisect reset'
|
|
||||||
alias gbss='git bisect start'
|
|
||||||
|
|
||||||
alias gc='git commit -v'
|
|
||||||
alias gc!='git commit -v --amend'
|
|
||||||
alias gcn!='git commit -v --no-edit --amend'
|
|
||||||
alias gca='git commit -v -a'
|
|
||||||
alias gca!='git commit -v -a --amend'
|
|
||||||
alias gcan!='git commit -v -a --no-edit --amend'
|
|
||||||
alias gcans!='git commit -v -a -s --no-edit --amend'
|
|
||||||
alias gcam='git commit -a -m'
|
|
||||||
alias gcsm='git commit -s -m'
|
|
||||||
alias gcb='git checkout -b'
|
|
||||||
alias gcf='git config --list'
|
|
||||||
alias gcl='git clone --recursive'
|
|
||||||
alias gclean='git clean -fd'
|
|
||||||
alias gpristine='git reset --hard && git clean -dfx'
|
|
||||||
alias gcm='git checkout master'
|
|
||||||
alias gcd='git checkout develop'
|
|
||||||
alias gcmsg='git commit -m'
|
|
||||||
alias gco='git checkout'
|
|
||||||
alias gcount='git shortlog -sn'
|
|
||||||
compdef _git gcount
|
|
||||||
alias gcp='git cherry-pick'
|
|
||||||
alias gcpa='git cherry-pick --abort'
|
|
||||||
alias gcpc='git cherry-pick --continue'
|
|
||||||
alias gcs='git commit -S'
|
|
||||||
|
|
||||||
alias gd='git diff'
|
|
||||||
alias gdca='git diff --cached'
|
|
||||||
alias gdcw='git diff --cached --word-diff'
|
|
||||||
alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
|
|
||||||
alias gdt='git diff-tree --no-commit-id --name-only -r'
|
|
||||||
alias gdw='git diff --word-diff'
|
|
||||||
|
|
||||||
gdv() { git diff -w "$@" | view - }
|
|
||||||
compdef _git gdv=git-diff
|
|
||||||
|
|
||||||
alias gf='git fetch'
|
|
||||||
alias gfa='git fetch --all --prune'
|
|
||||||
alias gfo='git fetch origin'
|
|
||||||
|
|
||||||
function gfg() { git ls-files | grep $@ }
|
|
||||||
compdef _grep gfg
|
|
||||||
|
|
||||||
alias gg='git gui citool'
|
|
||||||
alias gga='git gui citool --amend'
|
|
||||||
|
|
||||||
ggf() {
|
|
||||||
[[ "$#" != 1 ]] && local b="$(git_current_branch)"
|
|
||||||
git push --force origin "${b:=$1}"
|
|
||||||
}
|
|
||||||
ggfl() {
|
|
||||||
[[ "$#" != 1 ]] && local b="$(git_current_branch)"
|
|
||||||
git push --force-with-lease origin "${b:=$1}"
|
|
||||||
}
|
|
||||||
compdef _git ggf=git-checkout
|
|
||||||
|
|
||||||
ggl() {
|
|
||||||
if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
|
|
||||||
git pull origin "${*}"
|
|
||||||
else
|
|
||||||
[[ "$#" == 0 ]] && local b="$(git_current_branch)"
|
|
||||||
git pull origin "${b:=$1}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
compdef _git ggl=git-checkout
|
|
||||||
|
|
||||||
ggp() {
|
|
||||||
if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
|
|
||||||
git push origin "${*}"
|
|
||||||
else
|
|
||||||
[[ "$#" == 0 ]] && local b="$(git_current_branch)"
|
|
||||||
git push origin "${b:=$1}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
compdef _git ggp=git-checkout
|
|
||||||
|
|
||||||
ggpnp() {
|
|
||||||
if [[ "$#" == 0 ]]; then
|
|
||||||
ggl && ggp
|
|
||||||
else
|
|
||||||
ggl "${*}" && ggp "${*}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
compdef _git ggpnp=git-checkout
|
|
||||||
|
|
||||||
ggu() {
|
|
||||||
[[ "$#" != 1 ]] && local b="$(git_current_branch)"
|
|
||||||
git pull --rebase origin "${b:=$1}"
|
|
||||||
}
|
|
||||||
compdef _git ggu=git-checkout
|
|
||||||
|
|
||||||
alias ggpur='ggu'
|
|
||||||
compdef _git ggpur=git-checkout
|
|
||||||
|
|
||||||
alias ggpull='git pull origin $(git_current_branch)'
|
|
||||||
compdef _git ggpull=git-checkout
|
|
||||||
|
|
||||||
alias ggpush='git push origin $(git_current_branch)'
|
|
||||||
compdef _git ggpush=git-checkout
|
|
||||||
|
|
||||||
alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
|
|
||||||
alias gpsup='git push --set-upstream origin $(git_current_branch)'
|
|
||||||
|
|
||||||
alias ghh='git help'
|
|
||||||
|
|
||||||
alias gignore='git update-index --assume-unchanged'
|
|
||||||
alias gignored='git ls-files -v | grep "^[[:lower:]]"'
|
|
||||||
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
|
|
||||||
compdef _git git-svn-dcommit-push=git
|
|
||||||
|
|
||||||
alias gk='\gitk --all --branches'
|
|
||||||
compdef _git gk='gitk'
|
|
||||||
alias gke='\gitk --all $(git log -g --pretty=%h)'
|
|
||||||
compdef _git gke='gitk'
|
|
||||||
|
|
||||||
alias gl='git pull'
|
|
||||||
alias glg='git log --stat'
|
|
||||||
alias glgp='git log --stat -p'
|
|
||||||
alias glgg='git log --graph'
|
|
||||||
alias glgga='git log --graph --decorate --all'
|
|
||||||
alias glgm='git log --graph --max-count=10'
|
|
||||||
alias glo='git log --oneline --decorate'
|
|
||||||
alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
|
|
||||||
alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all"
|
|
||||||
alias glog='git log --oneline --decorate --graph'
|
|
||||||
alias gloga='git log --oneline --decorate --graph --all'
|
|
||||||
alias glp="_git_log_prettily"
|
|
||||||
compdef _git glp=git-log
|
|
||||||
|
|
||||||
alias gm='git merge'
|
|
||||||
alias gmom='git merge origin/master'
|
|
||||||
alias gmt='git mergetool --no-prompt'
|
|
||||||
alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
|
|
||||||
alias gmum='git merge upstream/master'
|
|
||||||
alias gma='git merge --abort'
|
|
||||||
|
|
||||||
alias gp='git push'
|
|
||||||
alias gpd='git push --dry-run'
|
|
||||||
alias gpoat='git push origin --all && git push origin --tags'
|
|
||||||
compdef _git gpoat=git-push
|
|
||||||
alias gpu='git push upstream'
|
|
||||||
alias gpv='git push -v'
|
|
||||||
|
|
||||||
alias gr='git remote'
|
|
||||||
alias gra='git remote add'
|
|
||||||
alias grb='git rebase'
|
|
||||||
alias grba='git rebase --abort'
|
|
||||||
alias grbc='git rebase --continue'
|
|
||||||
alias grbi='git rebase -i'
|
|
||||||
alias grbm='git rebase master'
|
|
||||||
alias grbs='git rebase --skip'
|
|
||||||
alias grh='git reset HEAD'
|
|
||||||
alias grhh='git reset HEAD --hard'
|
|
||||||
alias grmv='git remote rename'
|
|
||||||
alias grrm='git remote remove'
|
|
||||||
alias grset='git remote set-url'
|
|
||||||
alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
|
|
||||||
alias gru='git reset --'
|
|
||||||
alias grup='git remote update'
|
|
||||||
alias grv='git remote -v'
|
|
||||||
|
|
||||||
alias gsb='git status -sb'
|
|
||||||
alias gsd='git svn dcommit'
|
|
||||||
alias gsi='git submodule init'
|
|
||||||
alias gsps='git show --pretty=short --show-signature'
|
|
||||||
alias gsr='git svn rebase'
|
|
||||||
alias gss='git status -s'
|
|
||||||
alias gst='git status'
|
|
||||||
alias gsta='git stash save'
|
|
||||||
alias gstaa='git stash apply'
|
|
||||||
alias gstc='git stash clear'
|
|
||||||
alias gstd='git stash drop'
|
|
||||||
alias gstl='git stash list'
|
|
||||||
alias gstp='git stash pop'
|
|
||||||
alias gsts='git stash show --text'
|
|
||||||
alias gsu='git submodule update'
|
|
||||||
|
|
||||||
alias gts='git tag -s'
|
|
||||||
alias gtv='git tag | sort -V'
|
|
||||||
|
|
||||||
alias gunignore='git update-index --no-assume-unchanged'
|
|
||||||
alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
|
|
||||||
alias gup='git pull --rebase'
|
|
||||||
alias gupv='git pull --rebase -v'
|
|
||||||
alias glum='git pull upstream master'
|
|
||||||
|
|
||||||
alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
|
|
||||||
alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"'
|
|
||||||
1
zsh/ohmyzsh
Submodule
1
zsh/ohmyzsh
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 6e9d57d5abdb33b0c22f8979dc529c1a046d7aa3
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 775f14d0c383ddc06c086e1632a9b377a5d0950c
|
|
||||||
Loading…
Reference in New Issue
Block a user