From 0be9347fd35fae372a449d5f80b5e3af78f9b0b3 Mon Sep 17 00:00:00 2001
From: Taeyeon Mori <orochimarufan.x3@gmail.com>
Date: Sat, 18 Apr 2015 18:02:03 +0200
Subject: [PATCH] Add script to fix Steam on Arch, pull latest prezto, disable
 core detection for makepkg for now

---
 README.md                | 1 +
 bin/fix-steam-runtime.sh | 1 +
 dotfiles/makepkg.conf    | 5 ++++-
 install                  | 2 +-
 zsh/prezto               | 2 +-
 zsh/zpreztorc            | 1 -
 zsh/zprofile             | 3 +--
 zsh/zshenv               | 2 +-
 8 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100755 bin/fix-steam-runtime.sh

diff --git a/README.md b/README.md
index 7ff0f2d..2c0639e 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ Notable ones are:
 - schedshut : Shutdown when a specific task/process finishes.
 - mountpart : Mount a partition in a whole-disk imagefile.
 - argshell  : call the same application repeatedly, with a common set of arguments.
+- fix-steam-runtime.sh : Fix Steam runtime on Arch Linux (And others with "too new" libstdc++ and friends)
 
 .files/etc
 ----------
diff --git a/bin/fix-steam-runtime.sh b/bin/fix-steam-runtime.sh
new file mode 100755
index 0000000..64c2be6
--- /dev/null
+++ b/bin/fix-steam-runtime.sh
@@ -0,0 +1 @@
+find "$HOME/.steam/root/" ( -name libgcc_s.so* -o -name libstdc++.so* -o -name libxcb.so* ) -print -delete
diff --git a/dotfiles/makepkg.conf b/dotfiles/makepkg.conf
index d09f7df..44afccd 100644
--- a/dotfiles/makepkg.conf
+++ b/dotfiles/makepkg.conf
@@ -4,6 +4,8 @@
 source "$DOTFILES/etc/user-info"
 PACKAGER="$REALNAME <$EMAIL>"
 
+INTEGRITY_CHECK=(sha256)
+
 # Optimizations
 function fix_march {
     echo $@ | sed 's/-march=[\w-]+ -mtune=\w+/-march=native/'
@@ -13,7 +15,8 @@ CFLAGS="`fix_march $CFLAGS`"
 CXXFLAGS="`fix_march $CXXFLAGS`"
 LDFLAGS="$LDFLAGS"
 
-MAKEFLAGS="-j`grep "cpu cores" /proc/cpuinfo | cut -d: -f2`"
+#MAKEFLAGS="-j`grep "cpu cores" /proc/cpuinfo | cut -d: -f2`"
+MAKEFLAGS="-j6"
 
 # Store stuff
 source "$DOTFILES/etc/aur.conf"
diff --git a/install b/install
index 8cbffcc..93ad8f5 100755
--- a/install
+++ b/install
@@ -118,7 +118,7 @@ ZDOTDIR="\$DOTFILES/zsh"
 source "\$ZDOTDIR/zshenv"
 EOF
 
-for file in zshrc zpreztorc zlogin zlogout; do
+for file in zshrc zpreztorc zlogin zlogout zprofile; do
     relink "$ZSH/$file" "$ZSH/.$file"
 done
 
diff --git a/zsh/prezto b/zsh/prezto
index 10cf701..c98da90 160000
--- a/zsh/prezto
+++ b/zsh/prezto
@@ -1 +1 @@
-Subproject commit 10cf7018645fd9c09a0aa03c4ebac5ae6222c77e
+Subproject commit c98da90662a11e7ac1e046ccd6a99edd21e68312
diff --git a/zsh/zpreztorc b/zsh/zpreztorc
index d49ff36..d0061ed 100644
--- a/zsh/zpreztorc
+++ b/zsh/zpreztorc
@@ -35,7 +35,6 @@ zstyle ':prezto:load' pmodule \
   'prompt' \
   'syntax-highlighting' \
   'git' \
-  'python' \
   'pacman' \
   'command-not-found'
 
diff --git a/zsh/zprofile b/zsh/zprofile
index 11c2f70..1075a2e 100644
--- a/zsh/zprofile
+++ b/zsh/zprofile
@@ -56,9 +56,8 @@ fi
 
 # Set the list of directories that Zsh searches for programs.
 path=(
-  $DOTFILES/bin
   $HOME/.local/bin
-  $HOME/bin
+  $DOTFILES/bin
   /usr/local/{bin,sbin}
   $path
 )
diff --git a/zsh/zshenv b/zsh/zshenv
index 3e30b58..169a88a 100644
--- a/zsh/zshenv
+++ b/zsh/zshenv
@@ -6,6 +6,6 @@
 #
 
 # Source the profile on every top-level shell
-if [[ "$SHLVL" -eq 1 ]]; then
+if [[ "$SHLVL" -eq 1 && ! -o LOGIN ]]; then
   source "$DOTFILES/zsh/zprofile"
 fi