From de4b50811bb767f3b55669a02600d9da0996628a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= <balkian@gmail.com>
Date: Thu, 30 Jan 2014 10:25:54 +0100
Subject: [PATCH] Better buffers and folding

---
 Xresources | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 i3/config  | 14 ++++++++--
 vimrc      | 12 ++++++--
 3 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/Xresources b/Xresources
index 836cd1d..bb8ee5a 100644
--- a/Xresources
+++ b/Xresources
@@ -94,6 +94,86 @@ URxvt.pointerBlank:         true
 *color7: #eee8d5
 *color15: #fdf6e3
 
+!! 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:   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
+
+!! Base16 Tomorrow
+!! Scheme: Chris Kempson (http://chriskempson.com)
+
+!#define base00 #1d1f21
+!#define base01 #282a2e
+!#define base02 #373b41
+!#define base03 #969896
+!#define base04 #b4b7b4
+!#define base05 #c5c8c6
+!#define base06 #e0e0e0
+!#define base07 #ffffff
+!#define base08 #cc6666
+!#define base09 #de935f
+!#define base0A #f0c674
+!#define base0B #b5bd68
+!#define base0C #8abeb7
+!#define base0D #81a2be
+!#define base0E #b294bb
+!#define base0F #a3685a
+
+!*.foreground:   base05
+!*.background:   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
+
 ! Tomorrow-Night
 !*foreground:   #c5c8c6
 !*background:   #1d1f21
diff --git a/i3/config b/i3/config
index f36acaa..87e7a8a 100644
--- a/i3/config
+++ b/i3/config
@@ -86,10 +86,10 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
-bindsym $mod+g split h
+bindsym $mod+Shift+g split h
 
 # split in vertical orientation
-bindsym $mod+v split v
+bindsym $mod+Shift+v split v
 
 # enter fullscreen mode for the focused container
 bindsym $mod+f fullscreen
@@ -98,6 +98,8 @@ bindsym $mod+f fullscreen
 bindsym $mod+s layout stacking
 bindsym $mod+w layout tabbed
 bindsym $mod+e layout default
+bindsym $mod+g layout splith
+bindsym $mod+v layout splitv
 
 # toggle tiling / floating
 bindsym $mod+Shift+space floating toggle
@@ -105,6 +107,12 @@ bindsym $mod+Shift+space floating toggle
 # change focus between tiling / floating windows
 bindsym $mod+space focus mode_toggle
 
+# Make the currently focused window a scratchpad
+bindsym $mod+Shift+minus move scratchpad
+
+# Show the first scratchpad window
+bindsym $mod+minus scratchpad show
+
 # focus the parent container
 bindsym $mod+a focus parent
 
@@ -143,6 +151,7 @@ bindsym $mod+Shift+C reload
 bindsym $mod+Shift+R restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+E exit
+bindsym $mod+Mod1+s exec gksudo pm-suspend
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
@@ -226,5 +235,6 @@ exec --no-startup-id dropbox start
 exec --no-startup-id volti
 exec --no-startup-id clipit
 exec --no-startup-id syndaemon -i 0.5 -d
+exec --no-startup-id synapse -s
 exec xautolock -time 10 -locker 'i3lock -t -c 000000 -i ~/Pictures/Wallpapers/Game\ Over\ Hacker.png' &
 exec urxvt -e tmux attach
diff --git a/vimrc b/vimrc
index 4cff8b5..02c7040 100644
--- a/vimrc
+++ b/vimrc
@@ -32,7 +32,9 @@ Bundle "flazz/vim-colorschemes"
 Bundle "Lokaltog/vim-distinguished"
 Bundle "jamessan/vim-gnupg"
 Bundle "Lokaltog/vim-easymotion"
-"Bundle "fholgado/minibufexpl.vim"
+"Bundle 'chriskempson/base16-vim'
+Bundle "fholgado/minibufexpl.vim"
+Bundle "nanotech/jellybeans.vim"
 
 filetype plugin indent on     " required!
 
@@ -80,7 +82,8 @@ noremap \ ,
 " noremap <silent> ,cc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR>
 " noremap <silent> ,cu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR>
 " 
-imap <C-v> <C-O>"+gP
+map <leader>p "+gp
+map <leader>P "+gP
 noremap <C-S>  :w<CR>
 imap <C-S>  <C-O>:w<CR>
 
@@ -125,7 +128,7 @@ set sessionoptions+=resize,winpos
 "autocmd VimEnter * call RestoreSession()
 
 "Make tabs and buffers work better
-:se switchbuf=usetab,newtab
+":se switchbuf=usetab,newtab
 
 " Color and shit
 set t_Co=256
@@ -163,6 +166,9 @@ let g:ctrlp_cmd = 'CtrlPMRU'
 set guifont=DejaVu\ Sans\ Mono
 
 set foldmethod=syntax
+set foldclose=all
+set foldopen+=insert,jump
+set nofoldenable
 
 " Matching for html
 if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''