update vimperator and i3

diff --git a/vimperator/.vimperatorrc b/vimperator/.vimperatorrc
index d8a1d7d..b8c7ebd 100644 (file)
--- a/vimperator/.vimperatorrc
+++ b/vimperator/.vimperatorrc
@@ -1,7 +1,8 @@
-"3.10.1 (created: 2015/08/25 00:41:59)
-
-source! /home/mart/.vimperatorrc.local
 nnoremap j 5j
 nnoremap k 5k
 
+set gui=noaddons,nobookmarks,nomenu,nonavigation,tabs
+set hintchars=uhetonasidyfpgcrlkxjbqmz
+
+
 " vim: set ft=vimperator:

diff --git a/x/.config/i3/config b/x/.config/i3/config
index ebfe484..884f6e8 100644 (file)
--- a/x/.config/i3/config
+++ b/x/.config/i3/config
@@ -14,7 +14,7 @@ set $font DejaVu Sans Mono
 set $fontsize 12
 
 # lock the screen after 10 minutes
-exec xautolock -locker ~/.local/bin/lock.sh & dunst & setxkbmap -layout dvorak,ru -variant ,phonetic_dvorak -option compose:ralt,grp:menu_toggle
+exec xautolock -locker ~/.local/bin/lock.sh & dunst & setxkbmap -layout dvorak,ru,us -variant ,phonetic_dvorak, -option compose:ralt,grp:menu_toggle
 
 # Toggle playback
 bindsym Pause exec mpc toggle
@@ -138,6 +138,6 @@ bindsym $mod+p mode "resize"
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-       status_command i3status
+       status_command ~/conky.sh
        font pango:$font $fontsize
 }

diff --git a/x/.config/i3status/config b/x/.config/i3status/config
index e21a31b..9dc0115 100644 (file)
--- a/x/.config/i3status/config
+++ b/x/.config/i3status/config
@@ -5,6 +5,7 @@ general {
 
 order += "wireless wlan0"
 order += "ethernet eth0"
+order += "keyboard"
 order += "volume master"
 order += "disk /"
 order += "battery 0"
@@ -43,3 +44,6 @@ tztime local {
 disk "/" {
        format = "%free/%total free"
 }
+
+keyboard {
+}