From e4c6f551a88f8a8b096e57a8a7f594b660e06f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= <mcsinyx@disroot.org>
Date: Mon, 13 Jul 2020 15:30:19 +0700
Subject: [PATCH] Update 2020-07-13

---
 .gitignore     | 3 ++-
 dev/.drirc     | 5 +++++
 dev/.gitconfig | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 dev/.drirc

diff --git a/.gitignore b/.gitignore
index dc40f43..554de32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 vim/.cache/vim/viminfo
-vim/.vim/__pycache__
+vim/.vim/.netrwhist
 vim/.vim/plugged
 awesome/.config/awesome/vicious/
 nix/.config/gtk-3.0/settings.ini
 nix/.gtkrc-2.0
+__pycache__
 .uuid
diff --git a/dev/.drirc b/dev/.drirc
new file mode 100644
index 0000000..7cf47a1
--- /dev/null
+++ b/dev/.drirc
@@ -0,0 +1,5 @@
+<device screen="0" driver="dri2">
+  <application name="Default">
+    <option name="vblank_mode" value="0"/>
+  </application>
+</device>
diff --git a/dev/.gitconfig b/dev/.gitconfig
index 46a58ed..8dbc3af 100644
--- a/dev/.gitconfig
+++ b/dev/.gitconfig
@@ -14,3 +14,5 @@
 	required = true
 [color]
 	ui = auto
+[pull]
+	rebase = true