From a1f27e07badd84840231bc45479f78602524c4b4 Mon Sep 17 00:00:00 2001 From: Tim van Veenendaal Date: Mon, 2 Aug 2021 19:26:10 +0200 Subject: [PATCH] Move aliases to seperate files and cleanup the config --- zsh/.aliases | 14 ++++++++++++++ zsh/.p10k.zsh | 6 +++--- zsh/.zshrc | 23 +++++++++++------------ 3 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 zsh/.aliases diff --git a/zsh/.aliases b/zsh/.aliases new file mode 100644 index 0000000..6214970 --- /dev/null +++ b/zsh/.aliases @@ -0,0 +1,14 @@ +#alias ltd='docker exec -it lt-dev /bin/bash' +#alias ltdf='docker exec -it lt-dev-2004 /bin/bash' +#alias lt-dd-f='docker exec -it lt-dev-2004 lt-dd' +#alias lt-dd-cms='lt-dd project:execute -p mpm-cms -n -- ' +#alias lt-dd-web='lt-dd project:execute -p mpm-website -n -- ' +#alias lt-dd-w2='lt-dd project:execute -p wrqr2 -n -- ' +#alias fm='xinput set-prop 9 "libinput Scroll Method Enabled" 0, 0, 1 && xinput set-prop 9 "libinput Button Scrolling Button" 10' + +alias gcp='git cherry-pick' +alias gs='git status' + + +alias gdq='screen -d -m streamlink https://www.twitch.tv/gamesdonequick best -p mpv' +alias f=z diff --git a/zsh/.p10k.zsh b/zsh/.p10k.zsh index fca4ef6..da79fcd 100644 --- a/zsh/.p10k.zsh +++ b/zsh/.p10k.zsh @@ -345,9 +345,9 @@ # # typeset -g POWERLEVEL9K_DIR_CLASSES=() typeset -g POWERLEVEL9K_DIR_CLASSES=( - '~/projects(|/*)' WORK '' - '~(|/*)' HOME '' - '*' DEFAULT '' + '~/projects(|/*)' WORK ' ' + '~(|/*)' HOME ' ' + '*' DEFAULT ' ' ) #####################################[ vcs: git status ]###################################### diff --git a/zsh/.zshrc b/zsh/.zshrc index 68b5e30..061ed1d 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -49,7 +49,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k" # DISABLE_AUTO_TITLE="true" # Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" +ENABLE_CORRECTION="true" # Uncomment the following line to display red dots whilst waiting for completion. # COMPLETION_WAITING_DOTS="true" @@ -75,7 +75,15 @@ HIST_STAMPS="yyyy-mm-dd" # 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-z composer cp extract zsh-autosuggestions) +plugins=(git git-flow zsh-z composer cp extract zsh-autosuggestions) + +# git - git aliases https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/git +# git-flow - git-flow aliases and autocomplete https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/git-flow +# zsh-z - f/z fast browsing +# composer - composer aliases and completion +# cp - cpv alias that uses rsync +# extract - easy extraction tool for different archives +# zsh-autosuggestions - gives auto suggestion for previous used commands source $ZSH/oh-my-zsh.sh @@ -148,14 +156,5 @@ autoload -U compinit && compinit #export KUBECONFIG #if [ $commands[kubectl] ]; then source <(kubectl completion zsh); fi -#alias ltd='docker exec -it lt-dev /bin/bash' -#alias ltdf='docker exec -it lt-dev-2004 /bin/bash' -#alias lt-dd-f='docker exec -it lt-dev-2004 lt-dd' -#alias lt-dd-cms='lt-dd project:execute -p mpm-cms -n -- ' -#alias lt-dd-web='lt-dd project:execute -p mpm-website -n -- ' -#alias lt-dd-w2='lt-dd project:execute -p wrqr2 -n -- ' -#alias fm='xinput set-prop 9 "libinput Scroll Method Enabled" 0, 0, 1 && xinput set-prop 9 "libinput Button Scrolling Button" 10' +[ -f .aliases ] && source .aliases -alias gcp='git cherry-pick' -alias gdq='screen -d -m streamlink https://www.twitch.tv/gamesdonequick best -p mpv' -alias f=z