From b67a257e27e91805ab172e1f6d28d55ad8291d13 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sat, 1 Aug 2015 22:28:45 +0200
Subject: [PATCH] again, changed the colorscheme

---
 bootstrap.sh               |  4 ++--
 home/.Xresources           |  5 ++---
 home/.Xresources.d/base16  | 40 +-------------------------------------
 home/.bash_env             |  9 +++++++--
 home/.vim/bundle/base16    |  1 +
 home/.vim/bundle/pride     |  1 -
 home/.vim/bundle/solarized |  1 -
 home/.vimrc                |  4 +---
 8 files changed, 14 insertions(+), 51 deletions(-)
 mode change 100644 => 120000 home/.Xresources.d/base16
 create mode 120000 home/.vim/bundle/base16
 delete mode 120000 home/.vim/bundle/pride
 delete mode 120000 home/.vim/bundle/solarized

diff --git a/bootstrap.sh b/bootstrap.sh
index 6308a98..77d0941 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -19,8 +19,8 @@ git clone https://github.com/trapd00r/LS_COLORS.git dircolors
 git clone https://github.com/editorconfig/editorconfig-vim vim-editorconfig
 git clone https://github.com/tpope/vim-fugitive
 git clone https://github.com/tomtom/quickfixsigns_vim/ vim-quickfixsigns
-git clone https://github.com/altercation/vim-colors-solarized
-git clone https://github.com/lyxell/pride.vim vim-colors-pride
+git clone https://github.com/chriskempson/base16-xresources.git
+git clobe https://github.com/chriskempson/base16-vim.git
 
 # Private
 git clone stv0g@lian.0l.de:/var/git/private/pass.git
diff --git a/home/.Xresources b/home/.Xresources
index 539b371..febec5a 100644
--- a/home/.Xresources
+++ b/home/.Xresources
@@ -22,7 +22,6 @@ URxvt*perl-ext:		default,matcher,selection-to-clipboard
 URxvt*matcher.button:	1
 URxvt*urlLauncher:	chromium
 
-!#include ".Xresources.d/solarized"
-!#include ".Xresources.d/base16"
-#include ".Xresources.d/mason"
+#include ".Xresources.d/base16/base16-default.dark.xresources"
+!#include ".Xresources.d/mason"
 !#include ".Xresources.d/tango"
diff --git a/home/.Xresources.d/base16 b/home/.Xresources.d/base16
deleted file mode 100644
index 49019f7..0000000
--- a/home/.Xresources.d/base16
+++ /dev/null
@@ -1,39 +0,0 @@
-! Base16 Default
-! Scheme: Chris Kempson (http://chriskempson.com)
-
-#define base00 #151515
-#define base01 #202020
-#define base02 #303030
-#define base03 #505050
-#define base04 #b0b0b0
-#define base05 #d0d0d0
-#define base06 #e0e0e0
-#define base07 #f5f5f5
-#define base08 #ac4142
-#define base09 #d28445
-#define base0A #f4bf75
-#define base0B #90a959
-#define base0C #75b5aa
-#define base0D #6a9fb5
-#define base0E #aa759f
-#define base0F #8f5536
-
-*.foreground:   base05
-*.background:   [93]base00
-*.cursorColor:  base05
-*.color0:       base00
-*.color1:       base08
-*.color2:       base0B
-*.color3:       base0A
-*.color4:       base0D
-*.color5:       base0E
-*.color6:       base0C
-*.color7:       base05
-*.color8:       base03
-*.color9:       base09
-*.color10:      base01
-*.color11:      base02
-*.color12:      base04
-*.color13:      base06
-*.color14:      base0F
-*.color15:      base07
diff --git a/home/.Xresources.d/base16 b/home/.Xresources.d/base16
new file mode 120000
index 0000000..9411c37
--- /dev/null
+++ b/home/.Xresources.d/base16
@@ -0,0 +1 @@
+../../../base16-xresources/
\ No newline at end of file
diff --git a/home/.bash_env b/home/.bash_env
index 9d567bf..5e06f56 100644
--- a/home/.bash_env
+++ b/home/.bash_env
@@ -20,8 +20,13 @@ if [ -d /opt/local/share/man ]; then
 	export MANPATH=/opt/local/share/man:$MANPATH
 fi
 
-export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh
-export SSH_AGENT_PID=$(pidof gpg-agent)
+if [ -r ~/.gpg-agent-info ]; then
+	source ~/.gpg-agent-info
+
+	export GPG_AGENT_INFO
+	export SSH_AUTH_SOCK
+	export SSH_AGENT_PID
+fi
 
 export EDITOR=vim
 export DEBEMAIL="post@steffenvogel.de"
diff --git a/home/.vim/bundle/base16 b/home/.vim/bundle/base16
new file mode 120000
index 0000000..98ad207
--- /dev/null
+++ b/home/.vim/bundle/base16
@@ -0,0 +1 @@
+../../../../base16-vim/
\ No newline at end of file
diff --git a/home/.vim/bundle/pride b/home/.vim/bundle/pride
deleted file mode 120000
index 3ad9811..0000000
--- a/home/.vim/bundle/pride
+++ /dev/null
@@ -1 +0,0 @@
-../../../../vim-pride/
\ No newline at end of file
diff --git a/home/.vim/bundle/solarized b/home/.vim/bundle/solarized
deleted file mode 120000
index 28ba0ea..0000000
--- a/home/.vim/bundle/solarized
+++ /dev/null
@@ -1 +0,0 @@
-../../../../vim-colors-solarized/
\ No newline at end of file
diff --git a/home/.vimrc b/home/.vimrc
index 133f8f9..6006195 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -2,9 +2,7 @@
 execute pathogen#infect()
 
 " Enable full color support
-syntax enable
-set background=dark
-colorscheme solarized
+colorscheme base16-default
 
 " Vim Modus statt Vi Modus verwenden
 set nocompatible