From 9a1e648e297c8593e88766e10ed838c43d24d049 Mon Sep 17 00:00:00 2001
From: nkoehring <n@koehr.in>
Date: Sat, 27 Oct 2012 01:49:06 +0200
Subject: [PATCH] 2012-10-27 01:49:06

---
 dot.conkyrc      |  3 +--
 subtle/grabs.rb  |  5 +++--
 subtle/styles.rb | 10 ++++++++--
 subtle/subtle.rb | 19 ++++++++++---------
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/dot.conkyrc b/dot.conkyrc
index 8d36e7b..16bfba5 100644
--- a/dot.conkyrc
+++ b/dot.conkyrc
@@ -27,5 +27,4 @@ use_spacer right
 
 TEXT
 ${voffset 20}${color EAEAEA}${font Philosopher:pixelsize=120}${time %H:%M}${font}${voffset -77}${offset 10}${color1}${font Philosopher:pixelsize=42}${time %d} ${voffset -15}${color EAEAEA}${font Philosopher:pixelsize=22}${time %B} ${time %Y}${font}${voffset 27}${font Philosopher:pixelsize=58}${offset -173}${time %A}${font}
-${voffset 3}${offset 10}${font Ubuntu:pixelsize=13}${color1}ROOT $color${fs_used_perc /}%${offset 12}${color1}HOME $color${fs_used_perc /home}%${offset 12}${color1}RAM $color$memperc%${offset 12}${color1}LOAD $color${loadavg 1}${offset 12}${color1}BAT $color${smapi_bat_perc 0}% ${smapi bat 0 state} ${offset 12}${color1}TMP $color${acpitemp}°C
-${voffset 3}${offset 10}${mpd_smart}
+${voffset 3}${offset 10}${font Ubuntu:pixelsize=13}${color1}ROOT $color${fs_used_perc /}%${offset 12}${color1}HOME $color${fs_used_perc /home}%${offset 12}${color1}RAM $color$memperc%${offset 12}${color1}LOAD $color${loadavg 1} ${offset 12}${color1}TMP $color${acpitemp}°C
diff --git a/subtle/grabs.rb b/subtle/grabs.rb
index 2bf4e35..977bb10 100644
--- a/subtle/grabs.rb
+++ b/subtle/grabs.rb
@@ -136,10 +136,10 @@ grab "W-S-s", :WindowStick
 grab "W-equal", :WindowZaphod
 
 # Raise window
-grab "W-r", :WindowRaise
+grab "W-plus", :WindowRaise
 
 # Lower window
-grab "W-l", :WindowLower
+grab "W-minus", :WindowLower
 
 # Select next windows
 grab "W-Left",  :WindowLeft
@@ -174,6 +174,7 @@ grab "W-c", [ :bottom_right, :bottom_right66, :bottom_right33 ]
 
 # Exec programs
 grab "W-Return", "urxvt"
+grab "W-l", "i3lock -i ~/pics/screensaver.png -p win"
 grab "W-p" do
   Subtle::Contrib::Launcher.run
 end
diff --git a/subtle/styles.rb b/subtle/styles.rb
index 8946e7c..fad3b37 100644
--- a/subtle/styles.rb
+++ b/subtle/styles.rb
@@ -32,16 +32,22 @@ end
 
 # Style for the all views
 style :views do
-  foreground  "#757575"
+  foreground    "#757575"
+  border_top    C[:brown], 1
+  border_bottom C[:brown], 1
+  padding_top -2
+  padding_bottom -2
 
   # Style for the active views
   style :focus do
-    foreground  C[:orange]
+    foreground    C[:orange]
   end
 
   # Style for urgent window titles and views
   style :urgent do
     foreground  C[:red]
+    border_top    C[:mild_orange], 2
+    border_bottom C[:mild_orange], 2
   end
 
   # Style for occupied views (views with clients)
diff --git a/subtle/subtle.rb b/subtle/subtle.rb
index 255dc3e..85c5820 100644
--- a/subtle/subtle.rb
+++ b/subtle/subtle.rb
@@ -22,20 +22,21 @@ Subtle::Contrib::Launcher.fonts = [
 
 C = {
   :orange => "#FD971F",
+  :mild_orange => "#A36D2E",
   :brown  => "#2D2815",
   :red    => "#F92672",
   :yellow => "#FECF35",
   :green  => "#A6E22E"
 }
 
-eval(IO.read('/home/nk/.config/subtle/options.rb'), binding)
-eval(IO.read('/home/nk/.config/subtle/gravities.rb'), binding)
-eval(IO.read('/home/nk/.config/subtle/styles.rb'), binding)
-eval(IO.read('/home/nk/.config/subtle/panel.rb'), binding)
-eval(IO.read('/home/nk/.config/subtle/grabs.rb'), binding)
-eval(IO.read('/home/nk/.config/subtle/tags.rb'), binding)
-eval(IO.read('/home/nk/.config/subtle/views.rb'), binding)
-eval(IO.read('/home/nk/.config/subtle/sublets.rb'), binding)
-eval(IO.read('/home/nk/.config/subtle/hooks.rb'), binding)
+load_config 'options.rb'
+load_config 'gravities.rb'
+load_config 'styles.rb'
+load_config 'panel.rb'
+load_config 'grabs.rb'
+load_config 'tags.rb'
+load_config 'views.rb'
+load_config 'sublets.rb'
+load_config 'hooks.rb'
 
 # vim:ts=2:bs=2:sw=2:et:fdm=marker