diff --git a/.config/zsh/.docker_aliases b/.config/zsh/.docker_aliases index 18349ce..d051fbc 100644 --- a/.config/zsh/.docker_aliases +++ b/.config/zsh/.docker_aliases @@ -1,5 +1,5 @@ -alias docker='podman' -alias docker-compose='podman-compose' +alias docker='sudo docker' +alias docker-compose='sudo docker-compose' # docker alias dk='docker' diff --git a/.config/zsh/.kubectl_aliases b/.config/zsh/.kubectl_aliases index ebcad9a..e6885e0 100644 --- a/.config/zsh/.kubectl_aliases +++ b/.config/zsh/.kubectl_aliases @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -function kx() { +function kctx() { 1="$(echo - "$1" | tr -c '[:alnum:]-_' '[ *]')" local ctx="$(echo - "$1" | awk '{print $1}')" local ns="${2-$(echo - "$1" | awk '{print $2}')}" @@ -20,9 +20,8 @@ function kx() { kubectx ${ctx:l} [ -n "$ns" ] && kubens "${ns:l}" } -compdef -e _kubectx kx -alias kn='kubens' +alias kns='kubens' alias k='kubectl' alias ksys='kubectl --namespace=kube-system' alias ka='kubectl apply --recursive -f' diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index e181742..9ab5aec 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -4,10 +4,12 @@ zstyle ':omz:update' mode disabled plugins=(vi-mode colored-man-pages git gitignore) +# doesn't work in .zshenv +fpath=("$ZDOTDIR/completions" $fpath) . "$ZSH"/oh-my-zsh.sh . "$ZDOTDIR"/.docker_aliases . "$ZDOTDIR"/.kubectl_aliases . "$ZDOTDIR"/.zsh_aliases -! [ -f "$ZDOTDIR/.p10k.zsh" ] || . "$ZDOTDIR/.p10k.zsh" +. "$ZDOTDIR/.p10k.zsh" diff --git a/.config/zsh/completions/_j b/.config/zsh/completions/_j new file mode 100644 index 0000000..53bd275 --- /dev/null +++ b/.config/zsh/completions/_j @@ -0,0 +1,3 @@ +#compdef j + +_arguments "1: :(**/"$1")" diff --git a/.zshenv b/.zshenv index 7721ba2..50a60ce 100644 --- a/.zshenv +++ b/.zshenv @@ -1,5 +1,3 @@ -path=("$HOME/bin" "$HOME/.local/bin" $path) - export XDG_CACHE_HOME="$HOME/.cache" export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" @@ -16,6 +14,8 @@ export ZSH_COMPDUMP="$XDG_CACHE_HOME/.zcompdump-$ZSH_VERSION" export LESSHISTFILE='-' +path=("$HOME/bin" "$HOME/.local/bin" $path) + export EDITOR='nvim' export XDG_CURRENT_DESKTOP=Unity