Changed i3wm color scheme

* updated conky and urxvt configuration accordingly

4 files changed, 114 insertions, 64 deletions

diff --git a/conky/.conkyrc b/conky/.conkyrc
index 701dba9..bc52864 100644
--- a/conky/.conkyrc
+++ b/conky/.conkyrc
@@ -1,56 +1,102 @@
 out_to_x no
 out_to_console yes
-total_run_times 0
-
 update_interval 5 
 
 if_up_strictness address
 
 TEXT
-[
-	{
-		"full_text" : " Host: $nodename "
-	},
-	{
-		"full_text" : " Root: ${fs_used_perc /}% "
-	},
-	${if_up enp0s25}
-	{
-		"full_text" : " IP: ${addr enp0s25} "
-	},
-	${else}
-	${if_up wlp3s0}
-	{
-		"full_text" : " IP: ${addr wlp3s0} "
-	},
-	${else}
-	${if_up wwp0s29u1u4i6}
-	{
-		"full_text" : " IP: ${addr wwp0s29u1u4i6} "
-	},
-	${else}
-	{
-		"full_text" : " IP: No connection "
-	},
-	${endif}
-	${endif}
-	${endif}
-	{
-		"full_text" : " Temp: ${acpitemp}°C "
-	},
-	{
-		"full_text" : " Fan: ${ibm_fan} "
-	},
-	{
-		"full_text" : " RAM: ${memperc}% "
-	},
-	{
-		"full_text" : " Load: ${cpu cpu0}% "
-	},
-	{
-		"full_text" : " Battery: ${battery_percent} "
-	},
-	{
-		"full_text" : " ${time %Y/%m/%d %H:%M}"
-	}
+[\
+	{\
+		"full_text" : "Host",\
+		"separator" : false\
+	},\
+	{\
+		"full_text" : "$nodename ",\
+		"color"     : "\#909737"\
+	},\
+	{\
+		"full_text" : " Root",\
+		"separator" : false\
+	},\
+	{\
+		"full_text" : "${fs_used_perc /}% ",\
+		"color"     : "\#909737"\
+	},\
+	{\
+		"full_text" : " IP",\
+		"separator" : false\
+	},\
+	${if_up enp0s25}\
+	{\
+		"full_text" : "${addr enp0s25} ",\
+		"color"     : "\#909737"\
+	},\
+	${else}\
+	${if_up wlp3s0}\
+	{\
+		"full_text" : "${addr wlp3s0} ",\
+		"color"     : "\#909737"\
+	},\
+	${else}\
+	${if_up wwp0s29u1u4i6}\
+	{\
+		"full_text" : "${addr wwp0s29u1u4i6} ",\
+		"color"     : "\#909737"\
+	},\
+	${else}\
+	{\
+		"full_text" : "No connection ",\
+		"color"     : "\#909737"\
+	},\
+	${endif}\
+	${endif}\
+	${endif}\
+	{\
+		"full_text" : " Temp",\
+		"separator" : false\
+	},\
+	{\
+		"full_text" : "${acpitemp}°C ",\
+		"color"     : "\#909737"\
+	},\
+	{\
+		"full_text" : " Fan",\
+		"separator" : false\
+	},\
+	{\
+		"full_text" : "${ibm_fan} ",\
+		"color"     : "\#909737"\
+	},\
+	{ \
+		"full_text" : " RAM",\
+		"separator" : false\
+	},\
+	{\
+		"full_text" : "${memperc}% ",\
+		"color"     : "\#909737"\
+	},\
+	{\
+		"full_text" : " Load",\
+		"separator" : false\
+	},\
+	{\
+		"full_text" : "${cpu cpu0}% ",\
+		"color"     : "\#909737"\
+	},\
+	{\
+		"full_text" : " Battery",\
+		"separator" : false\
+	},\
+	{\
+		"full_text" : "${battery_percent} ",\
+		"color"     : "\#909737"\
+	},\
+	{\
+		"full_text" : " ${time %Y/%m/%d}",\
+		"separator" : false\
+	},\
+	{\
+		"full_text" : "${time %H:%M}",\
+		"color"     : "\#909737"\
+	}\
 ],
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 43f7af4..2459e15 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -2,6 +2,7 @@ umask 0077
 
 set EDITOR vim
 set PATH $PATH /usr/local/texlive/2014/bin/x86_64-linux
+
 alias ccat='pygmentize -f console256 -g'
 
 if status --is-login
diff --git a/i3wm/.i3/config b/i3wm/.i3/config
index f4903fa..173e699 100644
--- a/i3wm/.i3/config
+++ b/i3wm/.i3/config
@@ -89,25 +89,28 @@ bar {
 	status_command ~/.conky.sh
 	workspace_buttons yes
 	tray_output LVDS1
+	font pango:Droid Sans Mono 13px
 
 	colors {
-		background #0e0e0e
-		statusline #839496
+		background #161616
+		statusline #605c5a
 
-		focused_workspace  #b58900 #111111
-		inactive_workspace #586e75 #111111
-		urgent_workspace   #839496 #dc322f
-		active_workspace   #839496 #111111
+		focused_workspace  #161616  #909737  #ffffff
+		active_workspace   #161616  #161616  #a5a5a5
+		inactive_workspace #161616  #545454  #a5a5a5
+		urgent_workspace   #161616  #545454  #a5a5a5
 	}
 }
 
+font pango:Droid Sans Mono 13px
 
-font -*-terminus-medium-r-normal-*-12-120-72-72-c-60-iso10646-1
+client.focused          #909737 #909737 #111111
+client.focused_inactive #111111 #111111 #999999
+client.unfocused        #222222 #222222 #999999
+client.urgent           #a5a5a5 #a5a5a5 #2e3436
+client.background       #161616
 
-client.focused #cb4b16 #cb4b16 #fdf6e3
-client.focused_inactive #657b83 #657b83 #fdf6e3
-client.unfocused #586e75 #586e75 #eee8d5
-client.urgent #dc322f #dc322f #fdf6e3
+for_window [instance="urxvt"] border pixel 2
 
 for_window [class="Chromium"] border none
 for_window [class="Thunderbird"] border none
@@ -116,7 +119,7 @@ for_window [class="Firefox"] border none
 bindsym $mod+Return exec urxvtc 
 bindsym $alt+Return exec gvim 
 
-bindsym $mod+space exec --no-startup-id dmenu_run
+bindsym $mod+space exec --no-startup-id dmenu_run  -fn 'Droid Sans Mono-10' -nb '#222222' -nf '#605c5a' -sb '#111111' -sf '#aadb0f'
 bindsym $alt+space exec --no-startup-id passman submitform
 
 bindsym control+Mod1+l exec --no-startup-id i3lock -c 000000 
diff --git a/xorg/.Xresources b/xorg/.Xresources
index 48d0c75..8f9c056 100644
--- a/xorg/.Xresources
+++ b/xorg/.Xresources
@@ -1,14 +1,14 @@
-URxvt.foreground: white
-URxvt.background: black
+URxvt.background: #111111
+URxvt.foreground: #c9c9c9
 URxvt.scrollBar: false
 URxvt.transparent: false
 URxvt.font: xft:Droid Sans Mono:size=8
-URxvt.perl-ext-common:  vtwheel,matcher,clipboard
+URxvt.perl-ext-common:  default,vtwheel,matcher,clipboard
 URxvt.saveLines: 10000
 URxvt.inheritPixmap: false
 URxvt.matcher.button: 1
 URxvt.matcher.pattern.1: \\bwww\\.[\\w-]\\.[\\w./?&@#-]*[\\w/-]
-URxvt.urlLauncher: firefox
+URxvt.url-launcher: firefox
 URxvt.keysym.Control-Up: \033[1;5A
 URxvt.keysym.Control-Down: \033[1;5B
 URxvt.keysym.Control-Left: \033[1;5D