From f4bd6cb1b121c19b3d903a7ea4a8a318a16d17da Mon Sep 17 00:00:00 2001
From: George Rawlinson <george@rawlinson.net.nz>
Date: Tue, 1 Nov 2016 17:45:56 +1300
Subject: [PATCH] Update urxvt/nvim to work with powerline fonts

---
 nvim/.config/nvim/init.vim | 38 +++++++++++++++-----------------------
 urxvt/.Xresources          | 24 +++++++++++++-----------
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 85c4dc5..1463c96 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -1,5 +1,6 @@
 call plug#begin()
 
+" plugins
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'sickill/vim-monokai'
@@ -7,51 +8,42 @@ Plug 'airblade/vim-gitgutter'
 Plug 'tpope/vim-sensible'
 Plug 'chrisbra/sudoedit.vim'
 Plug 'scrooloose/nerdtree'
-"Plug 'ntpeters/vim-better-whitespace'
-"Plug 'nathanaelkane/vim-indent-guides'
 
 call plug#end()
 
-" Use UTF-8 encoding
+" use UTF-8 encoding
 set encoding=utf-8
 
-" View line numbers
+" view line numbers
 set number
 
-" Display
+" display
 set tabstop=4
 set shiftwidth=4
 set expandtab
 "set softtabstop=4
 
-" Show tabs & trailing space
-"set listchars=tab:»·,trail:·
+" show tabs & trailing space
 set listchars=tab:▸\ ,trail:·,eol:¬
 set list
 
-" Configure vim-airline
-let g:airline_theme='simple'
+" vim-airline - monokai + powerline
+let g:airline_theme='base16_monokai'
+let g:airline_powerline_fonts = 1
 set laststatus=2
 
-" Configure vim-monokai with syntax highlighting
+" configure vim-monokai with syntax highlighting
 colorscheme monokai
 syntax enable
 let g:load_doxygen_syntax=1
 
-" Configure vim-indent-guides with suitable colours
-"let g:indent_guides_auto_colors=0
-"hi IndentGuidesOdd  ctermbg=235
-"hi IndentGuidesEven ctermbg=237
-" Also load on startup
-"let g:indent_guides_enable_on_vim_startup=1
-
-"Use system clipboard
+"use system clipboard
 set clipboard+=unnamedplus
 
-" Disable UDLR keys (prefer HJKL)
-noremap <Up>	<NOP>
-noremap <Down>	<NOP>
-noremap <Left>	<NOP>
-noremap <Right>	<NOP>
+" disable UDLR keys (prefer HJKL)
+noremap <Up>    <NOP>
+noremap <Down>  <NOP>
+noremap <Left>  <NOP>
+noremap <Right> <NOP>
 
 " TODO: commenting plugin -> commentary/tcomment/nerdcommenter
diff --git a/urxvt/.Xresources b/urxvt/.Xresources
index 6148557..2864f5c 100644
--- a/urxvt/.Xresources
+++ b/urxvt/.Xresources
@@ -1,4 +1,4 @@
-! Colours
+! monokai colours
 URxvt.background: #272822
 URxvt.foreground: #f8f8f2
 URxvt.color0: #272822
@@ -18,22 +18,24 @@ URxvt.color13: #ae81ff
 URxvt.color14: #a1efe4
 URxvt.color15: #f9f8f5
 
-! Font
-URxvt.font: xft:DejaVu Sans Mono:size=10:antialias=true:hinting=true
+! powerline font
+URxvt.font: xft:DejaVu\ Sans\ Mono\ for\ Powerline:size=10:antialias=true:hinting=true
 
-! Tighter letter spacing
-URxvt.letterSpace: -1
+! font config
+xft.autohint: 0
+xft.lcdfilter: lcddefault
+xft.hintstyle: hintslight
+xft.hinting: 1
+xft.antialias: 1
+xft.rgba: rgb
 
-! Remove internal border
+! remove scroll bar
 URxvt.scrollBar: false
 
-! Remove scroll bar
+! remove internal border
 URxvt.internalBorder: 0
 
-! Perl Extensions: Clickable URLs + Simple Tabs
-! URxvt.perl-ext-common: default,matcher,tabbed
-
-! Perl Extensions: Clickable URLs
+! perl extensions: clickable urls
 URxvt.perl-ext-common: default,matcher
 URxvt.url-launcher: /usr/bin/xdg-open
 URxvt.matcher.button: 1