From d8be2b09accf6c9524f02abfdb2b7a47b4ea1ec5 Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Wed, 13 Jan 2021 08:54:31 +0100
Subject: [PATCH] Merged coc-settings

---
 git/gitconfig          | 15 +++++++++++++++
 nvim/coc-settings.json | 14 +++++++++++++-
 tmux/tmux.conf         |  4 ++--
 zsh/zshrc              |  2 ++
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/git/gitconfig b/git/gitconfig
index 15bfa52..c82dee4 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -4,6 +4,14 @@
 	name = changeme
 	email = changeme
 	signingkey = changeme
+[user "private"]
+	name = Michael Mandl
+	email = mandlm@molez.net
+	signingkey = 4AA25D647AA54CC7
+[user "swp"]
+	name = Michael Mandl
+	email = mandl@vi-bim.de
+	signingkey = 4E60F44227F611B4
 [alias]
 	identity = "! git config user.name \"$(git config user.$1.name)\"; git config user.email \"$(git config user.$1.email)\"; git config user.signingkey \"$(git config user.$1.signingkey)\"; :"
 [commit]
@@ -17,6 +25,7 @@
 	pager = less -S -x1,5
 	whitespace = cr-at-eol
 	excludesfile = ~/.gitignore
+	hookspath = /mnt/d/SWP/devtools/userhooks
 [rebase]
 	autostash = true
 [color "diff"]
@@ -32,6 +41,8 @@
 	tool = vimdiff
 [difftool "vimdiff"]
 	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+[mergetool "vimdiff"]
+	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 [difftool]
 	prompt = false
 [gitflow]
@@ -50,8 +61,12 @@
 	date = relative
 [format]
 	pretty = format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s
+[merge]
+	tool = bc
 [mergetool "nvim"]
 	cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
+[mergetool "bc"]
+	path = /mnt/c/Program Files/Beyond Compare 4/BComp.exe
 [rerere]
 	enabled = true
 [fetch]
diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json
index d4bd77a..e62329f 100644
--- a/nvim/coc-settings.json
+++ b/nvim/coc-settings.json
@@ -1,3 +1,15 @@
 {
-  "coc.preferences.formatOnSaveFiletypes": ["cpp", "javascript", "typescript", "typescriptreact", "json", "markdown", "python", "rust", "toml", "yaml"]
+  "coc.preferences.formatOnSaveFiletypes": [
+  	"cpp", 
+	"javascript", 
+	"typescript", 
+	"typescriptreact", 
+	"json", 
+	"markdown", 
+	"python", 
+	"rust", 
+	"toml", 
+	"yaml"
+  ],
+  "clangd.path": "/home/mandlm/.config/coc/extensions/coc-clangd-data/install/11.0.0/clangd_11.0.0/bin/clangd"
 }
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 538f0ee..790deb7 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -15,12 +15,12 @@ bind-key -n C-h run "($is_vim && tmux send-keys C-h) || tmux select-pane -L"
 bind-key -n C-j run "($is_vim && tmux send-keys C-j) || ($is_fzf && tmux send-keys C-j) || tmux select-pane -D"
 bind-key -n C-k run "($is_vim && tmux send-keys C-k) || ($is_fzf && tmux send-keys C-k) || tmux select-pane -U"
 bind-key -n C-l run "($is_vim && tmux send-keys C-l) || tmux select-pane -R"
-bind-key -n C-\\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
+bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
 bind-key -T copy-mode-vi C-h select-pane -L
 bind-key -T copy-mode-vi C-j select-pane -D
 bind-key -T copy-mode-vi C-k select-pane -U
 bind-key -T copy-mode-vi C-l select-pane -R
-bind-key -T copy-mode-vi C-\\ select-pane -l
+bind-key -T copy-mode-vi C-\ select-pane -l
 
 # List of plugins
 # Install TPM with
diff --git a/zsh/zshrc b/zsh/zshrc
index 390cf3a..a56fc2e 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -118,3 +118,5 @@ export EDITOR='nvim'
 [ -f ~/.dotfiles/fzf/git-completion.zsh ] && source ~/.dotfiles/fzf/git-completion.zsh
 
 export GPG_TTY=$(tty)
+export BROWSER=wsl-open.sh
+[ -f ~/.dircolors-solarized/dircolors.256dark ] && eval `dircolors ~/.dircolors-solarized/dircolors.256dark`