Merge branch 'master' of github.com:mvertes/dotfiles

3 files changed, 16 insertions, 1 deletions

diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index c79faf1..6236cf2 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -166,6 +166,8 @@ font_size 14.0
 
 #: Cursor customization {{{
 
+shell_integration no-cursor
+
 # cursor #cccccc
 cursor #ff0000
 
@@ -177,7 +179,7 @@ cursor #ff0000
 #: with the background color of the cell underneath instead, use the
 #: special keyword: background
 
-# cursor_shape block
+cursor_shape block
 
 #: The cursor shape can be one of (block, beam, underline). Note that
 #: when reloading the config this will be changed only if the cursor
diff --git a/.gitconfig b/.gitconfig
index a11157f..2b6e3aa 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,9 +16,18 @@
 	rebase = false
 [push]
 	autoSetupRemote = true
+	default = simple
+	followTags = true
 [hub]
 	protocol = ssh
 [init]
 	defaultBranch = main
 [core]
 	excludesfile = ~/.gitignore_global
+[diff]
+	algorithm = histogram
+	colorMoved = plain
+	mnemonicPrefix = true
+	renames = true
+[commit]
+	verbose = true
diff --git a/.vimrc b/.vimrc
index 84ff574..158c3ec 100644
--- a/.vimrc
+++ b/.vimrc
@@ -28,7 +28,11 @@ set smartcase
 set belloff=all
 
 " For MacVim
+augroup tune_colors | au!
+    au ColorScheme * hi Cursor guibg=red guifg=white
+augroup END
 set guifont=6x13:h13
+set guicursor=a:block-Cursor/lCursor-blinkon0
 
 " fzf plugin
 set rtp+=/opt/homebrew/opt/fzf