From e7512b6f7099fbf685c508059b694edf1f265843 Mon Sep 17 00:00:00 2001
From: Evgeniy Alekseev <i@arcanis.me>
Date: Tue, 20 Oct 2020 13:48:18 +0300
Subject: [PATCH] update dotfiles

---
 gitconfig    | 2 ++
 gpg.conf     | 1 +
 makepkg.conf | 8 ++++++--
 pacman.conf  | 6 +++---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/gitconfig b/gitconfig
index c875877..df14f48 100644
--- a/gitconfig
+++ b/gitconfig
@@ -16,6 +16,8 @@
 [push]
   default = simple
   followTags = true
+[pull]
+  rebase = true
 [merge]
   tool = vimdiff
 [alias]
diff --git a/gpg.conf b/gpg.conf
index 10e4125..54ddd47 100644
--- a/gpg.conf
+++ b/gpg.conf
@@ -2,3 +2,4 @@
 
 default-key  2E89012331361F01
 keyserver-options auto-key-retrieve
+keyserver keys.gnupg.net
diff --git a/makepkg.conf b/makepkg.conf
index 4c7aaf2..3ac3afc 100644
--- a/makepkg.conf
+++ b/makepkg.conf
@@ -41,17 +41,19 @@ CPPFLAGS="-D_FORTIFY_SOURCE=2"
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
 CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+#RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
@@ -90,7 +92,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #
 OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
 
-#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(md5)
 #-- Options to be used when stripping binaries. See `man strip' for details.
 STRIP_BINARIES="--strip-all"
@@ -104,6 +106,8 @@ MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
 DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 #-- Files to be removed from all packages (if purge is specified)
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+#-- Directory to store source code in for debug packages
+DBGSRCDIR="/usr/src/debug"
 
 #########################################################################
 # PACKAGE OUTPUT
diff --git a/pacman.conf b/pacman.conf
index b2b749f..d42202d 100644
--- a/pacman.conf
+++ b/pacman.conf
@@ -7,6 +7,6 @@ Server = http://repo.arcanis.me/repo/$arch
 [blackarch]
 Server = http://mirror.yandex.ru/mirrors/blackarch/$repo/os/$arch
 
-[mingw-w64]
-Server = http://downloads.sourceforge.net/project/mingw-w64-archlinux/$arch
-SigLevel = Never
+#[mingw-w64]
+#Server = http://downloads.sourceforge.net/project/mingw-w64-archlinux/$arch
+#SigLevel = Never