From a56950307903707ad78841eb2a2d3c6becd0bf0c Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Tue, 23 Jun 2015 20:26:25 -0400
Subject: [PATCH] Changes

---
 i3/config   |  5 ++---
 i3/run.sh   | 10 ++++++++++
 i3/xsession | 10 ++++------
 vim/vimrc   |  2 ++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/i3/config b/i3/config
index fbb576b..3824c0c 100644
--- a/i3/config
+++ b/i3/config
@@ -184,18 +184,17 @@ exec --no-startup-id "~/.i3/run.sh wall"
 #startup
 exec --no-startup-id xmodmap ~/.xmodmap
 exec --no-startup-id /home/stonewareslord/xmodmap.sh
-exec --no-startup-id i3-msg /usr/bin/redshift t -l 36.3:-80.3 -t 2000:2000
+#exec --no-startup-id i3-msg /usr/bin/redshift t -l 36.3:-80.3 -t 2000:2000
 # exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox'
 exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/urxvt'
 exec --no-startup-id /usr/bin/shutter --min_at_startup
 exec --no-startup-id /usr/bin/screen -dmS syncthing /home/stonewareslord/Applications/syncthing/syncthing
 exec --no-startup-id "sleep 25;/usr/bin/owncloud"
-exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 6500:4000
+exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 4000:2000
 exec --no-startup-id /usr/bin/parcellite
 exec --no-startup-id /usr/bin/numlockx
 #exec --no-startup-id /usr/bin/synapse -s
 exec --no-startup-id /usr/bin/zeal
-exec --no-startup-id /usr/bin/xset -b
 exec --no-startup-id /bin/zsh -c 'pidof syncthing||screen -dmS syncthing /home/stonewareslord/applications/syncthing/syncthing '
 exec --no-startup-id /usr/bin/udiskie -tv
 #smart_borders on
diff --git a/i3/run.sh b/i3/run.sh
index b133c3f..746de18 100755
--- a/i3/run.sh
+++ b/i3/run.sh
@@ -31,3 +31,13 @@ if len(swap) == 2:
     i3.command('move', 'workspace to output right')
 EOF
 fi
+if [ "$1" = "boot" ];then
+  /usr/bin/xset s noblank
+  /usr/bin/xset s off
+  /usr/bin/xset -dpms
+  /usr/bin/xset -b
+  /usr/bin/xset +fp /usr/share/fonts/X11/misc
+  /usr/bin/xset +fp /usr/share/fonts/X11/Type1
+  /usr/bin/xset +fp built-ins
+  /usr/local/bin/i3||/usr/bin/i3
+fi
diff --git a/i3/xsession b/i3/xsession
index a957ad8..3d9bab9 100644
--- a/i3/xsession
+++ b/i3/xsession
@@ -1,6 +1,4 @@
-exec /usr/bin/ck-launch-session /usr/local/bin/i3
-exec /usr/bin/xset s off
-exec /usr/bin/xset -dpms
-exec /usr/bin/xset s noblank
-exec numlockx&
-exec syndaemon -i .5 -d&
+exec ~/.i3/run.sh boot
+#exec /usr/bin/ck-launch-session /usr/local/bin/i3
+#exec numlockx&
+#exec syndaemon -i .5 -d&
diff --git a/vim/vimrc b/vim/vimrc
index 3539d81..8c59892 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -178,6 +178,8 @@ set nocompatible
 set ignorecase
 set textwidth=0
 syntax on
+let g:signify_vcs_list = [ 'git', 'svn' ]
+let g:signify_difftool = 'diff'
 let g:ctrlp_root_markers = ['.cproot']
 let g:ctrlp_custom_ignore = {
   \ 'dir':  '\v[\/](\.git|\.hg|\.svn|vendor)$',