From 385db489676793e5e5542a49b9f0beb55dd96a66 Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim.huizinga@gmail.com>
Date: Thu, 14 Jan 2021 04:09:42 +0100
Subject: [PATCH] Updated dotfiles

---
 git/.gitconfig             | 4 ++++
 nvim/.config/nvim/init.vim | 2 ++
 zsh/.zshrc                 | 1 -
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index f4cc208..2786114 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -13,3 +13,7 @@
 
 [credential]
 	helper = /usr/lib/git-core/git-credential-libsecret
+[pull]
+	rebase = false
+[init]
+	defaultBranch = master
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index c9d2bc1..1c6e1b9 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -141,6 +141,8 @@ let g:echodoc#type = 'signature'
 " LanguageClient
 let g:LanguageClient_serverCommands = {
 \ 'cpp': ['clangd'],
+\ 'cc': ['clangd'],
+\ 'c': ['clangd'],
 \ 'python': ['pyls'],
 \ }
 let g:LanguageClient_diagnosticsDisplay = {
diff --git a/zsh/.zshrc b/zsh/.zshrc
index b146a54..316ad23 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -21,4 +21,3 @@ if [[ -s "${ZDOTDIR}/gitalias.zsh" ]]; then
 fi
 
 export GREP_COLORS="mt=01;32"
-