From 8ff07de96461ca9a8c0b12378e97acd5a76359f6 Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@smobe.fr>
Date: Mon, 28 Nov 2022 16:46:27 +0100
Subject: [PATCH 1/3] feat: kx instead of kn for simplicity

---
 .config/nvim/pack/plugins/opt/black      |  2 +-
 .config/nvim/pack/plugins/opt/lspconfig  |  2 +-
 .config/nvim/pack/plugins/opt/telescope  |  2 +-
 .config/nvim/pack/plugins/opt/treesitter |  2 +-
 .config/zsh/.kubectl_aliases             | 24 ++++++++----------------
 .config/zsh/ohmyzsh                      |  2 +-
 .pyenv                                   |  2 +-
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/.config/nvim/pack/plugins/opt/black b/.config/nvim/pack/plugins/opt/black
index 2793249..d4a8564 160000
--- a/.config/nvim/pack/plugins/opt/black
+++ b/.config/nvim/pack/plugins/opt/black
@@ -1 +1 @@
-Subproject commit 27932494bcefac03497dd92dcf0c59a04c10d757
+Subproject commit d4a85643a465f5fae2113d07d22d021d4af4795a
diff --git a/.config/nvim/pack/plugins/opt/lspconfig b/.config/nvim/pack/plugins/opt/lspconfig
index 2b802ab..a2817c9 160000
--- a/.config/nvim/pack/plugins/opt/lspconfig
+++ b/.config/nvim/pack/plugins/opt/lspconfig
@@ -1 +1 @@
-Subproject commit 2b802ab1e94d595ca5cc7c55f9d1fb9b17f9754c
+Subproject commit a2817c9d9500079a0340286a88653b41707a92eb
diff --git a/.config/nvim/pack/plugins/opt/telescope b/.config/nvim/pack/plugins/opt/telescope
index 7a4ffef..4d77743 160000
--- a/.config/nvim/pack/plugins/opt/telescope
+++ b/.config/nvim/pack/plugins/opt/telescope
@@ -1 +1 @@
-Subproject commit 7a4ffef931769c3fe7544214ed7ffde5852653f6
+Subproject commit 4d77743a8ec4d19b3c47e0d04f3e88f1a933698e
diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter
index dc27512..1821c65 160000
--- a/.config/nvim/pack/plugins/opt/treesitter
+++ b/.config/nvim/pack/plugins/opt/treesitter
@@ -1 +1 @@
-Subproject commit dc27512e0019dcf4b6fbf0e0d5f285b4c9858308
+Subproject commit 1821c656d8e42fd8ce6648af58e64268606e8bec
diff --git a/.config/zsh/.kubectl_aliases b/.config/zsh/.kubectl_aliases
index 74d3eab..141122f 100644
--- a/.config/zsh/.kubectl_aliases
+++ b/.config/zsh/.kubectl_aliases
@@ -12,25 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-function kn() {
-    (set -e
-        local ctx="${1%/*}"
-        local ns="$2"
+function kx() {
+    1="$(echo - "$1" | tr -c '[:alnum:]-_' '[ *]')"
+    local ctx="$(echo - "$1" | awk '{print $1}')"
+    local ns="${2-$(echo - "$1" | awk '{print $2}')}"
 
-        if [ -z "$ns" ] && [ "$ctx" != "$1" ]; then
-            ns="${1#*/}"
-        fi
-        if [ -n "$ns" ]; then
-            kubectx "${ctx:l}"
-        else
-            ns="$ctx"
-        fi
-        kubens "${ns:l}"
-    )
+    kubectx ${ctx:l}
+    [ -n "$ns" ] && kubens "${ns:l}"
 }
-compdef -e _kubens.zsh kn
+compdef -e _kubectx.zsh kx
 
-alias kx='kubectx'
+alias kn='kubens'
 alias k='kubectl'
 alias ksys='kubectl --namespace=kube-system'
 alias ka='kubectl apply --recursive -f'
diff --git a/.config/zsh/ohmyzsh b/.config/zsh/ohmyzsh
index 5ab5173..1aa58d4 160000
--- a/.config/zsh/ohmyzsh
+++ b/.config/zsh/ohmyzsh
@@ -1 +1 @@
-Subproject commit 5ab517361a4215d2f777023fc1e772fe79496713
+Subproject commit 1aa58d42a52b8fa39f16ad169fc405f276c36ae5
diff --git a/.pyenv b/.pyenv
index 4c261e6..13d8568 160000
--- a/.pyenv
+++ b/.pyenv
@@ -1 +1 @@
-Subproject commit 4c261e6ea1a123e321a47b6c723ebd2603527e4d
+Subproject commit 13d85686205e7a21f2aabd659ee96d34dd7a12b5

From 4f9b55aee574519be6fa844dd92b7193883ca495 Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@smobe.fr>
Date: Thu, 8 Dec 2022 17:13:44 +0100
Subject: [PATCH 2/3] feat: +impatient -black nvim plugins

---
 .config/nvim/ftplugin/json.lua                 | 7 +++++++
 .config/nvim/init.lua                          | 2 +-
 .config/nvim/lua/pack-black.lua                | 1 -
 .config/nvim/lua/pack-impatient.lua            | 2 ++
 .config/nvim/lua/pack-lspconfig.lua            | 2 --
 .config/nvim/pack/plugins/opt/black            | 1 -
 .config/nvim/pack/plugins/opt/impatient        | 1 +
 .config/nvim/pack/plugins/opt/indent-blankline | 2 +-
 .config/nvim/pack/plugins/opt/lspconfig        | 2 +-
 .config/nvim/pack/plugins/opt/telescope        | 2 +-
 .config/nvim/pack/plugins/opt/treesitter       | 2 +-
 .config/zsh/ohmyzsh                            | 2 +-
 .gitmodules                                    | 6 +++---
 .pyenv                                         | 2 +-
 14 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 .config/nvim/ftplugin/json.lua
 delete mode 100644 .config/nvim/lua/pack-black.lua
 create mode 100644 .config/nvim/lua/pack-impatient.lua
 delete mode 160000 .config/nvim/pack/plugins/opt/black
 create mode 160000 .config/nvim/pack/plugins/opt/impatient

diff --git a/.config/nvim/ftplugin/json.lua b/.config/nvim/ftplugin/json.lua
new file mode 100644
index 0000000..317629b
--- /dev/null
+++ b/.config/nvim/ftplugin/json.lua
@@ -0,0 +1,7 @@
+-- packages
+
+-- variables
+vim.opt_local.shiftwidth = 2
+vim.opt_local.tabstop = 2
+
+-- keybindings
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 4c6b0e4..6ffbdaf 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -41,9 +41,9 @@ vim.o.mousemodel     = extend
 ----- packages -----
 --------------------
 
+require"pack-impatient"
 vim.cmd("packadd plenary")
 
-require"pack-black"
 require"pack-dirdiff"
 require"pack-easy-align"
 require"pack-indent-blankline"
diff --git a/.config/nvim/lua/pack-black.lua b/.config/nvim/lua/pack-black.lua
deleted file mode 100644
index 79c288e..0000000
--- a/.config/nvim/lua/pack-black.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.cmd("packadd black")
diff --git a/.config/nvim/lua/pack-impatient.lua b/.config/nvim/lua/pack-impatient.lua
new file mode 100644
index 0000000..7bc909f
--- /dev/null
+++ b/.config/nvim/lua/pack-impatient.lua
@@ -0,0 +1,2 @@
+vim.cmd("packadd impatient")
+require"impatient"
diff --git a/.config/nvim/lua/pack-lspconfig.lua b/.config/nvim/lua/pack-lspconfig.lua
index 88e59c2..2822a02 100644
--- a/.config/nvim/lua/pack-lspconfig.lua
+++ b/.config/nvim/lua/pack-lspconfig.lua
@@ -12,9 +12,7 @@ vim.keymap.set("n", "<Leader>q", vim.diagnostic.setloclist, opts)
 
 local servers = {
     "bashls",
-    "dockerls",
     "pyright",
-    "yamlls",
 }
 
 for _, server in ipairs(servers) do
diff --git a/.config/nvim/pack/plugins/opt/black b/.config/nvim/pack/plugins/opt/black
deleted file mode 160000
index d4a8564..0000000
--- a/.config/nvim/pack/plugins/opt/black
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d4a85643a465f5fae2113d07d22d021d4af4795a
diff --git a/.config/nvim/pack/plugins/opt/impatient b/.config/nvim/pack/plugins/opt/impatient
new file mode 160000
index 0000000..d3dd30f
--- /dev/null
+++ b/.config/nvim/pack/plugins/opt/impatient
@@ -0,0 +1 @@
+Subproject commit d3dd30ff0b811756e735eb9020609fa315bfbbcc
diff --git a/.config/nvim/pack/plugins/opt/indent-blankline b/.config/nvim/pack/plugins/opt/indent-blankline
index db7cbcb..c4c203c 160000
--- a/.config/nvim/pack/plugins/opt/indent-blankline
+++ b/.config/nvim/pack/plugins/opt/indent-blankline
@@ -1 +1 @@
-Subproject commit db7cbcb40cc00fc5d6074d7569fb37197705e7f6
+Subproject commit c4c203c3e8a595bc333abaf168fcb10c13ed5fb7
diff --git a/.config/nvim/pack/plugins/opt/lspconfig b/.config/nvim/pack/plugins/opt/lspconfig
index a2817c9..c720632 160000
--- a/.config/nvim/pack/plugins/opt/lspconfig
+++ b/.config/nvim/pack/plugins/opt/lspconfig
@@ -1 +1 @@
-Subproject commit a2817c9d9500079a0340286a88653b41707a92eb
+Subproject commit c7206327096bedf2e213788a60624a84b3b7552d
diff --git a/.config/nvim/pack/plugins/opt/telescope b/.config/nvim/pack/plugins/opt/telescope
index 4d77743..cabf991 160000
--- a/.config/nvim/pack/plugins/opt/telescope
+++ b/.config/nvim/pack/plugins/opt/telescope
@@ -1 +1 @@
-Subproject commit 4d77743a8ec4d19b3c47e0d04f3e88f1a933698e
+Subproject commit cabf991b1d3996fa6f3232327fc649bbdf676496
diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter
index 1821c65..582e568 160000
--- a/.config/nvim/pack/plugins/opt/treesitter
+++ b/.config/nvim/pack/plugins/opt/treesitter
@@ -1 +1 @@
-Subproject commit 1821c656d8e42fd8ce6648af58e64268606e8bec
+Subproject commit 582e5683fbe88ecbc73396a7bc1431d84ca693e8
diff --git a/.config/zsh/ohmyzsh b/.config/zsh/ohmyzsh
index 1aa58d4..b692ff2 160000
--- a/.config/zsh/ohmyzsh
+++ b/.config/zsh/ohmyzsh
@@ -1 +1 @@
-Subproject commit 1aa58d42a52b8fa39f16ad169fc405f276c36ae5
+Subproject commit b692ff2e1597816563cbdaeeedf0966ad9babeca
diff --git a/.gitmodules b/.gitmodules
index a1745e6..a8d816d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
-[submodule ".config/nvim/pack/plugins/opt/black"]
-	path = .config/nvim/pack/plugins/opt/black
-	url = https://github.com/psf/black.git
 [submodule ".config/nvim/pack/plugins/opt/dirdiff"]
 	path = .config/nvim/pack/plugins/opt/dirdiff
 	url = https://github.com/will133/vim-dirdiff.git
 [submodule ".config/nvim/pack/plugins/opt/easy-align"]
 	path = .config/nvim/pack/plugins/opt/easy-align
 	url = https://github.com/junegunn/vim-easy-align.git
+[submodule ".config/nvim/pack/plugins/opt/impatient"]
+	path = .config/nvim/pack/plugins/opt/impatient
+	url = https://github.com/lewis6991/impatient.nvim.git
 [submodule ".config/nvim/pack/plugins/opt/indent-blankline"]
 	path = .config/nvim/pack/plugins/opt/indent-blankline
 	url = https://github.com/lukas-reineke/indent-blankline.nvim.git
diff --git a/.pyenv b/.pyenv
index 13d8568..73dc554 160000
--- a/.pyenv
+++ b/.pyenv
@@ -1 +1 @@
-Subproject commit 13d85686205e7a21f2aabd659ee96d34dd7a12b5
+Subproject commit 73dc5547fce4a12b77a54b4661cea7de3489baab

From b76da127ce2f123438acf7db5e4879bb4c58869f Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@smobe.fr>
Date: Thu, 8 Dec 2022 17:14:12 +0100
Subject: [PATCH 3/3] feat: viconf alias, tidy aliases

---
 .config/zsh/.zsh_aliases | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/.config/zsh/.zsh_aliases b/.config/zsh/.zsh_aliases
index 6b59ccf..1fdbdc7 100644
--- a/.config/zsh/.zsh_aliases
+++ b/.config/zsh/.zsh_aliases
@@ -1,25 +1,35 @@
+# system
 alias cls='clear && ls -lah'
-alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
 alias startgui='startx'
 alias tmp='cd $(mktemp -d)'
-alias umnt='sudo umount /mnt -R'
-alias vi='$EDITOR'
-alias epitest='docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker bash'
-alias automount='MNT=$(udisksctl mount -b /dev/sda1 2> /dev/null || udisksctl mount -b /dev/sdb1) && cd ${MNT/* }'
 alias update="sudo apt-get update && sudo apt-get upgrade; sudo npm update -g; pip freeze | cut -f1 -d= | xargs pip install -U; config submodule update --remote --recursive --init"
+alias vi='$EDITOR'
 
+# conf
+alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
+alias viconf='$EDITOR $XDG_CONFIG_HOME/nvim'
 alias wconf='$EDITOR $HOME/.config/awesome'
 alias zshconf='$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc'
 
+# dev
+alias epitest='docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker bash'
+
+# disk
+alias automount='MNT=$(udisksctl mount -b /dev/sda1 2> /dev/null || udisksctl mount -b /dev/sdb1) && cd ${MNT/* }'
+alias autoumount='umount /media/*/* /run/media/*/*'
+alias umnt='sudo umount /mnt -R'
+
+# compatibility
 alias ssh='TERM=linux ssh'
 
+# gaming
 alias minecraft='DRI_PRIME=1 minecraft-launcher'
 
-function fnalias() {
-    $1 $(sed 's/--color=.\+/--color=force/' <<< "${@:2}")
+# alias
+function coloralias() {
+    $1 $(echo - "${@:2}" | sed 's/--color=.\+/--color=force/')
 }
 
-alias man='man '
 alias sudo='sudo '
-alias watch='fnalias watch -c '
+alias watch='coloralias watch -c '
 alias xargs='xargs '