From fa588f248fc7be994aa9200f63a9458863c2bbe7 Mon Sep 17 00:00:00 2001
From: Christophe Simon <christophe.simon@dailymotion.com>
Date: Fri, 3 Jul 2015 14:16:13 +0200
Subject: [PATCH] Enhanced Xresources (for FHD screen) and Xsession

---
 Xresources | 20 +++++++++++++++++---
 Xsession   | 31 ++++++++++++++-----------------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/Xresources b/Xresources
index e85550f..9a18e0b 100644
--- a/Xresources
+++ b/Xresources
@@ -34,10 +34,20 @@ URxvt.depth: 32
 !URxvt*loginShell: true
 
 ! Font
+!-- Xft settings -- !
+Xft.dpi:        96
+Xft.antialias:  true
+Xft.rgba:       rgb
+Xft.hinting:    true
+Xft.hintstyle:  hintslight
 !URxvt*font: xft:DejaVu Sans Mono:pixelsize=12:antialias=true:hinting=true
-URxvt.font: xft:DejaVu Sans Mono-9,xft:DejaVu Sans Mono for Powerline-9
+!URxvt.font: xft:DejaVu Sans Mono-11,xft:PowerLineSymbols-11
+URxvt.font: xft:DejaVu Sans Mono:style=Book:pixelsize=12,xft:DejaVu Sans Mono for Powerline
+!URxvt.font: xft:DejaVu Sans Mono-10,xft:DejaVu Sans Mono for Powerline
 URxvt*letterSpace: -1
 
+! Cut chars
+
 ! Scroll bar
 URxvt*scrollBar: true
 URxvt*scrollBar_right: true
@@ -118,10 +128,14 @@ URxvt.iso14755: false
 URxvt.iso14755_52: false
 
 ! Plugins
-URxvt.perl-ext-common: default,matcher
+URxvt.perl-ext-common: default,matcher,font-size
 URxvt.matcher.button: 3
 URxvt.url-launcher: /usr/bin/firefox
-
+URxvt.keysym.C-plus:    perl:font-size:increase
+URxvt.keysym.C-minus:   perl:font-size:decrease
+URxvt.keysym.C-S-plus:  perl:font-size:incglobal
+URxvt.keysym.C-S-minus: perl:font-size:decglobal
+URxvt.keysym.C-equal:   perl:font-size:reset
 
 !
 ! XScreensave settings
diff --git a/Xsession b/Xsession
index de168a3..29eabfb 100755
--- a/Xsession
+++ b/Xsession
@@ -1,8 +1,11 @@
 #!/bin/bash
 
+# Starts user dbus daemon
+eval $( /usr/bin/dbus-launch --sh-syntax --exit-with-session )
+
 # Configures screen on identified hostname
 case $(hostname) in
-	thor) xrandr --output DVI-1 --right-of DVI-0 ;;
+	thor) /usr/local/bin/screen-config;;
 esac
 
 # Disables speaker
@@ -12,9 +15,6 @@ xset -b
 /usr/bin/xrdb -load ~/.Xresources
 /usr/bin/setxkbmap fr bepo
 
-# Starts user dbus daemon
-eval $( /usr/bin/dbus-launch --sh-syntax --exit-with-session )
-
 # Starts gnome-keyring-daemon and exports its variables
 eval $( /usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
 export GNOME_KEYRING_CONTROL
@@ -28,26 +28,23 @@ export SSH_AUTH_SOCK
 /usr/bin/compton -b
 /usr/bin/parcellite &
 /usr/bin/dropbox &
-#/usr/bin/xscreensaver -no-splash &
-#~/.config/awesome/bin/mcabber-watch-xscreensaver &
-/usr/bin/xautolock -detectsleep -time 10 -locker "i3lock -i ~/.lockscreen.png" &
+/usr/bin/xautolock -detectsleep -time 10 -locker "i3lock -i -t $HOME/.lockscreen.png" &
 
 # Starts polkit server
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 
 # Starts polkit dependant services
 /usr/bin/nm-applet &
-#/usr/bin/blueman-applet &
 
 # Starts autossh tunnel to honir
-if [ -f ~/.ssh/config ]; then
-	if grep -q 'Host honir-tunnel$' ~/.ssh/config; then
-		/usr/bin/autossh -xaNf -M 20000 honir-tunnel
-	fi
-	if [ -d ~/.config/lsync ] && grep -q 'Host honir$' ~/.ssh/config; then
-		/usr/bin/lsyncd ~/.config/lsync/etc/lsyncd-client.conf
-		~/.config/lsync/bin/lsync &
-	fi
-fi
+#if [ -f ~/.ssh/config ]; then
+#	if grep -q 'Host honir-tunnel$' ~/.ssh/config; then
+#		/usr/bin/autossh -xaNf -M 20000 honir-tunnel
+#	fi
+#	if [ -d ~/.config/lsync ] && grep -q 'Host honir$' ~/.ssh/config; then
+#		/usr/bin/lsyncd ~/.config/lsync/etc/lsyncd-client.conf
+#		~/.config/lsync/bin/lsync &
+#	fi
+#fi
 
 exec /usr/bin/awesome