diff --git a/.config/zsh/.docker_aliases b/.config/zsh/.docker_aliases index 0169ba4..63fb313 100644 --- a/.config/zsh/.docker_aliases +++ b/.config/zsh/.docker_aliases @@ -1,6 +1,5 @@ if ! [ -w '/var/run/docker.sock' ]; then alias docker='sudo docker' - alias docker-compose='sudo docker-compose' fi # docker @@ -76,28 +75,28 @@ alias dkspv='docker system prune --volumes' alias dkspva='docker system prune --volumes -a' alias dkspvaf='docker system prune --volumes -a -f' -# docker-compose -alias dc='docker-compose' -alias dcd='docker-compose down' -alias dcup='docker-compose up -d' -alias dcupb='docker-compose up -d --build' +# compose +alias dc='docker compose' +alias dcd='docker compose down' +alias dcup='docker compose up -d' +alias dcupb='docker compose up -d --build' ## container -alias dccls='docker-compose ps' -alias dcclsq='docker-compose ps -q' -alias dcex='docker-compose exec' -alias dcr='docker-compose run --rm' -alias dcrd='docker-compose run -d --rm' -alias dcrm!='docker-compose rm -f' -alias dcrm='docker-compose rm' -alias dcrmv!='docker-compose rm -v -f' -alias dcrmv='docker-compose rm -v' -alias dcsp='docker-compose stop' -alias dcst='docker-compose restart' +alias dccls='docker compose ps' +alias dcclsq='docker compose ps -q' +alias dcex='docker compose exec' +alias dcr='docker compose run --rm' +alias dcrd='docker compose run -d --rm' +alias dcrm!='docker compose rm -f' +alias dcrm='docker compose rm' +alias dcrmv!='docker compose rm -v -f' +alias dcrmv='docker compose rm -v' +alias dcsp='docker compose stop' +alias dcst='docker compose restart' ## image -alias dcb!='docker-compose build --no-cache' -alias dcb='docker-compose build' -alias dcl='docker-compose pull' +alias dcb!='docker compose build --no-cache' +alias dcb='docker compose build' +alias dcl='docker compose pull' # vim: ft=zsh diff --git a/.config/zsh/.zsh_aliases b/.config/zsh/.zsh_aliases index 1de8dc4..3aa4273 100644 --- a/.config/zsh/.zsh_aliases +++ b/.config/zsh/.zsh_aliases @@ -7,11 +7,12 @@ alias vi='$EDITOR' # conf alias config='git --git-dir="$HOME/.dotfiles/" --work-tree="$HOME"' alias viconf='(cd "$XDG_CONFIG_HOME/nvim" && $EDITOR .)' -alias wconf='(cd "$HOME"/.config/suckless/dwm* && $EDITOR .)' +alias wconf='(cd "$XDG_CONFIG_HOME/suckless/dwm-6.4" && $EDITOR .)' alias zconf='(cd "$ZDOTDIR/" && $EDITOR .) && . "$ZDOTDIR/.zshrc"' # dev alias epitest='docker run -it --rm --user $UID:$GID -v "$PWD:/usr/app/" epitechcontent/epitest-docker bash' +alias make='make -j8' # compatibility alias ssh='TERM=linux ssh' @@ -21,7 +22,7 @@ function coloralias() { $1 $(echo - "${@:2}" | sed 's/--color=\w\+/--color=always/') } -alias sudo='doas ' +alias sudo='sudo ' alias watch='coloralias watch -c -- ' alias xargs='xargs ' diff --git a/.config/zsh/custom/themes/powerlevel10k b/.config/zsh/custom/themes/powerlevel10k index 21e89cb..a30145b 160000 --- a/.config/zsh/custom/themes/powerlevel10k +++ b/.config/zsh/custom/themes/powerlevel10k @@ -1 +1 @@ -Subproject commit 21e89cb61d9ed240c1ddf6dd09ce306e7c9cf437 +Subproject commit a30145b0f82d06770e924e9eac064ed223a94e6b diff --git a/.config/zsh/ohmyzsh b/.config/zsh/ohmyzsh index bf57b4f..b2313ec 160000 --- a/.config/zsh/ohmyzsh +++ b/.config/zsh/ohmyzsh @@ -1 +1 @@ -Subproject commit bf57b4ff3d53726a1317459b0f48853e90d7a6e4 +Subproject commit b2313ec7493dc127c9712f20654579221d0bcce6 diff --git a/bin/dkprune b/bin/dkprune index 34c384b..8b3501f 100755 --- a/bin/dkprune +++ b/bin/dkprune @@ -31,8 +31,7 @@ function add_opt() { } if ! [ -w '/var/run/docker.sock' ] && [ "$EUID" != 0 ]; then - command -v sudo > /dev/null && exec sudo -- "$0" "$@" - command -v doas > /dev/null && exec doas -- "$0" "$@" + exec sudo -- "$0" "$@" fi c=1