diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index e1906fa..317fcec 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -69,3 +69,5 @@ path = ~/.gitconfig.local [pull] rebase = false +[init] + defaultBranch = main diff --git a/dotfiles/rsync_ignore b/dotfiles/rsync_ignore index 30f4f9d..3ce26b4 100644 --- a/dotfiles/rsync_ignore +++ b/dotfiles/rsync_ignore @@ -5,11 +5,14 @@ .arduino* .bundle .cache +.dropbox-dist .gradle .histfile .local/share/Steam .local/share/Trash +.local/lib .rvm* +.sliver .sqlite_history .thumbnails .wine diff --git a/dotfiles/zshrc.d/vmstat.zsh b/dotfiles/zshrc.d/vmstat.zsh new file mode 100644 index 0000000..c4426a8 --- /dev/null +++ b/dotfiles/zshrc.d/vmstat.zsh @@ -0,0 +1,7 @@ +function vmstat { + local _extra_args + if [ "$(tput cols)" -gt 80 ] ; then + _extra_args="-w" + fi + command vmstat ${_extra_args} "$@" +}