merge: work

This commit is contained in:
AngeD 2022-10-21 09:30:09 +02:00
commit 29178d008b
8 changed files with 13 additions and 6 deletions

View File

@ -31,6 +31,8 @@ vim.wo.colorcolumn = "80"
vim.g.netrw_banner = 0 vim.g.netrw_banner = 0
vim.o.lazyredraw = true
-------------------- --------------------
----- packages ----- ----- packages -----
-------------------- --------------------

@ -1 +1 @@
Subproject commit 575220f460fc3a5eeb05673e9cc7d8e80b6b7147 Subproject commit f22273a72b3f1c15085f2d4a43e8d785bf48c822

@ -1 +1 @@
Subproject commit 2dd9e060f21eecd403736bef07ec83b73341d955 Subproject commit 3592f769f2d6b07ce3083744cd0a13442f5d4f43

@ -1 +1 @@
Subproject commit 8f927a4d50716e534c5845e835625962adf878e1 Subproject commit c4c358e9badb181f4a05a4d8fd0c986a1cf5001b

View File

@ -15,6 +15,8 @@ alias dkcp='docker container prune'
alias dkcpf='docker container prune -f' alias dkcpf='docker container prune -f'
alias dkcrm='docker container rm' alias dkcrm='docker container rm'
alias dkcrmf='docker container rm -f' alias dkcrmf='docker container rm -f'
alias dkcsp='docker container stop'
alias dkcst='docker container start'
alias dkex='docker container exec -i -t' alias dkex='docker container exec -i -t'
alias dklo='docker logs -f' alias dklo='docker logs -f'
alias dkr='docker run -i -t' alias dkr='docker run -i -t'
@ -73,4 +75,5 @@ alias dkspvf='docker system prune --volumes -f'
# docker-compose # docker-compose
alias dc='docker-compose' alias dc='docker-compose'
alias dcd='docker-compose down' alias dcd='docker-compose down'
alias dcup='docker-compose up -d --build' alias dcup='docker-compose up -d'
alias dcupb='docker-compose up -d --build'

View File

@ -9,6 +9,8 @@ alias epitest="docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-dock
alias wconf="$EDITOR $HOME/.config/sway" alias wconf="$EDITOR $HOME/.config/sway"
alias zshconf="$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc" alias zshconf="$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc"
alias ssh='TERM=linux ssh'
alias minecraft='DRI_PRIME=1 minecraft-launcher' alias minecraft='DRI_PRIME=1 minecraft-launcher'
function fnalias() { function fnalias() {

@ -1 +1 @@
Subproject commit 65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf Subproject commit a7d910c3a61d8599f748a8ddae59ecdd9424022a