chore!: separated galaxy deps and own collections; modified ansible script generation to use two paths for collections
REQUIRES REGENERATING ansible.cfg!
This commit is contained in:
NaeiKinDus
parent
4af69c31ce
commit
888590ed9f
GPG key ID:
8E52ADFF7CA8AE56
188 changed files with 30 additions and 30 deletions
|
|
@ -0,0 +1,107 @@
|
|||
[user]
|
||||
name = {{ common_git_username }}
|
||||
email = {{ common_git_email }}
|
||||
{%- if common_git_force_sign and common_git_signing_key +%}
|
||||
signingkey = {{ common_git_signing_key }}
|
||||
{%- endif +%}
|
||||
[commit]
|
||||
{% if common_git_force_sign -%}
|
||||
gpgsign = true
|
||||
{%- else -%}
|
||||
gpgsign = false
|
||||
{%- endif +%}
|
||||
[tag]
|
||||
{% if common_git_force_sign -%}
|
||||
gpgsign = true
|
||||
{%- else -%}
|
||||
gpgsign = false
|
||||
{%- endif +%}
|
||||
{%- raw %}
|
||||
[alias]
|
||||
br = "branch"
|
||||
ci = "commit"
|
||||
cmp = "!f() { git log --graph --color --boundary --oneline HEAD...origin/$1; }; f"
|
||||
co = "checkout"
|
||||
cp = "cherry-pick"
|
||||
cpo = "cherry-pick --strategy=recursive -Xours --allow-empty"
|
||||
cpt = "cherry-pick --strategy=recursive -Xtheirs --allow-empty"
|
||||
dm = "log --graph --color --boundary --oneline HEAD...origin/master"
|
||||
dup = "!git log --graph --color --boundary --oneline HEAD...origin/$(git rev-parse --abbrev-ref HEAD)"
|
||||
psuo = "!git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)"
|
||||
rf = "!git reflog --date=iso"
|
||||
ru = "remote update"
|
||||
rup = "!f() { git remote update && git pull --rebase; }; f"
|
||||
pr = "pull --rebase"
|
||||
st = "status"
|
||||
subup = "!git submodule foreach git remote update"
|
||||
undo = "!f() { git reset --soft HEAD~${1:-1}; }; f"
|
||||
|
||||
lg = lg1
|
||||
lg1 = lg1-specific --all
|
||||
lg2 = lg2-specific --all
|
||||
lg3 = lg3-specific --all
|
||||
lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)'
|
||||
lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
|
||||
lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
|
||||
[core]
|
||||
editor = emacs
|
||||
autocrlf = input
|
||||
pager = delta
|
||||
[color]
|
||||
status = auto
|
||||
branch = auto
|
||||
interactive = auto
|
||||
diff = auto
|
||||
ui = true
|
||||
pager = true
|
||||
[delta]
|
||||
navigate = true
|
||||
line-numbers = true
|
||||
[push]
|
||||
default = simple
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
[pull]
|
||||
rebase = true
|
||||
[diff]
|
||||
colorMoved = default
|
||||
[diff "pdf"]
|
||||
textconv = pdfinfo
|
||||
[diff "pdfdiff"]
|
||||
command = diffpdf
|
||||
[init]
|
||||
defaultBranch = main
|
||||
[interactive]
|
||||
diffFilter = delta --color-only
|
||||
[submodule]
|
||||
recurse = true
|
||||
[advice]
|
||||
addEmbeddedRepo = false
|
||||
addEmptyPathspec = false
|
||||
addIgnoredFile = false
|
||||
amWorkDir = false
|
||||
checkoutAmbiguousRemoteBranchName = false
|
||||
commitBeforeMerge = false
|
||||
detachedHead = false
|
||||
fetchShowForcedUpdates = false
|
||||
ignoredHook = false
|
||||
implicitIdentity = false
|
||||
nestedTag = false
|
||||
pushAlreadyExists = true
|
||||
pushFetchFirst = true
|
||||
pushNeedsForce = true
|
||||
pushNonFFCurrent = true
|
||||
pushNonFFMatching = true
|
||||
pushRefNeedsUpdate = true
|
||||
pushUnqualifiedRefname = true
|
||||
pushUpdateRejected = true
|
||||
resetQuiet = false
|
||||
resolveConflict = true
|
||||
rmHints = false
|
||||
sequencerInUse = false
|
||||
statusAheadBehind = false
|
||||
statusHints = false
|
||||
statusUoption = false
|
||||
submoduleAlternateErrorStrategyDie = false
|
||||
waitingForEditor = false
|
||||
{% endraw %}
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
#!/bin/sh
|
||||
# Best effort auto-pygmentization with transparent decompression
|
||||
# (c) Reuben Thomas 2012
|
||||
# This program is in the public domain.
|
||||
|
||||
# Strategy: first see if pygmentize can find a lexer; if not, ask file; if that finds nothing, fail
|
||||
# Set the environment variable PYGMENTIZE_OPTS to configure pygments.
|
||||
|
||||
# This program can be used as a .lessfilter for the less pager to auto-color less's output
|
||||
|
||||
if [ `pygmentize -N $1` != "text" ]; then
|
||||
pygmentize $PYGMENTIZE_OPTS "$1"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
file_common_opts="--brief --dereference --uncompress"
|
||||
|
||||
unset lexer
|
||||
case `file --mime-type $file_common_opts "$1"` in
|
||||
application/xml|image/svg+xml) lexer=xml;;
|
||||
text/html) lexer=html;;
|
||||
text/troff) lexer=nroff;;
|
||||
text/x-asm) lexer=nasm;;
|
||||
text/x-awk) lexer=awk;;
|
||||
text/x-c) lexer=c;;
|
||||
text/x-c++) lexer=cpp;;
|
||||
text/x-diff) lexer=diff;;
|
||||
text/x-fortran) lexer=fortran;;
|
||||
text/x-gawk) lexer=gawk;;
|
||||
text/x-java) lexer=java;;
|
||||
text/x-lisp) lexer=common-lisp;;
|
||||
text/x-lua) lexer=lua;;
|
||||
text/x-makefile) lexer=make;;
|
||||
text/x-msdos-batch) lexer=bat;;
|
||||
text/x-nawk) lexer=nawk;;
|
||||
text/x-pascal) lexer=pascal;;
|
||||
text/x-perl) lexer=perl;;
|
||||
text/x-php) lexer=php;;
|
||||
text/x-po) lexer=po;;
|
||||
text/x-python) lexer=python;;
|
||||
text/x-ruby) lexer=ruby;;
|
||||
text/x-shellscript) lexer=sh;;
|
||||
text/x-tcl) lexer=tcl;;
|
||||
text/x-tex|text/x-texinfo) lexer=latex;; # FIXME: texinfo really needs its own lexer
|
||||
|
||||
# Types that file outputs which pygmentize didn't support as of file 5.11, pygments 1.5
|
||||
# text/calendar
|
||||
# text/PGP
|
||||
# text/rtf
|
||||
# text/texmacs
|
||||
# text/x-bcpl
|
||||
# text/x-info
|
||||
# text/x-m4
|
||||
# text/x-vcard
|
||||
# text/x-xmcd
|
||||
esac
|
||||
|
||||
encoding=`file --mime-encoding $file_common_opts "$1"`
|
||||
|
||||
if [ -n "$lexer" ]; then
|
||||
# FIXME: Specify input encoding rather than output encoding https://bitbucket.org/birkenfeld/pygments-main/issue/800
|
||||
# FIXME: Encoding argument ignored on stdin https://bitbucket.org/birkenfeld/pygments-main/issue/799
|
||||
#zcat "$1" | pygmentize -O encoding=$encoding,outencoding=UTF-8 $PYGMENTIZE_OPTS -l $lexer
|
||||
pygmentize -O encoding=$encoding,outencoding=UTF-8 $PYGMENTIZE_OPTS -l $lexer $1
|
||||
exit 0
|
||||
fi
|
||||
|
||||
exit 1
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,7 @@
|
|||
try:
|
||||
import readline
|
||||
except ImportError:
|
||||
print("Module readline not available.")
|
||||
else:
|
||||
import rlcompleter
|
||||
readline.parse_and_bind("tab: complete")
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
# Utilities
|
||||
alias dig=ydig
|
||||
alias e="emacs"
|
||||
alias grep="egrep --color"
|
||||
alias cpr="rsync -rlptgoDAXhP --info=all0,progress2"
|
||||
alias rcp="cpr"
|
||||
alias ll="eza -lah --color"
|
||||
alias l="eza -l -g --icons --all --all"
|
||||
alias ls="eza"
|
||||
alias xclip="xclip -sel clipboard"
|
||||
alias git='GIT_COMMITTER_DATE="$(date +%Y-%m-%d) 00:00:00+0000" GIT_AUTHOR_DATE="$(date +%Y-%m-%d) 00:00:00+0000" git'
|
||||
alias cat=batcat
|
||||
alias less=batcat
|
||||
alias bat=batcat
|
||||
alias emacs='emacsclient --create-frame --alternate-editor=""'
|
||||
|
||||
# Dev
|
||||
alias dcl="docker container ls -a --format='{{ .ID }}\t{{ .Names }}\t{{ index (split .Status \" \") 0 }}' | sort -k3r -k2 | column -t -N ID,Name,State"
|
||||
alias composer80="composerX 8.0"
|
||||
alias composer81="composerX 8.1"
|
||||
alias composer82="composerX 8.2"
|
||||
alias phpqa="phpqa82"
|
||||
alias phpqa81='docker run --init -it --rm -v "$(pwd):/project" -v "$(pwd)/tmp-phpqa:/tmp" -w /project jakzal/phpqa:php8.1-alpine'
|
||||
alias phpqa82='docker run --init -it --rm -v "$(pwd):/project" -v "$(pwd)/tmp-phpqa:/tmp" -w /project jakzal/phpqa:php8.2-alpine'
|
||||
|
||||
# DevOps / Admin
|
||||
alias ssl_scan="docker run -ti --rm drwetter/testssl.sh"
|
||||
alias tf="tofu"
|
||||
alias terraform="tofu"
|
||||
alias ks="kubeshell"
|
||||
|
||||
# Personal
|
||||
alias awesome_test="Xephyr -screen 1440x1080 :5 & sleep 1 ; DISPLAY=:5 awesome"
|
||||
alias clean_pa='pkill -U ${USER} pulseaudio; systemctl --user stop pulseaudio.socket && systemctl --user start pulseaudio.socket'
|
||||
alias ssh_jump="ssh -qTNn"
|
||||
alias x11_paste='sleep 2; xdotool type "$(xclip -o -selection clipboard)"'
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
# https://github.com/zsh-users/zsh-completions
|
||||
fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
|
||||
fpath+=/usr/lib/x86_64-linux-gnu/rubygems-integration/3.1.0/gems/vagrant-2.3.8.dev/contrib/zsh
|
||||
|
||||
# shellcheck disable=SC1090
|
||||
if command -v ansible &> /dev/null; then
|
||||
source <(register-python-argcomplete ansible)
|
||||
source <(register-python-argcomplete ansible-config)
|
||||
source <(register-python-argcomplete ansible-console)
|
||||
source <(register-python-argcomplete ansible-doc)
|
||||
source <(register-python-argcomplete ansible-galaxy)
|
||||
source <(register-python-argcomplete ansible-inventory)
|
||||
source <(register-python-argcomplete ansible-playbook)
|
||||
source <(register-python-argcomplete ansible-pull)
|
||||
source <(register-python-argcomplete ansible-vault)
|
||||
fi
|
||||
|
||||
command -v boundary &> /dev/null && complete -o nospace -C /usr/bin/boundary boundary || true
|
||||
command -v molecule &> /dev/null && source <(_MOLECULE_COMPLETE=zsh_source molecule) || true
|
||||
command -v helm &> /dev/null && source <(helm completion zsh) || true
|
||||
command -v noseyparker &> /dev/null && source <(noseyparker shell-completions --shell zsh) || true
|
||||
|
||||
[ -s "$NVM_DIR/bash_completion" ] && source "$NVM_DIR/bash_completion"
|
||||
[ -s "$HOME/.pyenv/completions/pyenv.zsh" ] && source "$HOME/.pyenv/completions/pyenv.zsh"
|
||||
|
||||
autoload -U compinit && compinit
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
# Versions
|
||||
export RUBY_VERSION="3.1"
|
||||
|
||||
# Settings
|
||||
export DEFAULT_USER=$(id -un)
|
||||
export EDITOR="emacsclient -t"
|
||||
export TERM=xterm-256color
|
||||
export LESS='-R'
|
||||
export LESSOPEN='|~/.lessfilter %s'
|
||||
export DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||
export SSH_KEY_PATH="${HOME}/.ssh/id_ed25519"
|
||||
export PAGER=less
|
||||
export GPG_TTY="${TTY}"
|
||||
|
||||
export PINENTRY_USER_DATA="connect/greeter"
|
||||
{ [ -n "${SSH_CLIENT}" ] || [ -n "${SSH_CONNECTION}" ] || [ -n "${SSH_TTY}" ]; } && export PINENTRY_USER_DATA="connect/ssh"
|
||||
|
||||
# Dev
|
||||
export NVM_DIR="$HOME/.nvm"
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh" # This loads nvm
|
||||
# shellcheck disable=SC1090
|
||||
[ -d "${HOME}/.local/share/gems/ruby/${RUBY_VERSION}" ] && export GEM_DIR="${HOME}/.local/share/gems/ruby/${RUBY_VERSION}"
|
||||
[ -d "${HOME}/.cargo/env" ] && source "${HOME}/.cargo/env"
|
||||
|
||||
export PYENV_ROOT="$HOME/.pyenv"
|
||||
if [[ -d $PYENV_ROOT/bin ]]; then
|
||||
export PATH="$PYENV_ROOT/bin:$PATH"
|
||||
eval "$(pyenv init - bash)"
|
||||
eval "$(pyenv virtualenv-init -)"
|
||||
fi
|
||||
|
||||
# Path
|
||||
export PATH="${PATH}:${HOME}/.local/bin"
|
||||
[ -d "${HOME}/.nvm/current/bin" ] && export PATH="${PATH}:${HOME}/.nvm/current/bin"
|
||||
[ -d "${GEM_DIR}/bin" ] && export PATH="${PATH}:${GEM_DIR}/bin"
|
||||
[ -d "/usr/local/go/bin" ] && export PATH="${PATH}:/usr/local/go/bin"
|
||||
[ -d "$HOME/.cargo/bin" ] && export PATH="${PATH}:$HOME/.cargo/bin"
|
||||
[ -d "$HOME/.local/share/JetBrains/Toolbox/scripts" ] && export PATH="${PATH}:$HOME/.local/share/JetBrains/Toolbox/scripts"
|
||||
[ -d "${HOME}/.config/emacs/bin" ] && export PATH="${PATH}:${HOME}/.config/emacs/bin"
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
function ydig() {
|
||||
\dig +yaml "${@}" | yq '.[].message.response_message_data|{"answer": .ANSWER_SECTION, "status": .status}'
|
||||
}
|
||||
|
||||
function sshfs-target() {
|
||||
local targetHost="${1}"
|
||||
local remoteDir="${2}"
|
||||
local mountPoint=${3}
|
||||
|
||||
sshfs "${DEFAULT_USER:=$(id -un)}"@"${targetHost}":"${remoteDir}" "${mountPoint}"
|
||||
}
|
||||
|
||||
# Ex: ssh-forward 0.0.0.0:3306 bastion.host protected-sql-server.remote:3306
|
||||
function ssh-forward() {
|
||||
local localIp="${1}"
|
||||
shift
|
||||
local jumpHost="${1}"
|
||||
shift
|
||||
local targetHost="${1}"
|
||||
shift
|
||||
|
||||
ssh -qN -L "${localIp}":"${targetHost}" "${jumpHost}" "${@}"
|
||||
}
|
||||
|
||||
function composerX() {
|
||||
local composerBinary
|
||||
local phpBinary
|
||||
local phpVersion="${1}"
|
||||
shift
|
||||
composerBinary=$(command -v composer)
|
||||
phpBinary=$(command -v php"${phpVersion}")
|
||||
|
||||
${phpBinary} "${composerBinary}" "${@}"
|
||||
}
|
||||
|
||||
function kubeshell() {
|
||||
if [ $# -lt 3 ]; then
|
||||
print "Invalid parameters: kubeshell NAMESPACE CONTAINER POD "
|
||||
return 1
|
||||
fi
|
||||
|
||||
local kubeBinary
|
||||
local namespace="${1}"
|
||||
shift
|
||||
local container="${1}"
|
||||
shift
|
||||
local pod="${1}"
|
||||
shift
|
||||
|
||||
kubeBinary=$(command -v kubectl)
|
||||
"${kubeBinary}" exec -i -t -n "${namespace}" "${pod}" -c "${container}" "${@}" -- sh -c "clear; (zsh || bash || ash || sh)"
|
||||
}
|
||||
|
||||
function timer() {
|
||||
if [ $# != 1 ]; then
|
||||
printf "Missing duration in \`sleep\` format (e.g. 2m)\n"
|
||||
return 1
|
||||
fi
|
||||
read -r < <(sleep "$1" & echo $!)
|
||||
local sleep_pid="${REPLY}"
|
||||
trap 'kill "${sleep_pid}" ; return 0' SIGINT SIGTERM SIGQUIT
|
||||
|
||||
while :
|
||||
do
|
||||
if ! output_cmd=$(ps -o etime= -o args= -p "${sleep_pid}"); then
|
||||
echo -ne "Buzz!\033[0K\r\n"
|
||||
repeat "${TIMER_SOUND_REPEAT_COUNT:-3}" aplay "${TIMER_SOUND_FILE:-${HOME}/Music/Sounds/timer_done.wav}" &> /dev/null
|
||||
return 0
|
||||
else
|
||||
echo -ne "${output_cmd}\033[0K\r" | sed -E 's/\s+([0-9:]+)\s+sleep\s+(.+)/Elapsed: \1 of \2/'
|
||||
sleep "${TIMER_NOTIF_STEP:-1}"
|
||||
fi
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||
fi
|
||||
|
||||
# Path to your oh-my-zsh installation.
|
||||
export ZSH="${HOME}/.oh-my-zsh"
|
||||
export TERM="xterm-256color"
|
||||
|
||||
ZSH_THEME="powerlevel10k/powerlevel10k"
|
||||
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 automatically update without prompting.
|
||||
# DISABLE_UPDATE_PROMPT="true"
|
||||
|
||||
# Uncomment the following line to change how often to auto-update (in days).
|
||||
# export UPDATE_ZSH_DAYS=13
|
||||
|
||||
# Uncomment the following line if pasting URLs and other text is messed up.
|
||||
# DISABLE_MAGIC_FUNCTIONS=true
|
||||
|
||||
# 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"
|
||||
|
||||
HIST_STAMPS="yyyy.mm.dd"
|
||||
|
||||
plugins=(
|
||||
autopep8
|
||||
aws
|
||||
branch
|
||||
colored-man-pages
|
||||
colorize
|
||||
composer
|
||||
docker
|
||||
docker-compose
|
||||
git
|
||||
kubectl
|
||||
kube-ps1
|
||||
npm
|
||||
nvm
|
||||
pass
|
||||
pep8
|
||||
pip
|
||||
redis-cli
|
||||
rsync
|
||||
rust
|
||||
terraform
|
||||
)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
[ -f ~/.env ] && source ~/.env
|
||||
[ -f ~/.zsh_exports ] && source ~/.zsh_exports
|
||||
[ -f ~/.p10k.zsh ] && source ~/.p10k.zsh
|
||||
[ -f ~/.zsh_functions ] && source ~/.zsh_functions
|
||||
[ -f ~/.zsh_aliases ] && source ~/.zsh_aliases
|
||||
[ -f ~/.zsh_completions ] && source ~/.zsh_completions
|
||||
Loading…
Add table
Add a link
Reference in a new issue