Merge branch 'master' of https://github.com./Matir/skel

dotfiles/gitconfig

@@ -69,3 +69,5 @@
 	path = ~/.gitconfig.local
 [pull]
 	rebase = false
+[init]
+	defaultBranch = main

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

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} "$@"
+}