From e21ab5f1d8f0a5ab36accd2203298fa484b49fa0 Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Fri, 19 Jun 2015 11:55:49 -0400
Subject: [PATCH] Changed thangs

---
 i3/config    |  6 +++---
 i3/xsession  |  3 +++
 shells/zshrc |  4 ++++
 vim/vimrc    | 16 +++++++++++-----
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/i3/config b/i3/config
index c9160e8..fbb576b 100644
--- a/i3/config
+++ b/i3/config
@@ -20,7 +20,7 @@ bindsym $mod+shift+p exec "~/.i3/run.sh pass"
 #screensaver
 bindsym $mod+backslash exec rofi $(i3-color-rofi) -show ssh
 bindsym $mod+shift+backslash exec "cat /tmp/noss&&(rm /tmp/noss;notify-send 'Screensaver Enabled' -t 200)||(touch /tmp/noss;notify-send 'Screensaver Disabled' -t 200)"
-exec --no-startup-id xautolock -time 10 -locker '~/.i3/run.sh screensaver'
+#exec --no-startup-id xautolock -time 10 -locker '~/.i3/run.sh screensaver'
 
 set $bg #121212
 set $fg #9f9f9f
@@ -50,7 +50,7 @@ bar {
   modifier Mod4
   tray_output primary
   tray_output LVDS1
-  tray_output HDMI3
+  #tray_output HDMI3
   colors {
     background          $bg
     statusline          $fg
@@ -184,7 +184,7 @@ 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 6500:4000
+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
diff --git a/i3/xsession b/i3/xsession
index b662f01..a957ad8 100644
--- a/i3/xsession
+++ b/i3/xsession
@@ -1,3 +1,6 @@
 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&
diff --git a/shells/zshrc b/shells/zshrc
index fa9fd3c..4be2ee8 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -242,3 +242,7 @@ antigen bundle zsh-users/zsh-syntax-highlighting
 printf "applying..."
 antigen apply
 echo "done"
+function zshaddhistory() {
+  print -sr -- "${1%%$'\n'} ### ${PWD} $(date '+%Y-%m-%d %R')"
+  return 1
+}
diff --git a/vim/vimrc b/vim/vimrc
index 4b99ff4..e02a427 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -178,6 +178,12 @@ set nocompatible
 set ignorecase
 set textwidth=0
 syntax on
+let g:ctrlp_root_markers = ['.cproot']
+let g:ctrlp_custom_ignore = {
+  \ 'dir':  '\v[\/](\.git|\.hg|\.svn|vendor)$',
+  \ 'file': '\v\.(exe|so|dll)$',
+  \ 'link': 'SOME_BAD_SYMBOLIC_LINKS',
+  \ }
 let g:airline_left_sep='▶'
 let g:airline_right_sep='◀'
 let g:airline#extensions#syntastic#enabled=0
@@ -309,8 +315,8 @@ Plug 'othree/eregex.vim'
 "  "Session manager | https://github.com/vim-scripts/sessionman.vim
 Plug 'mattn/flappyvird-vim'
   "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim
-Plug 'morhetz/gruvbox'
-  "Colorscheme | https://github.com/morhetz/gruvbox
+"Plug 'morhetz/gruvbox'
+"  "Colorscheme | https://github.com/morhetz/gruvbox
 Plug 'superbrothers/vim-vimperator'
   "Vimperator for vim | https://github.com/superbrothers/vim-vimperator
 Plug 'Rykka/colorv.vim'
@@ -336,11 +342,11 @@ Plug 'https://github.com/fatih/vim-go'
 Plug 'https://github.com/kien/rainbow_parentheses.vim'
   "Colored parenthesis | https://github.com/kien/rainbow_parentheses.vim
 Plug 'https://github.com/jiangmiao/auto-pairs'
-  " | https://github.com/jiangmiao/auto-pairs
+  "Automatic pairs | https://github.com/jiangmiao/auto-pairs
 "Plug 'https://github.com/Valloric/YouCompleteMe'
-"  " | https://github.com/Valloric/YouCompleteMe
+"  "Autocompletion | https://github.com/Valloric/YouCompleteMe
 Plug 'https://github.com/evidens/vim-twig'
-  " | https://github.com/evidens/vim-twig
+  "Twig highlighting | https://github.com/evidens/vim-twig
 Plug 'https://github.com/joonty/vdebug'
   " | https://github.com/joonty/vdebug
 call plug#end()