From c7f0380f1dcd7a79b73240757f88f97685397a3b Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@epitech.eu>
Date: Wed, 7 Sep 2022 08:37:16 +0200
Subject: [PATCH] merge: work

---
 .config/nvim/init.lua       | 6 ------
 .config/zsh/.docker_aliases | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index cf9e0c4..ec52b28 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -46,12 +46,6 @@ vim.wo.cc            = "80"
 -- terminal escape key
 vim.keymap.set("t",  "<Esc>",     "<C-\\><C-n>"       )
 
--- movement keys
-vim.keymap.set("n",  "<C-h>",     "<C-w>h"            )
-vim.keymap.set("n",  "<C-j>",     "<C-w>j"            )
-vim.keymap.set("n",  "<C-k>",     "<C-w>k"            )
-vim.keymap.set("n",  "<C-l>",     "<C-w>l"            )
-
 -- go to file:line instead of just file
 vim.keymap.set("n",  "gf",        "gF"                )
 
diff --git a/.config/zsh/.docker_aliases b/.config/zsh/.docker_aliases
index 4064b4d..b13bf73 100644
--- a/.config/zsh/.docker_aliases
+++ b/.config/zsh/.docker_aliases
@@ -11,8 +11,8 @@ alias dkcpf='docker container prune -f'
 alias dkcrm='docker container rm'
 alias dkcrmf='docker container rm -f'
 alias dkex='docker container exec -i -t'
-alias dklo='docker container logs -f'
-alias dkr='docker container run -i -t'
+alias dklo='docker logs -f'
+alias dkr='docker run -i -t'
 
 # images
 alias dkb='docker build .'