merge: work

.config/nvim/ftplugin/json.lua

@@ -0,0 +1,7 @@
+-- packages
+
+-- variables
+vim.opt_local.shiftwidth = 2
+vim.opt_local.tabstop = 2
+
+-- keybindings

.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"

.config/nvim/lua/pack-black.lua

@@ -1 +0,0 @@
-vim.cmd("packadd black")

.config/nvim/lua/pack-impatient.lua

@@ -0,0 +1,2 @@
+vim.cmd("packadd impatient")
+require"impatient"

.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

.config/nvim/pack/plugins/opt/black

@@ -1 +0,0 @@
-Subproject commit d4a85643a465f5fae2113d07d22d021d4af4795a

.config/nvim/pack/plugins/opt/impatient

@@ -0,0 +1 @@
+Subproject commit d3dd30ff0b811756e735eb9020609fa315bfbbcc

.config/nvim/pack/plugins/opt/indent-blankline

@@ -1 +1 @@
-Subproject commit db7cbcb40cc00fc5d6074d7569fb37197705e7f6
+Subproject commit c4c203c3e8a595bc333abaf168fcb10c13ed5fb7

.config/nvim/pack/plugins/opt/lspconfig

@@ -1 +1 @@
-Subproject commit 334fc86c16be91638b61e25fe89e89c55c5617bf
+Subproject commit c7206327096bedf2e213788a60624a84b3b7552d

.config/nvim/pack/plugins/opt/telescope

@@ -1 +1 @@
-Subproject commit f37c603303925c643056437f31a0998e4cf2232d
+Subproject commit cabf991b1d3996fa6f3232327fc649bbdf676496

.config/nvim/pack/plugins/opt/treesitter

@@ -1 +1 @@
-Subproject commit 256802258084fcf6c7011dae4c3fbfaaf4b61518
+Subproject commit 0b00eb4b826bde517e87a0993bdb8409435b2378

.config/zsh/.kubectl_aliases

@@ -12,25 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-function kn() {
+function kx() {
-    (set -e
+    1="$(echo - "$1" | tr -c '[:alnum:]-_' '[ *]')"
-        local ctx="${1%/*}"
+    local ctx="$(echo - "$1" | awk '{print $1}')"
-        local ns="$2"
+    local ns="${2-$(echo - "$1" | awk '{print $2}')}"
 
-        if [ -z "$ns" ] && [ "$ctx" != "$1" ]; then
+    kubectx ${ctx:l}
-            ns="${1#*/}"
+    [ -n "$ns" ] && kubens "${ns:l}"
-        fi
-        if [ -n "$ns" ]; then
-            kubectx "${ctx:l}"
-        else
-            ns="$ctx"
-        fi
-        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'

.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='sway 2> $HOME/sway.log'
 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 autoumount='umount /media/*/* /run/media/*/*'
 alias update="paru -Syu; 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/sway'
 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() {
+# alias
-    $1 $(sed 's/--color=.\+/--color=force/' <<< "${@:2}")
+function coloralias() {
+    $1 $(echo - "${@:2}" | sed 's/--color=.\+/--color=force/')
 }
 
 alias sudo='sudo '
-alias watch='fnalias watch -c '
+alias watch='coloralias watch -c '
 alias xargs='xargs '

.config/zsh/ohmyzsh

@@ -1 +1 @@
-Subproject commit fc44c49cca9d5e499097392d3f42b1375d0253ba
+Subproject commit f4dc8c5be365668810783ced01a86ff8f251bfd7

.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