From 32e736065ffa9e9ace27d0a01134e05f8e4db465 Mon Sep 17 00:00:00 2001
From: Tanguy Herbron <tanguy.herbron@outlook.com>
Date: Tue, 22 Nov 2022 09:17:46 +0100
Subject: [PATCH] Merge

---
 .config/coc/extensions/package.json    | 19 ++++++++++---------
 .config/nvim/coc-settings.json         | 13 ++++++++++++-
 .config/nvim/init.vim                  | 14 ++++++++++++++
 .oh-my-zsh/custom/themes/powerlevel10k |  2 +-
 .tmux.conf                             |  8 ++++++++
 .tmux/plugins/tpm                      |  2 +-
 .zshrc                                 |  8 ++++++++
 7 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json
index b202e56..089893e 100644
--- a/.config/coc/extensions/package.json
+++ b/.config/coc/extensions/package.json
@@ -1,16 +1,17 @@
 {
   "dependencies": {
-    "coc-json": ">=1.3.6",
-    "coc-tsserver": ">=1.8.6",
-    "coc-vetur": ">=1.2.5",
-    "coc-pyright": ">=1.1.272",
     "coc-clangd": ">=0.25.0",
+    "coc-docker": ">=0.5.0",
     "coc-go": ">=1.3.0",
+    "coc-json": ">=1.3.6",
     "coc-markdownlint": ">=1.26.0",
-    "coc-rust-analyzer": ">=0.68.2",
     "coc-pairs": ">=1.3.2",
-    "coc-docker": ">=0.5.0"
-  },
-  "disabled": [],
-  "locked": []
+    "coc-pyright": ">=1.1.272",
+    "coc-rls": ">=1.1.6",
+    "coc-rust-analyzer": ">=0.68.2",
+    "coc-sh": ">=0.7.0",
+    "coc-tsserver": ">=1.11.11",
+    "coc-vetur": ">=1.2.5",
+    "coc-yaml": ">=1.8.0"
+  }
 }
\ No newline at end of file
diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json
index 7e8a68d..f6c1e60 100644
--- a/.config/nvim/coc-settings.json
+++ b/.config/nvim/coc-settings.json
@@ -4,5 +4,16 @@
     "vetur.format.options.useTabs": true,
     "rust-analyzer.procMacro.enable": true,
     "rust-analyzer.procMacro.attributes.enable": true,
-    "rust-analyzer.diagnostics.disabled": ["unresolved-proc-macro"]
+    "rust-analyzer.diagnostics.disabled": ["unresolved-proc-macro"],
+    "yaml.schemas": {
+        "kubernetes": "/*.yaml"
+    },
+    "languageserver": {
+        "bash": {
+            "command": "bash-language-server",
+            "args": ["start"],
+            "filetypes": ["sh", "hbs"],
+            "ignoredRootPaths": ["~"]
+        }
+    }
 }
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 3f7de30..bce18d9 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -37,6 +37,13 @@ Plug 'machakann/vim-highlightedyank'
 " Markdown preview in browser
 Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
 
+"" Markdown table formatter
+"Plug 'junegunn/vim-easy-align'
+
+" Markdown formatting
+Plug 'godlygeek/tabular'
+Plug 'preservim/vim-markdown'
+
 " React syntax highlighter
 
 " i3 config checker
@@ -47,6 +54,8 @@ Plug 'mboughaba/i3config.vim'
 " Plug 'lervag/vimtex'
 " Plug 'ekalinin/Dockerfile.vim'
 
+" Vim integration in tmux
+Plug 'vimpostor/vim-tpipeline'
 call plug#end()
 
 " autocmd vimenter * NERDTree | wincmd w
@@ -175,3 +184,8 @@ augroup python
                 \   | highlight def link pythonSelf Special
 
 augroup end
+
+" Markdown formatter macro
+nnoremap <leader>t :TableFormat<CR>
+
+let g:coc_disable_startup_warning = 1
diff --git a/.oh-my-zsh/custom/themes/powerlevel10k b/.oh-my-zsh/custom/themes/powerlevel10k
index ae32fd5..0b02654 160000
--- a/.oh-my-zsh/custom/themes/powerlevel10k
+++ b/.oh-my-zsh/custom/themes/powerlevel10k
@@ -1 +1 @@
-Subproject commit ae32fd58b3623b52005c72fb1edcb09ab753ad45
+Subproject commit 0b026542699ca0f2de7c5354fe0ff1184e63a3f3
diff --git a/.tmux.conf b/.tmux.conf
index 96ee40e..5c7ecd6 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -156,4 +156,12 @@ run -b '~/.tmux/plugins/tpm/tpm'
 unbind p
 set -g @bw-key 'p'
 
+# vim-tpipeline recommended configuration
+
+set -g focus-event on
+set -g status-style bg=default
+set -g status-left-length 90
+set -g status-right-length 90
+set -g status-justify centre
+
 # run-shell "~/.tmux/boot.sh"
diff --git a/.tmux/plugins/tpm b/.tmux/plugins/tpm
index 95f7833..b699a7e 160000
--- a/.tmux/plugins/tpm
+++ b/.tmux/plugins/tpm
@@ -1 +1 @@
-Subproject commit 95f78336c3972f3e6648b7b3db754f2224320a5e
+Subproject commit b699a7e01c253ffb7818b02d62bce24190ec1019
diff --git a/.zshrc b/.zshrc
index 580ec78..f0323e4 100644
--- a/.zshrc
+++ b/.zshrc
@@ -48,6 +48,10 @@ export EDITOR='nvim'
 
 # Add custom script to path
 export PATH="$HOME/.bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"
+
+# Go path
+export PATH=$PATH:/usr/local/go/bin
 
 # The next line updates PATH for the Google Cloud SDK.
 if [ -f '/home/tanguy/Downloads/tmp/google-cloud-sdk/path.zsh.inc' ]; then . '/home/tanguy/Downloads/tmp/google-cloud-sdk/path.zsh.inc'; fi
@@ -118,3 +122,7 @@ function wg-reload() {
 [ -x "$(command -v tmux)" ] \
     && [ -z "${TMUX}" ] \
     && { tmux attach || tmux new -s Halia -n Local -d && tmux attach; }
+
+# Generated for envman. Do not edit.
+[ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh"
+