mirror of
https://github.com/Adam-Ant/dotfiles
synced 2025-06-13 22:21:12 +00:00
Initial commit
This commit is contained in:
Adam Dodman
66
zsh/gitstatus.py
Normal file
66
zsh/gitstatus.py
Normal file
@ -0,0 +1,66 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
#Code borrowed from https://github.com/olivierverdier/zsh-git-prompt/
|
||||
from __future__ import print_function
|
||||
|
||||
# change this symbol to whatever you prefer
|
||||
prehash = ':'
|
||||
|
||||
from subprocess import Popen, PIPE
|
||||
|
||||
import sys
|
||||
gitsym = Popen(['git', 'symbolic-ref', 'HEAD'], stdout=PIPE, stderr=PIPE)
|
||||
branch, error = gitsym.communicate()
|
||||
|
||||
error_string = error.decode('utf-8')
|
||||
|
||||
if 'fatal: Not a git repository' in error_string:
|
||||
sys.exit(0)
|
||||
|
||||
branch = branch.decode("utf-8").strip()[11:]
|
||||
|
||||
res, err = Popen(['git','diff','--name-status'], stdout=PIPE, stderr=PIPE).communicate()
|
||||
err_string = err.decode('utf-8')
|
||||
if 'fatal' in err_string:
|
||||
sys.exit(0)
|
||||
changed_files = [namestat[0] for namestat in res.decode("utf-8").splitlines()]
|
||||
staged_files = [namestat[0] for namestat in Popen(['git','diff', '--staged','--name-status'], stdout=PIPE).communicate()[0].splitlines()]
|
||||
nb_changed = len(changed_files) - changed_files.count('U')
|
||||
nb_U = staged_files.count('U')
|
||||
nb_staged = len(staged_files) - nb_U
|
||||
staged = str(nb_staged)
|
||||
conflicts = str(nb_U)
|
||||
changed = str(nb_changed)
|
||||
nb_untracked = len([0 for status in Popen(['git','status','--porcelain',],stdout=PIPE).communicate()[0].decode("utf-8").splitlines() if status.startswith('??')])
|
||||
untracked = str(nb_untracked)
|
||||
|
||||
ahead, behind = 0,0
|
||||
|
||||
if not branch: # not on any branch
|
||||
branch = prehash + Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0].decode("utf-8")[:-1]
|
||||
else:
|
||||
remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
|
||||
if remote_name:
|
||||
merge_name = Popen(['git','config','branch.%s.merge' % branch], stdout=PIPE).communicate()[0].decode("utf-8").strip()
|
||||
if remote_name == '.': # local
|
||||
remote_ref = merge_name
|
||||
else:
|
||||
remote_ref = 'refs/remotes/%s/%s' % (remote_name, merge_name[11:])
|
||||
revgit = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % remote_ref],stdout=PIPE, stderr=PIPE)
|
||||
revlist = revgit.communicate()[0]
|
||||
if revgit.poll(): # fallback to local
|
||||
revlist = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % merge_name],stdout=PIPE, stderr=PIPE).communicate()[0]
|
||||
behead = revlist.decode("utf-8").splitlines()
|
||||
ahead = len([x for x in behead if x[0]=='>'])
|
||||
behind = len(behead) - ahead
|
||||
|
||||
out = ' '.join([
|
||||
branch,
|
||||
str(ahead),
|
||||
str(behind),
|
||||
staged,
|
||||
conflicts,
|
||||
changed,
|
||||
untracked,
|
||||
])
|
||||
print(out, end='')
|
||||
109
zsh/zshgit.sh
Normal file
109
zsh/zshgit.sh
Normal file
@ -0,0 +1,109 @@
|
||||
# Code borrowed from https://github.com/olivierverdier/zsh-git-prompt
|
||||
|
||||
# To install source this file from your .zshrc file
|
||||
|
||||
# see documentation at http://linux.die.net/man/1/zshexpn
|
||||
# A: finds the absolute path, even if this is symlinked
|
||||
# h: equivalent to dirname
|
||||
export __GIT_PROMPT_DIR=${0:A:h}
|
||||
|
||||
export GIT_PROMPT_EXECUTABLE=${GIT_PROMPT_EXECUTABLE:-"python"}
|
||||
|
||||
# Initialize colors.
|
||||
autoload -U colors
|
||||
colors
|
||||
|
||||
# Allow for functions in the prompt.
|
||||
setopt PROMPT_SUBST
|
||||
|
||||
autoload -U add-zsh-hook
|
||||
|
||||
add-zsh-hook chpwd chpwd_update_git_vars
|
||||
add-zsh-hook preexec preexec_update_git_vars
|
||||
add-zsh-hook precmd precmd_update_git_vars
|
||||
|
||||
## Function definitions
|
||||
function preexec_update_git_vars() {
|
||||
case "$2" in
|
||||
git*|hub*|gh*|stg*)
|
||||
__EXECUTED_GIT_COMMAND=1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
function precmd_update_git_vars() {
|
||||
if [ -n "$__EXECUTED_GIT_COMMAND" ] || [ ! -n "$ZSH_THEME_GIT_PROMPT_CACHE" ]; then
|
||||
update_current_git_vars
|
||||
unset __EXECUTED_GIT_COMMAND
|
||||
fi
|
||||
}
|
||||
|
||||
function chpwd_update_git_vars() {
|
||||
update_current_git_vars
|
||||
}
|
||||
|
||||
function update_current_git_vars() {
|
||||
unset __CURRENT_GIT_STATUS
|
||||
|
||||
if [[ "$GIT_PROMPT_EXECUTABLE" == "python" ]]; then
|
||||
local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
|
||||
_GIT_STATUS=`python ${gitstatus} 2>/dev/null`
|
||||
fi
|
||||
if [[ "$GIT_PROMPT_EXECUTABLE" == "haskell" ]]; then
|
||||
_GIT_STATUS=`git status --porcelain --branch &> /dev/null | $__GIT_PROMPT_DIR/src/.bin/gitstatus`
|
||||
fi
|
||||
__CURRENT_GIT_STATUS=("${(@s: :)_GIT_STATUS}")
|
||||
GIT_BRANCH=$__CURRENT_GIT_STATUS[1]
|
||||
GIT_AHEAD=$__CURRENT_GIT_STATUS[2]
|
||||
GIT_BEHIND=$__CURRENT_GIT_STATUS[3]
|
||||
GIT_STAGED=$__CURRENT_GIT_STATUS[4]
|
||||
GIT_CONFLICTS=$__CURRENT_GIT_STATUS[5]
|
||||
GIT_CHANGED=$__CURRENT_GIT_STATUS[6]
|
||||
GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7]
|
||||
}
|
||||
|
||||
|
||||
git_super_status() {
|
||||
precmd_update_git_vars
|
||||
if [ -n "$__CURRENT_GIT_STATUS" ]; then
|
||||
STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}"
|
||||
if [ "$GIT_BEHIND" -ne "0" ]; then
|
||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%{${reset_color}%}"
|
||||
fi
|
||||
if [ "$GIT_AHEAD" -ne "0" ]; then
|
||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD$GIT_AHEAD%{${reset_color}%}"
|
||||
fi
|
||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
|
||||
if [ "$GIT_STAGED" -ne "0" ]; then
|
||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}"
|
||||
fi
|
||||
if [ "$GIT_CONFLICTS" -ne "0" ]; then
|
||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}"
|
||||
fi
|
||||
if [ "$GIT_CHANGED" -ne "0" ]; then
|
||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
|
||||
fi
|
||||
if [ "$GIT_UNTRACKED" -ne "0" ]; then
|
||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}"
|
||||
fi
|
||||
if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
|
||||
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
|
||||
fi
|
||||
STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
||||
echo "$STATUS"
|
||||
fi
|
||||
}
|
||||
|
||||
# Default values for the appearance of the prompt. Configure at will.
|
||||
ZSH_THEME_GIT_PROMPT_PREFIX="("
|
||||
ZSH_THEME_GIT_PROMPT_SUFFIX=")"
|
||||
ZSH_THEME_GIT_PROMPT_SEPARATOR="|"
|
||||
ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}"
|
||||
ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}%{●%G%}"
|
||||
ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}"
|
||||
ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}"
|
||||
ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}"
|
||||
ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}"
|
||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{…%G%}"
|
||||
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}"
|
||||
|
||||
35
zsh/zshrc
Normal file
35
zsh/zshrc
Normal file
@ -0,0 +1,35 @@
|
||||
##General QOL
|
||||
alias la='ls -lah --color=auto'
|
||||
alias ls='ls -h --color=auto'
|
||||
|
||||
eval "$(thefuck --alias)"
|
||||
dme (){ eval $(docker-machine env "$@");}
|
||||
alias dmssh='docker-machine ssh'
|
||||
alias dm='docker-machine'
|
||||
|
||||
alias dps='docker ps'
|
||||
alias dpsa='docker ps -a'
|
||||
alias drm='docker rm'
|
||||
alias drmi='docker rmi'
|
||||
alias dim='docker images'
|
||||
alias dbl='docker build'
|
||||
alias dbl.='docker build .'
|
||||
alias drun='docker run -ti'
|
||||
alias dkl='docker kill'
|
||||
alias dalpine='docker run -ti --rm alpine:3.5 /bin/sh'
|
||||
alias drm-stopped='docker rm -v $(docker ps -a -q -f status=exited)'
|
||||
alias drmi-untag='docker rmi $(docker images -f "dangling=true" -q)'
|
||||
dsh() {
|
||||
docker exec -ti $1 /bin/sh
|
||||
}
|
||||
|
||||
alias pacup='pacaur -Syu'
|
||||
alias pacrm='pacaur -Rs'
|
||||
alias pacadd='pacaur -S'
|
||||
|
||||
alias shred='shred -uzn 5'
|
||||
|
||||
#VirtualEnv
|
||||
export WORKON_HOME=$HOME/.virtualenvs # optional
|
||||
export PROJECT_HOME=$HOME/Sync/Programming/Python # optional
|
||||
source /usr/bin/virtualenvwrapper.sh
|
||||
Reference in New Issue
Block a user