# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1403149082 14400
# Node ID 6dbcadb013801efb1208728870c66fa87350afe3
# Parent  431128b5fa0c319c0d6f44037ac1ca7d5de134e7# Parent  2b46333856934c56bd72183615b8267826f74c40
Merge from default

diff --git a/.fonts.conf b/.fonts.conf
--- a/.fonts.conf
+++ b/.fonts.conf
@@ -6,29 +6,26 @@
   <alias>
     <family>serif</family>
     <prefer>
-      <family>Droid Serif</family>
+      <family>DejaVu Serif</family>
     </prefer>
   </alias>
   <alias>
     <family>sans-serif</family>
     <prefer>
-      <family>Droid Sans</family>
+      <family>DejaVu Sans</family>
     </prefer>
   </alias>
   <alias>
     <family>sans</family>
     <prefer>
-      <family>Droid Sans</family>
+      <family>DejaVu Sans</family>
     </prefer>
   </alias>
   <alias>
     <family>monospace</family>
     <prefer>
-      <family>Droid Sans Mono Slashed</family>
+      <family>DejaVu Sans Mono</family>
     </prefer>
-    <accept>
-      <family>DejaVu Sans Mono</family>
-    </accept>
   </alias>
 </fontconfig>
 
diff --git a/.i3status.conf b/.i3status.conf
diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -177,8 +177,6 @@ if on_windows == 1
     silent execute '!mkdir "'.$HOME.'\vimfiles\var\undo"'
   endif
 
-  set guifont=Consolas:h11
-  set guioptions-=t    "just disable tearoffs
 else
   let $MYVIM=$HOME.'/.vim'
 
@@ -192,11 +190,19 @@ else
     silent execute '!mkdir "'.$MYVIM.'/var/undo"'
   endif
 
-  set guifont=Droid\ Sans\ Mono\ Slashed\ 10
-  set guioptions-=T     " disable toolbar and menu
-  set guioptions-=m
 endif
 
+if on_windows == 1
+  set guifont=DejaVu_Sans_Mono:h10:cDEFAULT
+  set lsp=0
+else
+  set guifont=DejaVu\ Sans\ Mono\ 10
+endif
+
+set guioptions-=T    "disable toolbar and menu
+set guioptions-=m
+set guioptions-=t    "disable tearoffs
+
 set backupdir=$MYVIM/var/backup//,.
 set directory=$MYVIM/var/tmp//,.