From b2c901ec849a9fb8dc13b21ee94a16824e73f7aa Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Fri, 7 Nov 2014 21:25:46 -0500
Subject: [PATCH] Trying to fix merge issue...

---
 i3/config    |  2 +-
 shells/zshrc |  3 +++
 vim/vimrc    | 17 +++++++++++------
 xinerama.sh  | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 xinerama.sh

diff --git a/i3/config b/i3/config
index 36d2ea5..068e7d2 100644
--- a/i3/config
+++ b/i3/config
@@ -170,5 +170,5 @@ exec --no-startup-id /usr/bin/nm-applet
 exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 6500:4000
 exec --no-startup-id /usr/bin/diodon
 exec --no-startup-id /usr/bin/numlockx
-exec --no-startup-id /usr/bin/synapse
+exec --no-startup-id /usr/bin/synapse -s
 # vim: ts=2:sw=2:et
diff --git a/shells/zshrc b/shells/zshrc
index 37ee2a4..61e834e 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -101,6 +101,9 @@ alias -g nifyd=" > /dev/null 2>&1 & disown"
 alias -g G='|& egrep -i'
 alias -g AW='austenwares.com'
 export FZF_COMPLETION_OPTS='--no-mouse -m -1 -x'
+function smon(){
+  dsh -M -w -g monitor -- "$@"
+}
 function dnstest(){
   echo "Testing ping:"
   ping -c 2 8.8.8.8
diff --git a/vim/vimrc b/vim/vimrc
index 9961128..73b71f7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -98,13 +98,13 @@ nnoremap <Leader>= yypv$r=
 nnoremap <Leader>- yypv$r-
 nnoremap <Leader>^ yypv$r^
 nnoremap <Leader>" yypv$r"
-"inoremap '' ''<Left>
-"inoremap "" ""<Left>
-"inoremap () ()<Left>
-"inoremap <> <><Left>
+inoremap '' ''<Left>
+inoremap "" ""<Left>
+inoremap () ()<Left>
+inoremap <> <><Left>
 inoremap {} <Right>{}<Left><CR><Esc>O
-"inoremap {% {%  %}<Left><Left><Left>
-"inoremap [] []<Left>
+inoremap {% {%  %}<Left><Left><Left>
+inoremap [] []<Left>
 inoremap ;;; <Esc>A
 inoremap ;; <Esc>m`A;<Esc>``a
 inoremap ;;<Space> <Esc>A;<Esc>o
@@ -132,6 +132,9 @@ vnoremap / /\v
 inoremap jk <Esc>A
 inoremap kj <Esc>A
 set guicursor+=n-v-c:blinkon0
+set ttimeout
+set ttimeoutlen=0
+set notimeout
 set formatoptions-=r
 set formatoptions-=o
 set diffopt+=iwhite
@@ -316,6 +319,8 @@ Bundle 'Townk/vim-autoclose'
   "Autoclose brackets | https://github.com/Townk/vim-autoclose
 Bundle 'mhinz/vim-signify'
   "Git information inline | https://github.com/mhinz/vim-signify
+Bundle 'jamessan/vim-gnupg'
+  " | https://github.com/jamessan/vim-gnupg
   " | 
   "DO NOT DELETE LINE ABOVE OR \bun WILL BREAK
 filetype plugin indent on
diff --git a/xinerama.sh b/xinerama.sh
new file mode 100644
index 0000000..90a85b3
--- /dev/null
+++ b/xinerama.sh
@@ -0,0 +1,49 @@
+#3 monitors
+x11vnc -clip 1280x800+640+0 -xrandr -forever
+x11vnc -clip 1280x800+1920+0 -xrandr -forever
+x11vnc -clip 1366x768+3840+800 -xrandr -forever
+
+xrandr --newmode "1280x800_60.00"   83.50  1280 1352 1480 1680  800 803 809 831 -hsync +vsync
+xrandr --newmode "1368x768_60.00"   85.25  1368 1440 1576 1784  768 771 781 798 -hsync +vsync
+
+xrandr --addmode VIRTUAL1 1280x800_60.00
+xrandr --addmode VIRTUAL2 1280x800_60.00
+xrandr --addmode VIRTUAL3 1368x768_60.00
+
+xrandr --output VIRTUAL1 --mode 1280x800_60.00 --above HDMI3
+xrandr --output VIRTUAL3 --mode 1368x768_60.00 --right-of HDMI1
+xrandr --output VIRTUAL2 --mode 1280x800_60.00 --above HDMI1
+xrandr --output VIRTUAL1 --pos 640x0
+xrandr --output VIRTUAL3 --pos 3840x800
+
+export DISPLAY=:0.0&&xtightvncviewer 10.0.1.201:0 -fullscreen
+while true; do xset dpms force on;sleep 601;done
+xset dpms 0 0 0
+
+xrandr --output VIRTUAL1 --off
+xrandr --output VIRTUAL2 --off
+xrandr --output VIRTUAL3 --off
+
+
+#2 monitors
+
+
+x11vnc -clip 1280x800+640+0 -xrandr -forever
+x11vnc -clip 1280x800+1920+0 -xrandr -forever
+
+xrandr --newmode "1280x800_60.00"   83.50  1280 1352 1480 1680  800 803 809 831 -hsync +vsync
+
+xrandr --addmode VIRTUAL1 1280x800_60.00
+xrandr --addmode VIRTUAL2 1280x800_60.00
+
+xrandr --output VIRTUAL1 --mode 1280x800_60.00 --above HDMI3
+xrandr --output VIRTUAL2 --mode 1280x800_60.00 --above HDMI1
+xrandr --output VIRTUAL1 --pos 640x0
+
+export DISPLAY=:0.0&&xtightvncviewer 10.0.1.201:0 -fullscreen
+while true; do xset dpms force on;sleep 601;done
+xset dpms 0 0 0
+
+xrandr --output VIRTUAL1 --off
+xrandr --output VIRTUAL2 --off
+xrandr --output VIRTUAL3 --off