From fc66140a5bfcbcc003411c1d5657ad300f4acc07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= <contact@tobast.fr>
Date: Mon, 6 Mar 2017 23:55:00 +0100
Subject: [PATCH] Few minor changes

---
 files/.bashrc                    | 3 ++-
 files/.config/i3/bin/screenplace | 4 ++++
 files/.config/terminator/config  | 6 ++++--
 files/.vimrc                     | 6 ++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/files/.bashrc b/files/.bashrc
index 5789b49..fcad92e 100644
--- a/files/.bashrc
+++ b/files/.bashrc
@@ -43,6 +43,7 @@ export GTK_IM_MODULE=xim
 export EDITOR=/usr/bin/vim
 
 export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
+export ANDROID_HOME=/opt/android-sdk
 
 export PATH="$PATH:/home/tobast/bin"
 export MANPATH="$MANPATH:$HOME/local/man"
@@ -52,4 +53,4 @@ export TERMINAL="/usr/bin/terminator"
 export LC_REALUSER='tbastian'
 
 # Opam
-which opam > /dev/null 2>&1 && [ -f ~/.opam ] && eval `opam config env`
+which opam > /dev/null 2>&1 && [ -d ~/.opam ] && eval `opam config env`
diff --git a/files/.config/i3/bin/screenplace b/files/.config/i3/bin/screenplace
index c3990e3..d59b9a3 100755
--- a/files/.config/i3/bin/screenplace
+++ b/files/.config/i3/bin/screenplace
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 dftScreen="LVDS1"
+WALLPAPER_CMD="$(dirname $(readlink -f $0))/wallpaper"
 
 screens=$(xrandr | grep " connected" | cut -f 1 -d ' ' | grep -v "LVDS")
 screen=$(echo $screens | head -n 1)
@@ -19,6 +20,9 @@ case "$1" in
 	;;
 *)
 	>&2 echo -e "Missing argument. Usage:\n$0 [reset|left|right]"
+	exit 1
 	;;
 esac
 
+$WALLPAPER_CMD
+
diff --git a/files/.config/terminator/config b/files/.config/terminator/config
index b513ac7..2ffeb41 100644
--- a/files/.config/terminator/config
+++ b/files/.config/terminator/config
@@ -1,4 +1,5 @@
 [global_config]
+  dbus = False
   enabled_plugins = LaunchpadCodeURLHandler, APTURLHandler, LaunchpadBugURLHandler
   title_inactive_bg_color = "#000000"
   title_inactive_fg_color = "#909090"
@@ -23,8 +24,9 @@
     background_darkness = 0.79
     background_image = None
     background_type = transparent
-    font = Monospace 9
-    foreground_color = "#fffeab"
+    cursor_color = "#fffeab"
+    font = DejaVu Sans Mono 8
+    foreground_color = "#faffb4"
     scrollbar_position = hidden
     show_titlebar = False
     use_system_font = False
diff --git a/files/.vimrc b/files/.vimrc
index 2956380..f66093a 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -29,11 +29,13 @@ call vundle#begin()
 Plugin 'VundleVim/Vundle.vim'
 Plugin 'LucHermitte/lh-vim-lib'
 Plugin 'LucHermitte/local_vimrc'
+Plugin 'tpope/vim-fugitive'
 "Plugin 'Smart-Tabs'
 Plugin 'hynek/vim-python-pep8-indent'
 Plugin 'tpope/vim-git'
 Plugin 'fs111/pydoc.vim'
 Plugin 'vim-syntastic/syntastic'
+Plugin 'itchyny/vim-haskell-indent'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
@@ -92,4 +94,8 @@ map [[ :lprev<CR>
 map ]] :lnext<CR>
 map [] :ll<CR>
 nnoremap <Leader>w :call TrimWhitespace()<CR>
+nnoremap K <Esc>i<CR><Esc>
 
+xnoremap <Leader>x <esc>:'<,'>:w !xclip -selection clipboard<CR><esc>
+
+set tw=79