diff options
author | Nguyễn Gia Phong <mcsinyx@disroot.org> | 2020-07-13 15:30:19 +0700 |
---|---|---|
committer | Nguyễn Gia Phong <mcsinyx@disroot.org> | 2020-07-13 15:30:19 +0700 |
commit | e4c6f551a88f8a8b096e57a8a7f594b660e06f5b (patch) | |
tree | 0f68f463ab99ea9512dd1d6a0f5d197dcb8a08f0 | |
parent | 65aa335a9bcccf57c7da257193261ac63e59bf97 (diff) | |
download | dotfiles-e4c6f551a88f8a8b096e57a8a7f594b660e06f5b.tar.gz |
Update 2020-07-13
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | dev/.drirc | 5 | ||||
-rw-r--r-- | dev/.gitconfig | 2 |
3 files changed, 9 insertions, 1 deletions
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 |